diff options
| -rw-r--r-- | src/bzip2.mk | 15 | ||||
| -rw-r--r-- | src/dbus.mk | 6 | ||||
| -rw-r--r-- | src/expat.mk | 4 | ||||
| -rw-r--r-- | src/fontconfig.mk | 5 | ||||
| -rw-r--r-- | src/freetds.mk | 8 | ||||
| -rw-r--r-- | src/freetype.mk | 5 | ||||
| -rw-r--r-- | src/gettext.mk | 4 | ||||
| -rw-r--r-- | src/gnutls.mk | 8 | ||||
| -rw-r--r-- | src/icu4c.mk | 12 | ||||
| -rw-r--r-- | src/jpeg.mk | 14 | ||||
| -rw-r--r-- | src/lcms-1-fixes.patch | 2 | ||||
| -rw-r--r-- | src/lcms.mk | 5 | ||||
| -rw-r--r-- | src/libgcrypt.mk | 5 | ||||
| -rw-r--r-- | src/libgpg_error.mk | 5 | ||||
| -rw-r--r-- | src/libiconv.mk | 4 | ||||
| -rw-r--r-- | src/libmng.mk | 6 | ||||
| -rw-r--r-- | src/libpng.mk | 5 | ||||
| -rw-r--r-- | src/nettle.mk | 9 | ||||
| -rw-r--r-- | src/openssl.mk | 5 | ||||
| -rw-r--r-- | src/pcre.mk | 15 | ||||
| -rw-r--r-- | src/postgresql.mk | 11 | ||||
| -rw-r--r-- | src/qt-2-designer.patch | 16 | ||||
| -rw-r--r-- | src/qt.mk | 14 | ||||
| -rw-r--r-- | src/sqlite.mk | 5 | ||||
| -rw-r--r-- | src/tiff.mk | 5 | ||||
| -rw-r--r-- | src/xz.mk | 5 | ||||
| -rw-r--r-- | src/zlib.mk | 11 |
27 files changed, 109 insertions, 100 deletions
diff --git a/src/bzip2.mk b/src/bzip2.mk index d804b33..9f52779 100644 --- a/src/bzip2.mk +++ b/src/bzip2.mk @@ -17,14 +17,25 @@ define $(PKG)_UPDATE head -1 endef -define $(PKG)_BUILD +define $(PKG)_BUILD_COMMON $(MAKE) -C '$(1)' -j '$(JOBS)' libbz2.a \ PREFIX='$(PREFIX)/$(TARGET)' \ CC='$(TARGET)-gcc' \ AR='$(TARGET)-ar' \ RANLIB='$(TARGET)-ranlib' $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib' - $(INSTALL) -m644 '$(1)/libbz2.a' '$(PREFIX)/$(TARGET)/lib/' $(INSTALL) -d '$(PREFIX)/$(TARGET)/include' $(INSTALL) -m644 '$(1)/bzlib.h' '$(PREFIX)/$(TARGET)/include/' endef + +define $(PKG)_BUILD + $($(PKG)_BUILD_COMMON) + $(INSTALL) -m644 '$(1)/libbz2.a' '$(PREFIX)/$(TARGET)/lib/' +endef + +define $(PKG)_BUILD_SHARED + $($(PKG)_BUILD_COMMON) + '$(TARGET)-gcc' '$(1)'/*.o -shared \ + -o '$(PREFIX)/$(TARGET)/bin/libbz2.dll' -Xlinker \ + --out-implib -Xlinker '$(PREFIX)/$(TARGET)/lib/libbz2.dll.a' +endef diff --git a/src/dbus.mk b/src/dbus.mk index 23d08f1..dfe0111 100644 --- a/src/dbus.mk +++ b/src/dbus.mk @@ -19,16 +19,12 @@ endef define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ - --prefix='$(PREFIX)/$(TARGET)' \ + $(MXE_CONFIGURE_OPTS) \ --with-xml=expat \ --disable-tests \ --disable-verbose-mode \ --disable-asserts \ - --disable-shared \ --disable-maintainer-mode \ - --enable-static \ --disable-silent-rules \ --disable-launchd \ --disable-doxygen-docs \ diff --git a/src/expat.mk b/src/expat.mk index 4ef5f5a..13f520a 100644 --- a/src/expat.mk +++ b/src/expat.mk @@ -18,8 +18,6 @@ endef define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --disable-shared \ - --prefix='$(PREFIX)/$(TARGET)' + $(MXE_CONFIGURE_OPTS) $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef diff --git a/src/fontconfig.mk b/src/fontconfig.mk index a7327ad..f0f9bca 100644 --- a/src/fontconfig.mk +++ b/src/fontconfig.mk @@ -19,10 +19,7 @@ endef define $(PKG)_BUILD cd '$(1)' && autoreconf -fi cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ - --disable-shared \ - --prefix='$(PREFIX)/$(TARGET)' \ + $(MXE_CONFIGURE_OPTS) \ --with-arch='$(TARGET)' \ --with-expat='$(PREFIX)/$(TARGET)' \ --disable-docs diff --git a/src/freetds.mk b/src/freetds.mk index cfa6c87..0731899 100644 --- a/src/freetds.mk +++ b/src/freetds.mk @@ -24,19 +24,15 @@ endef define $(PKG)_BUILD cd '$(1)' && ./configure \ - --prefix='$(PREFIX)/$(TARGET)' \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(MXE_CONFIGURE_OPTS) \ --disable-rpath \ --disable-dependency-tracking \ - --disable-shared \ - --enable-static \ --enable-libiconv \ --enable-msdblib \ --enable-sspi \ --disable-threadsafe \ --with-tdsver=7.2 \ - --with-gnutls \ + --with$(if $(BUILD_SHARED),out)-gnutls \ PKG_CONFIG='$(TARGET)-pkg-config' $(MAKE) -C '$(1)' -j '$(JOBS)' install man_MANS= endef diff --git a/src/freetype.mk b/src/freetype.mk index c98044e..1503edc 100644 --- a/src/freetype.mk +++ b/src/freetype.mk @@ -19,10 +19,7 @@ endef define $(PKG)_BUILD cd '$(1)' && GNUMAKE=$(MAKE) ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ - --disable-shared \ - --prefix='$(PREFIX)/$(TARGET)' \ + $(MXE_CONFIGURE_OPTS) \ LIBPNG_CFLAGS="`$(TARGET)-pkg-config libpng --cflags`" \ LIBPNG_LDFLAGS="`$(TARGET)-pkg-config libpng --libs`" \ FT2_EXTRA_LIBS="`$(TARGET)-pkg-config libpng --libs`" diff --git a/src/gettext.mk b/src/gettext.mk index 7e36506..a57ef28 100644 --- a/src/gettext.mk +++ b/src/gettext.mk @@ -19,9 +19,7 @@ endef define $(PKG)_BUILD cd '$(1)/gettext-runtime' && ./configure \ - --host='$(TARGET)' \ - --disable-shared \ - --prefix='$(PREFIX)/$(TARGET)' \ + $(MXE_CONFIGURE_OPTS) \ --enable-threads=win32 \ --without-libexpat-prefix \ --without-libxml2-prefix \ diff --git a/src/gnutls.mk b/src/gnutls.mk index bbb8551..b871bd8 100644 --- a/src/gnutls.mk +++ b/src/gnutls.mk @@ -26,11 +26,7 @@ define $(PKG)_BUILD # AI_ADDRCONFIG referenced by src/serv.c but not provided by mingw. # Value taken from http://msdn.microsoft.com/en-us/library/windows/desktop/ms737530%28v=vs.85%29.aspx cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ - --enable-static \ - --disable-shared \ - --prefix='$(PREFIX)/$(TARGET)' \ + $(MXE_CONFIGURE_OPTS) \ --disable-rpath \ --disable-nls \ --disable-guile \ @@ -52,3 +48,5 @@ define $(PKG)_BUILD '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-gnutls.exe' \ `'$(TARGET)-pkg-config' gnutls --cflags --libs` endef + +$(PKG)_BUILD_SHARED = diff --git a/src/icu4c.mk b/src/icu4c.mk index 156bbfc..4de78b9 100644 --- a/src/icu4c.mk +++ b/src/icu4c.mk @@ -18,25 +18,25 @@ define $(PKG)_UPDATE tail -1 endef -define $(PKG)_BUILD +define $(PKG)_BUILD_SHARED mkdir '$(1).native' && cd '$(1).native' && '$(1)/source/configure' \ CC=gcc CXX=g++ $(MAKE) -C '$(1).native' -j '$(JOBS)' mkdir '$(1).cross' && cd '$(1).cross' && '$(1)/source/configure' \ - --host='$(TARGET)' \ - --build="`config.guess`" \ - --prefix='$(PREFIX)/$(TARGET)' \ - --enable-static \ - --disable-shared \ + $(MXE_CONFIGURE_OPTS) \ --with-cross-build='$(1).native' \ + icu_cv_host_frag=mh-mingw \ CFLAGS=-DU_USING_ICU_NAMESPACE=0 \ CXXFLAGS='--std=gnu++0x' \ SHELL=bash $(MAKE) -C '$(1).cross' -j '$(JOBS)' install ln -sf '$(PREFIX)/$(TARGET)/bin/icu-config' '$(PREFIX)/bin/$(TARGET)-icu-config' +endef +define $(PKG)_BUILD + $($(PKG)_BUILD_SHARED) # Static libs are prefixed with an `s` but the config script # doesn't detect it properly, despite the STATIC_PREFIX="s" line $(SED) -i 's,ICUPREFIX="icu",ICUPREFIX="sicu",' '$(PREFIX)/$(TARGET)/bin/icu-config' diff --git a/src/jpeg.mk b/src/jpeg.mk index 561728a..38504d7 100644 --- a/src/jpeg.mk +++ b/src/jpeg.mk @@ -18,13 +18,19 @@ endef define $(PKG)_BUILD cd '$(1)' && ./configure \ - --prefix='$(PREFIX)/$(TARGET)' \ - --host='$(TARGET)' \ - --disable-shared + $(MXE_CONFIGURE_OPTS) $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS= + # create pkg-config file + $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib/pkgconfig' + (echo 'Name: jpeg'; \ + echo 'Version: 0'; \ + echo 'Description: jpeg'; \ + echo 'Libs: -ljpeg';) \ + > '$(PREFIX)/$(TARGET)/lib/pkgconfig/jpeg.pc' + '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-jpeg.exe' \ - -ljpeg + `'$(TARGET)-pkg-config' jpeg --libs` endef diff --git a/src/lcms-1-fixes.patch b/src/lcms-1-fixes.patch index 6d6c644..471480b 100644 --- a/src/lcms-1-fixes.patch +++ b/src/lcms-1-fixes.patch @@ -23,7 +23,7 @@ index b715f59..4a8fdb3 100644 -Libs.private: @LIB_MATH@ +Libs.private: -ljpeg @LIB_MATH@ Cflags: -I${includedir} -+Requires.private: libtiff-4 ++Requires: libtiff-4 -- 1.7.8 diff --git a/src/lcms.mk b/src/lcms.mk index ae5bc14..f03f238 100644 --- a/src/lcms.mk +++ b/src/lcms.mk @@ -18,10 +18,7 @@ endef define $(PKG)_BUILD cd '$(1)' && ./configure \ - --prefix='$(PREFIX)/$(TARGET)' \ - --host='$(TARGET)' \ - --build="`config.guess`" \ - --disable-shared \ + $(MXE_CONFIGURE_OPTS) \ --with-jpeg \ --with-tiff \ --with-zlib diff --git a/src/libgcrypt.mk b/src/libgcrypt.mk index bd3be3d..dbb42a9 100644 --- a/src/libgcrypt.mk +++ b/src/libgcrypt.mk @@ -19,10 +19,7 @@ endef define $(PKG)_CONFIGURE cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ - --disable-shared \ - --prefix='$(PREFIX)/$(TARGET)' \ + $(MXE_CONFIGURE_OPTS) \ --with-gpg-error-prefix='$(PREFIX)/$(TARGET)' endef diff --git a/src/libgpg_error.mk b/src/libgpg_error.mk index 58732b5..83213d4 100644 --- a/src/libgpg_error.mk +++ b/src/libgpg_error.mk @@ -18,10 +18,7 @@ endef define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ - --disable-shared \ - --prefix='$(PREFIX)/$(TARGET)' \ + $(MXE_CONFIGURE_OPTS) \ --disable-nls \ --disable-languages $(MAKE) -C '$(1)/src' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= diff --git a/src/libiconv.mk b/src/libiconv.mk index 1ac605c..c939e29 100644 --- a/src/libiconv.mk +++ b/src/libiconv.mk @@ -20,9 +20,7 @@ endef define $(PKG)_BUILD $(SED) -i 's, sed , $(SED) ,g' '$(1)/windows/windres-options' cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --prefix='$(PREFIX)/$(TARGET)' \ - --disable-shared \ + $(MXE_CONFIGURE_OPTS) \ --disable-nls $(MAKE) -C '$(1)/libcharset' -j '$(JOBS)' install $(MAKE) -C '$(1)/lib' -j '$(JOBS)' install diff --git a/src/libmng.mk b/src/libmng.mk index 6f08e09..c1ea157 100644 --- a/src/libmng.mk +++ b/src/libmng.mk @@ -17,10 +17,8 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD + echo 'Requires: zlib lcms2 jpeg' >> '$(1)/libmng.pc.in' cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ - --disable-shared \ - --prefix='$(PREFIX)/$(TARGET)' + $(MXE_CONFIGURE_OPTS) $(MAKE) -C '$(1)' -j '$(JOBS)' install endef diff --git a/src/libpng.mk b/src/libpng.mk index 7cc574c..1a29162 100644 --- a/src/libpng.mk +++ b/src/libpng.mk @@ -22,10 +22,7 @@ endef define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ - --disable-shared \ - --prefix='$(PREFIX)/$(TARGET)' + $(MXE_CONFIGURE_OPTS) $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= ln -sf '$(PREFIX)/$(TARGET)/bin/libpng-config' '$(PREFIX)/bin/$(TARGET)-libpng-config' diff --git a/src/nettle.mk b/src/nettle.mk index 15dbd39..fd6bc35 100644 --- a/src/nettle.mk +++ b/src/nettle.mk @@ -20,10 +20,7 @@ endef define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ - --disable-shared \ - --prefix='$(PREFIX)/$(TARGET)' - $(MAKE) -C '$(1)' -j '$(JOBS)' getopt.o getopt1.o - $(MAKE) -C '$(1)' -j '$(JOBS)' install + $(MXE_CONFIGURE_OPTS) + $(MAKE) -C '$(1)' -j '$(JOBS)' $(if $(BUILD_STATIC),getopt.o getopt1.o,) SUBDIRS= + $(MAKE) -C '$(1)' -j '$(JOBS)' install SUBDIRS= endef diff --git a/src/openssl.mk b/src/openssl.mk index 3059727..80a57d2 100644 --- a/src/openssl.mk +++ b/src/openssl.mk @@ -22,13 +22,14 @@ define $(PKG)_BUILD cd '$(1)' && CC='$(TARGET)-gcc' ./Configure \ mingw \ zlib \ - no-shared \ + $(if $(BUILD_STATIC),no-,)shared \ no-capieng \ --prefix='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' install -j 1 \ CC='$(TARGET)-gcc' \ RANLIB='$(TARGET)-ranlib' \ - AR='$(TARGET)-ar rcu' + AR='$(TARGET)-ar rcu' \ + CROSS_COMPILE='$(TARGET)-' endef $(PKG)_BUILD_x86_64-w64-mingw32 = $(subst mingw ,mingw64 ,$($(PKG)_BUILD)) diff --git a/src/pcre.mk b/src/pcre.mk index 267fcf8..3a18848 100644 --- a/src/pcre.mk +++ b/src/pcre.mk @@ -17,14 +17,9 @@ define $(PKG)_UPDATE head -1 endef -define $(PKG)_BUILD - $(SED) -i 's,__declspec(dllimport),,' '$(1)/pcre.h.in' - $(SED) -i 's,__declspec(dllimport),,' '$(1)/pcreposix.h' +define $(PKG)_BUILD_SHARED cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ - --disable-shared \ - --prefix='$(PREFIX)/$(TARGET)' \ + $(MXE_CONFIGURE_OPTS) \ --enable-pcre16 \ --enable-utf \ --enable-unicode-properties \ @@ -36,3 +31,9 @@ define $(PKG)_BUILD $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= ln -sf '$(PREFIX)/$(TARGET)/bin/pcre-config' '$(PREFIX)/bin/$(TARGET)-pcre-config' endef + +define $(PKG)_BUILD + $(SED) -i 's,__declspec(dllimport),,' '$(1)/pcre.h.in' + $(SED) -i 's,__declspec(dllimport),,' '$(1)/pcreposix.h' + $($(PKG)_BUILD_SHARED) +endef diff --git a/src/postgresql.mk b/src/postgresql.mk index 0a03a4e..3029e8c 100644 --- a/src/postgresql.mk +++ b/src/postgresql.mk @@ -24,10 +24,7 @@ define $(PKG)_BUILD cp -Rp '$(1)' '$(1).native' # Since we build only client libary, use bogus tzdata to satisfy configure. cd '$(1)' && ./configure \ - --prefix='$(PREFIX)/$(TARGET)' \ - --host='$(TARGET)' \ - --build="`config.guess`" \ - --disable-shared \ + $(MXE_CONFIGURE_OPTS) \ --disable-rpath \ --without-tcl \ --without-perl \ @@ -46,9 +43,9 @@ define $(PKG)_BUILD --with-system-tzdata=/dev/null \ LIBS="-lsecur32 `'$(TARGET)-pkg-config' openssl --libs`" \ ac_cv_func_getaddrinfo=no - $(MAKE) -C '$(1)'/src/interfaces/libpq -j '$(JOBS)' install haslibarule= shlib= - $(MAKE) -C '$(1)'/src/port -j '$(JOBS)' haslibarule= shlib= - $(MAKE) -C '$(1)'/src/bin/psql -j '$(JOBS)' install haslibarule= shlib= + $(MAKE) -C '$(1)'/src/interfaces/libpq -j '$(JOBS)' install $(if $(BUILD_STATIC),haslibarule= shlib=) + $(MAKE) -C '$(1)'/src/port -j '$(JOBS)' $(if $(BUILD_STATIC),haslibarule= shlib=) + $(MAKE) -C '$(1)'/src/bin/psql -j '$(JOBS)' install $(if $(BUILD_STATIC),haslibarule= shlib=) $(INSTALL) -m644 '$(1)/src/include/pg_config.h' '$(PREFIX)/$(TARGET)/include/' $(INSTALL) -m644 '$(1)/src/include/postgres_ext.h' '$(PREFIX)/$(TARGET)/include/' $(INSTALL) -d '$(PREFIX)/$(TARGET)/include/libpq' diff --git a/src/qt-2-designer.patch b/src/qt-2-designer.patch new file mode 100644 index 0000000..e06b6f7 --- /dev/null +++ b/src/qt-2-designer.patch @@ -0,0 +1,16 @@ +This file is part of MXE. +See index.html for further information. + +diff --git a/tools/designer/src/plugins/activeqt/activeqt.pro b/tools/designer/src/plugins/activeqt/activeqt.pro +index f58df8a..5d9bdd4 100644 +--- a/tools/designer/src/plugins/activeqt/activeqt.pro ++++ b/tools/designer/src/plugins/activeqt/activeqt.pro +@@ -10,6 +10,8 @@ build_all:!build_pass { + + INCLUDEPATH += $$QT_SOURCE_TREE/src/activeqt/shared/ \ + $$QT_BUILD_TREE/src/activeqt/container \ ++ $$QT_BUILD_TREE/src/activeqt/container/.uic/release-shared \ ++ $$QT_BUILD_TREE/src/activeqt/container/.uic/debug-shared \ + ../../lib/uilib + + # Input @@ -72,8 +72,17 @@ define $(PKG)_BUILD ln -sf '$(PREFIX)/$(TARGET)/qt/bin/qmake' '$(PREFIX)/bin/$(TARGET)'-qmake-qt4 cd '$(1)/tools/assistant' && '$(1)/bin/qmake' assistant.pro + # can't figure out where -lQtCLucene comes from so use + # sed on the output instead of patching the input + $(MAKE) -C '$(1)/tools/assistant' sub-lib-qmake_all + $(SED) -i 's,-lQtCLucene$$,-lQtCLucene4,' '$(1)/tools/assistant/lib/Makefile.Release' $(MAKE) -C '$(1)/tools/assistant' -j '$(JOBS)' install + # likewise for these two + cd '$(1)/tools/designer/src/designer' && '$(1)/bin/qmake' designer.pro + $(if $(BUILD_SHARED),\ + $(SED) -i 's/-lQtDesignerComponents /-lQtDesignerComponents4 /' '$(1)/tools/designer/src/designer/Makefile.Release' && \ + $(SED) -i 's/-lQtDesigner /-lQtDesigner4 /' '$(1)/tools/designer/src/designer/Makefile.Release',) cd '$(1)/tools/designer' && '$(1)/bin/qmake' designer.pro $(MAKE) -C '$(1)/tools/designer' -j '$(JOBS)' install @@ -98,3 +107,8 @@ define $(PKG)_BUILD -I'$(1)/test-$(PKG)-pkgconfig' \ `'$(TARGET)-pkg-config' QtGui --cflags --libs` endef + +$(PKG)_BUILD_SHARED = $(subst -static ,-shared ,\ + $(subst -no-webkit ,-webkit ,\ + $(subst -qt-sql-,-plugin-sql-,\ + $($(PKG)_BUILD)))) diff --git a/src/sqlite.mk b/src/sqlite.mk index 0ef1c0b..aedffac 100644 --- a/src/sqlite.mk +++ b/src/sqlite.mk @@ -18,10 +18,7 @@ endef define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ - --disable-shared \ - --prefix='$(PREFIX)/$(TARGET)' \ + $(MXE_CONFIGURE_OPTS) \ --disable-readline \ --enable-threadsafe $(MAKE) -C '$(1)' -j '$(JOBS)' install diff --git a/src/tiff.mk b/src/tiff.mk index d8552a1..3683c4e 100644 --- a/src/tiff.mk +++ b/src/tiff.mk @@ -19,10 +19,7 @@ endef define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ - --disable-shared \ - --prefix='$(PREFIX)/$(TARGET)' \ + $(MXE_CONFIGURE_OPTS) \ --without-x $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef @@ -18,10 +18,7 @@ endef define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ - --prefix='$(PREFIX)/$(TARGET)' \ - --disable-shared \ + $(MXE_CONFIGURE_OPTS) \ --disable-threads \ --disable-nls $(MAKE) -C '$(1)'/src/liblzma -j '$(JOBS)' install diff --git a/src/zlib.mk b/src/zlib.mk index a61751c..5980760 100644 --- a/src/zlib.mk +++ b/src/zlib.mk @@ -23,3 +23,14 @@ define $(PKG)_BUILD --static $(MAKE) -C '$(1)' -j '$(JOBS)' install endef + +define $(PKG)_BUILD_SHARED + $(MAKE) -C '$(1)' -f win32/Makefile.gcc \ + SHARED_MODE=1 \ + STATICLIB= \ + BINARY_PATH='$(PREFIX)/$(TARGET)/bin' \ + INCLUDE_PATH='$(PREFIX)/$(TARGET)/include' \ + LIBRARY_PATH='$(PREFIX)/$(TARGET)/lib' \ + PREFIX='$(TARGET)-' \ + -j '$(JOBS)' install +endef |