Mercurial > mxe-octave

comparison src/vmime-1-fixes.patch @ 1668:4ee38be1b1cd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
package vmime: fix and use .pc file
author Mark Brand <mabrand@mabrand.nl>
date Thu, 17 Mar 2011 01:22:52 +0100
parents 2af2bc5dca3f
children d3bf5db5a40f
comparison
equal deleted inserted replaced
1667:c0cf12e45d84 1668:4ee38be1b1cd
508 508
509 -- 509 --
510 1.7.4.1 510 1.7.4.1
511 511
512 512
513 From 9a1437295208e86a3b9ebe503826ee52c7175997 Mon Sep 17 00:00:00 2001 513 From 720396d3bf9803f2cd5651ed9ee27b8b39d60145 Mon Sep 17 00:00:00 2001
514 From: Mark Brand <mabrand@mabrand.nl> 514 From: Mark Brand <mabrand@mabrand.nl>
515 Date: Tue, 15 Mar 2011 15:59:05 +0100 515 Date: Tue, 15 Mar 2011 15:59:05 +0100
516 Subject: [PATCH 8/8] fix .pc file for mingw 516 Subject: [PATCH 8/8] add dependencies to .pc file
517 517
518 518
519 diff --git a/SConstruct b/SConstruct 519 diff --git a/SConstruct b/SConstruct
520 index fb01edf..ed0c376 100644 520 index fb01edf..6e8aba2 100644
521 --- a/SConstruct 521 --- a/SConstruct
522 +++ b/SConstruct 522 +++ b/SConstruct
523 @@ -1089,7 +1089,7 @@ def generateAutotools(target, source, env):
524 vmime_pc_in.write("Description: " + packageDescription + "\n")
525 vmime_pc_in.write("Version: @VERSION@\n")
526 vmime_pc_in.write("Requires: @GSASL_REQUIRED@\n")
527 - vmime_pc_in.write("Libs: -L${libdir} -l@GENERIC_VERSIONED_LIBRARY_NAME@ @GSASL_LIBS@ @LIBGNUTLS_LIBS@ @VMIME_ADDITIONAL_PC_LIBS@\n")
528 + vmime_pc_in.write("Libs: -L${libdir} -l@GENERIC_VERSIONED_LIBRARY_NAME@ @GSASL_LIBS@ @LIBGNUTLS_LIBS@ @LIBICONV@ @PTHREAD_LIBS@ @VMIME_ADDITIONAL_PC_LIBS@\n")
529 #vmime_pc_in.write("Cflags: -I${includedir}/@GENERIC_VERSIONED_LIBRARY_NAME@\n")
530 vmime_pc_in.write("Cflags: -I${includedir}/ @LIBGNUTLS_CFLAGS@\n")
531 vmime_pc_in.close()
523 @@ -1709,7 +1709,7 @@ fi 532 @@ -1709,7 +1709,7 @@ fi
524 533
525 # -- Link with Winsock (Windows) 534 # -- Link with Winsock (Windows)
526 if test "x$VMIME_DETECT_PLATFORM" = "xwindows"; then 535 if test "x$VMIME_DETECT_PLATFORM" = "xwindows"; then
527 - VMIME_ADDITIONAL_PC_LIBS="$VMIME_ADDITIONAL_PC_LIBS -lwsock32" 536 - VMIME_ADDITIONAL_PC_LIBS="$VMIME_ADDITIONAL_PC_LIBS -lwsock32"
528 + VMIME_ADDITIONAL_PC_LIBS="$VMIME_ADDITIONAL_PC_LIBS -liconv -lws2_32" 537 + VMIME_ADDITIONAL_PC_LIBS="$VMIME_ADDITIONAL_PC_LIBS -lws2_32"
529 fi 538 fi
530 539
531 # -- getaddrinfo (POSIX) 540 # -- getaddrinfo (POSIX)
532 -- 541 --
533 1.7.4.1 542 1.7.4.1