Mercurial > mxe-octave
changeset 1668:4ee38be1b1cd
package vmime: fix and use .pc file
| author | Mark Brand <mabrand@mabrand.nl> |
|---|---|
| date | Thu, 17 Mar 2011 01:22:52 +0100 |
| parents | c0cf12e45d84 |
| children | 53a32735ec32 |
| files | src/vmime-1-fixes.patch src/vmime.mk |
| diffstat | 2 files changed, 14 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/vmime-1-fixes.patch Thu Mar 17 01:21:42 2011 +0100 +++ b/src/vmime-1-fixes.patch Thu Mar 17 01:22:52 2011 +0100 @@ -510,22 +510,31 @@ 1.7.4.1 -From 9a1437295208e86a3b9ebe503826ee52c7175997 Mon Sep 17 00:00:00 2001 +From 720396d3bf9803f2cd5651ed9ee27b8b39d60145 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Tue, 15 Mar 2011 15:59:05 +0100 -Subject: [PATCH 8/8] fix .pc file for mingw +Subject: [PATCH 8/8] add dependencies to .pc file diff --git a/SConstruct b/SConstruct -index fb01edf..ed0c376 100644 +index fb01edf..6e8aba2 100644 --- a/SConstruct +++ b/SConstruct +@@ -1089,7 +1089,7 @@ def generateAutotools(target, source, env): + vmime_pc_in.write("Description: " + packageDescription + "\n") + vmime_pc_in.write("Version: @VERSION@\n") + vmime_pc_in.write("Requires: @GSASL_REQUIRED@\n") +- vmime_pc_in.write("Libs: -L${libdir} -l@GENERIC_VERSIONED_LIBRARY_NAME@ @GSASL_LIBS@ @LIBGNUTLS_LIBS@ @VMIME_ADDITIONAL_PC_LIBS@\n") ++ vmime_pc_in.write("Libs: -L${libdir} -l@GENERIC_VERSIONED_LIBRARY_NAME@ @GSASL_LIBS@ @LIBGNUTLS_LIBS@ @LIBICONV@ @PTHREAD_LIBS@ @VMIME_ADDITIONAL_PC_LIBS@\n") + #vmime_pc_in.write("Cflags: -I${includedir}/@GENERIC_VERSIONED_LIBRARY_NAME@\n") + vmime_pc_in.write("Cflags: -I${includedir}/ @LIBGNUTLS_CFLAGS@\n") + vmime_pc_in.close() @@ -1709,7 +1709,7 @@ fi # -- Link with Winsock (Windows) if test "x$VMIME_DETECT_PLATFORM" = "xwindows"; then - VMIME_ADDITIONAL_PC_LIBS="$VMIME_ADDITIONAL_PC_LIBS -lwsock32" -+ VMIME_ADDITIONAL_PC_LIBS="$VMIME_ADDITIONAL_PC_LIBS -liconv -lws2_32" ++ VMIME_ADDITIONAL_PC_LIBS="$VMIME_ADDITIONAL_PC_LIBS -lws2_32" fi # -- getaddrinfo (POSIX)
--- a/src/vmime.mk Thu Mar 17 01:21:42 2011 +0100 +++ b/src/vmime.mk Thu Mar 17 01:22:52 2011 +0100 @@ -50,9 +50,7 @@ $(SED) -i 's/posix/windows/g;' '$(1)/examples/example6.cpp' $(TARGET)-g++ -s -o '$(1)/examples/test-vmime.exe' \ - -I'$(PREFIX)/$(TARGET)/include' \ '$(1)/examples/example6.cpp' \ - -L'$(PREFIX)/$(TARGET)/lib' \ - -lvmime -lgnutls -lgsasl -lntlm -lgcrypt -lgpg-error -liconv -lidn -lz -lpthread -lws2_32 + `'$(TARGET)-pkg-config' vmime --cflags --libs` $(INSTALL) -m755 '$(1)/examples/test-vmime.exe' '$(PREFIX)/$(TARGET)/bin/' endef