diff options
| author | Timothy Gu <timothygu99@gmail.com> | 2014-09-09 00:11:29 (GMT) |
|---|---|---|
| committer | Timothy Gu <timothygu99@gmail.com> | 2014-09-09 00:28:37 (GMT) |
| commit | f29c8cafc3072f9cf1e7a4a0b039ffad1037a39a (patch) | |
| tree | 93e9749b8a0c784d0c178a380bea3b4d3babf511 /src | |
| parent | c28b3ea9bc79e3736bc6bb3184041d35afe2930d (diff) | |
| download | mxe-f29c8cafc3072f9cf1e7a4a0b039ffad1037a39a.zip mxe-f29c8cafc3072f9cf1e7a4a0b039ffad1037a39a.tar.gz mxe-f29c8cafc3072f9cf1e7a4a0b039ffad1037a39a.tar.bz2 | |
poco: Use system zlib etc. and enable on i686-w64-mingw32
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/poco-1-fixes.patch | 24 | ||||
| -rw-r--r-- | src/poco-2-fix-mno-cygwin.patch (renamed from src/poco-1-fix-mno-cygwin.patch) | 0 | ||||
| -rw-r--r-- | src/poco.mk | 7 |
3 files changed, 27 insertions, 4 deletions
diff --git a/src/poco-1-fixes.patch b/src/poco-1-fixes.patch new file mode 100644 index 0000000..3b769c8 --- /dev/null +++ b/src/poco-1-fixes.patch @@ -0,0 +1,24 @@ +This file is part of MXE. +See index.html for further information. + +From 329b3a3ebbcd2ee03e3f0e21cd929dd54fffcac3 Mon Sep 17 00:00:00 2001 +From: Timothy Gu <timothygu99@gmail.com> +Date: Mon, 8 Sep 2014 16:52:55 -0700 +Subject: [PATCH] configure: Define POCO_STATIC when --static is requested + + +diff --git a/configure b/configure +index 1d93337..87f189e 100755 +--- a/configure ++++ b/configure +@@ -189,6 +189,7 @@ while [ "$1" != "" ] ; do + + if [ "$1" = "--static" ] ; then + static=1 ++ flags="$flags -DPOCO_STATIC" + fi + + if [ "$1" = "--shared" ] ; then +-- +1.8.3.2 + diff --git a/src/poco-1-fix-mno-cygwin.patch b/src/poco-2-fix-mno-cygwin.patch index e7a237a..e7a237a 100644 --- a/src/poco-1-fix-mno-cygwin.patch +++ b/src/poco-2-fix-mno-cygwin.patch diff --git a/src/poco.mk b/src/poco.mk index 1bd05e1..4e0df7e 100644 --- a/src/poco.mk +++ b/src/poco.mk @@ -8,7 +8,7 @@ $(PKG)_CHECKSUM := 90042349faf1790b5167bad0e84e1713bfd46046 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz $(PKG)_URL := http://pocoproject.org/releases/$(PKG)-$(word 1,$(subst p, ,$($(PKG)_VERSION)))/$($(PKG)_FILE) -$(PKG)_DEPS := gcc +$(PKG)_DEPS := gcc expat openssl pcre sqlite zlib define $(PKG)_UPDATE $(WGET) -q -O- 'http://pocoproject.org/download/' | \ @@ -20,16 +20,15 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --config=MinGW-CrossEnv \ --static \ + --unbundled \ --prefix='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' -j '$(JOBS)' install CROSSENV=$(TARGET) '$(TARGET)-g++' \ - -W -Wall -Werror -ansi -pedantic \ + -W -Wall -Werror -ansi -pedantic -DPOCO_STATIC=1 \ '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-poco.exe' \ -lPocoFoundation endef $(PKG)_BUILD_x86_64-w64-mingw32 = -$(PKG)_BUILD_i686-w64-mingw32 = - $(PKG)_BUILD_SHARED = |