diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2013-03-06 23:42:03 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2013-03-06 23:42:03 (GMT) |
| commit | 8776dd152f7ea729445d6fb7b834d9dab8424f7a (patch) | |
| tree | 3ebf42b4ea87a90e4a68fd4774a7f84de31eda0a | |
| parent | d822db277f86fd901b4eec695da9786088a1f142 (diff) | |
| download | mxe-8776dd152f7ea729445d6fb7b834d9dab8424f7a.zip mxe-8776dd152f7ea729445d6fb7b834d9dab8424f7a.tar.gz mxe-8776dd152f7ea729445d6fb7b834d9dab8424f7a.tar.bz2 | |
package vmime: fixes for pkg-config
| -rw-r--r-- | src/vmime-1-fixes.patch | 29 | ||||
| -rw-r--r-- | src/vmime.mk | 1 |
2 files changed, 27 insertions, 3 deletions
diff --git a/src/vmime-1-fixes.patch b/src/vmime-1-fixes.patch index 06927a4..de95eb1 100644 --- a/src/vmime-1-fixes.patch +++ b/src/vmime-1-fixes.patch @@ -4,7 +4,7 @@ See index.html for further information. From 156f87098b2f799b7b8a0448e46e0c89d7ab1314 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Fri, 1 Mar 2013 13:27:47 +0100 -Subject: [PATCH 1/3] fix duplicate info in .pc files +Subject: [PATCH 1/4] fix duplicate info in .pc files diff --git a/CMakeLists.txt b/CMakeLists.txt @@ -36,7 +36,7 @@ index 507cf3a..c7fa6b2 100644 From eda515be0addb9f2b9f1caa3d6ea43eb42667346 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Fri, 1 Mar 2013 13:44:43 +0100 -Subject: [PATCH 2/3] bin is no lib +Subject: [PATCH 2/4] bin is no lib diff --git a/CMakeLists.txt b/CMakeLists.txt @@ -60,7 +60,7 @@ index c7fa6b2..947cb61 100644 From f9209c0f50b0a094dd5a0167fd4e7c0954b43ee1 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Thu, 7 Mar 2013 00:00:13 +0100 -Subject: [PATCH 3/3] libdir for mingw too +Subject: [PATCH 3/4] libdir for mingw too diff --git a/CMakeLists.txt b/CMakeLists.txt @@ -82,3 +82,26 @@ index 947cb61..ba13324 100644 -- 1.7.10.4 + +From a2b35277901059271ea22dd360d394ad61cdc81e Mon Sep 17 00:00:00 2001 +From: Mark Brand <mabrand@mabrand.nl> +Date: Thu, 7 Mar 2013 00:26:12 +0100 +Subject: [PATCH 4/4] link winsock for static builds + + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ba13324..bd268c1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -623,6 +623,8 @@ IF(WIN32) + ${TARGET_LINK_LIBRARIES} + "ws2_32" + ) ++ ELSE() ++ SET(VMIME_PKGCONFIG_LIBS "${VMIME_PKGCONFIG_LIBS} -lws2_32") + ENDIF() + ENDIF() + +-- +1.7.10.4 + diff --git a/src/vmime.mk b/src/vmime.mk index c850c91..c3d31fe 100644 --- a/src/vmime.mk +++ b/src/vmime.mk @@ -27,6 +27,7 @@ define $(PKG)_BUILD . $(MAKE) -C '$(1)' -j '$(JOBS)' + $(SED) -i 's,^\(Libs.private:.* \)$(PREFIX)/$(TARGET)/lib/libiconv\.a,\1-liconv,g' $(1)/libvmime.pc $(MAKE) -C '$(1)' install $(SED) -i 's/posix/windows/g;' '$(1)/examples/example6.cpp' |