diff --git a/Makefile b/Makefile index 085d9e8..b531ca3 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ MXE_TARGET_LIST := i686-pc-mingw32 x86_64-w64-mingw32 i686-w64-mingw32 MXE_TARGETS := i686-pc-mingw32 -DEFAULT_MAX_JOBS := 6 +DEFAULT_MAX_JOBS := 1 SOURCEFORGE_MIRROR := freefr.dl.sourceforge.net PKG_MIRROR := s3.amazonaws.com/mxe-pkg PKG_CDN := d1yihgixbnrglp.cloudfront.net @@ -257,7 +257,9 @@ build-only-$(1)_$(3): cd '$(2)/$($(1)_SUBDIR)' $(foreach PKG_PATCH,$(sort $(wildcard $(TOP_DIR)/src/$(1)-*.patch)), (cd '$(2)/$($(1)_SUBDIR)' && $(PATCH) -p1 -u) < $(PKG_PATCH)) + # DISPLAY=:0 gnome-terminal --disable-factory $$(call $(if $(value $(1)_BUILD_$(3)),$(1)_BUILD_$(3),$(1)_BUILD),$(2)/$($(1)_SUBDIR),$(TOP_DIR)/src/$(1)-test) + # DISPLAY=:0 gnome-terminal --disable-factory (du -k -d 0 '$(2)' 2>/dev/null || du -k --max-depth 0 '$(2)') | $(SED) -n 's/^\(\S*\).*/du: \1 KiB/p' rm -rfv '$(2)' ,) diff --git a/src/binutils.mk b/src/binutils.mk index 32bd668..008ebef 100644 --- a/src/binutils.mk +++ b/src/binutils.mk @@ -36,7 +36,6 @@ define $(PKG)_BUILD --with-gnu-ld \ --with-gnu-as \ --disable-nls \ - --disable-shared \ --disable-werror $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install diff --git a/src/bzip2-2-shared.patch b/src/bzip2-2-shared.patch new file mode 100644 index 0000000..1a46da5 --- /dev/null +++ b/src/bzip2-2-shared.patch @@ -0,0 +1,29 @@ +diff -u bzip2-1.0.6/Makefile-libbz2_so bzip2-1.0.6.orig/Makefile-libbz2_so +--- bzip2-1.0.6/Makefile-libbz2_so 2010-09-11 01:07:52.000000000 +0200 ++++ bzip2-1.0.6.orig/Makefile-libbz2_so 2013-09-11 14:04:03.000000000 +0200 +@@ -24,7 +24,7 @@ + SHELL=/bin/sh + CC=gcc + BIGFILES=-D_FILE_OFFSET_BITS=64 +-CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES) ++CFLAGS=-Wall -Winline -O2 -g $(BIGFILES) + + OBJS= blocksort.o \ + huffman.o \ +@@ -35,13 +35,11 @@ + bzlib.o + + all: $(OBJS) +- $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS) +- $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6 +- rm -f libbz2.so.1.0 +- ln -s libbz2.so.1.0.6 libbz2.so.1.0 ++ $(CC) -shared -o libbz2.dll -Wl,--enable-auto-image-base -Xlinker --out-implib -Xlinker libbz2.dll.a $(OBJS) ++ $(CC) $(CFLAGS) -o bzip2.exe bzip2.c libbz2.dll.a + + clean: +- rm -f $(OBJS) bzip2.o libbz2.so.1.0.6 libbz2.so.1.0 bzip2-shared ++ rm -f $(OBJS) bzip2.o libbz2.dll libbz2.dll.a bzip2.exe + + blocksort.o: blocksort.c + $(CC) $(CFLAGS) -c blocksort.c diff --git a/src/bzip2.mk b/src/bzip2.mk index d804b33..1a82d60 100644 --- a/src/bzip2.mk +++ b/src/bzip2.mk @@ -18,13 +18,13 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - $(MAKE) -C '$(1)' -j '$(JOBS)' libbz2.a \ + $(MAKE) -C '$(1)' -j '$(JOBS)' -f Makefile-libbz2_so \ PREFIX='$(PREFIX)/$(TARGET)' \ - CC='$(TARGET)-gcc' \ - AR='$(TARGET)-ar' \ - RANLIB='$(TARGET)-ranlib' + CC='$(TARGET)-gcc' $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib' - $(INSTALL) -m644 '$(1)/libbz2.a' '$(PREFIX)/$(TARGET)/lib/' + $(INSTALL) -m755 '$(1)/libbz2.dll.a' '$(PREFIX)/$(TARGET)/lib/' + $(INSTALL) -d '$(PREFIX)/$(TARGET)/bin' + $(INSTALL) -m755 '$(1)/libbz2.dll' '$(PREFIX)/$(TARGET)/bin/' $(INSTALL) -d '$(PREFIX)/$(TARGET)/include' $(INSTALL) -m644 '$(1)/bzlib.h' '$(PREFIX)/$(TARGET)/include/' endef diff --git a/src/dbus.mk b/src/dbus.mk index d573996..8f6d116 100644 --- a/src/dbus.mk +++ b/src/dbus.mk @@ -26,9 +26,9 @@ define $(PKG)_BUILD --disable-tests \ --disable-verbose-mode \ --disable-asserts \ - --disable-shared \ + --disable-static \ + --enable-shared \ --disable-maintainer-mode \ - --enable-static \ --disable-silent-rules \ --disable-launchd \ CFLAGS='-DPROCESS_QUERY_LIMITED_INFORMATION=0x1000' diff --git a/src/expat.mk b/src/expat.mk index 4ef5f5a..3ded137 100644 --- a/src/expat.mk +++ b/src/expat.mk @@ -19,7 +19,8 @@ endef define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --disable-shared \ + --disable-static \ + --enable-shared \ --prefix='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef diff --git a/src/fontconfig.mk b/src/fontconfig.mk index eb4a508..185db17 100644 --- a/src/fontconfig.mk +++ b/src/fontconfig.mk @@ -21,7 +21,8 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + --disable-static \ + --enable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --with-arch='$(TARGET)' \ --with-expat='$(PREFIX)/$(TARGET)' \ diff --git a/src/freetds.mk b/src/freetds.mk index cfa6c87..1bf213a 100644 --- a/src/freetds.mk +++ b/src/freetds.mk @@ -29,8 +29,8 @@ define $(PKG)_BUILD --build="`config.guess`" \ --disable-rpath \ --disable-dependency-tracking \ - --disable-shared \ - --enable-static \ + --disable-static \ + --enable-shared \ --enable-libiconv \ --enable-msdblib \ --enable-sspi \ diff --git a/src/freetype.mk b/src/freetype.mk index 42f65a3..5a71bd2 100644 --- a/src/freetype.mk +++ b/src/freetype.mk @@ -21,7 +21,8 @@ define $(PKG)_BUILD cd '$(1)' && GNUMAKE=$(MAKE) ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + --disable-static \ + --enable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ LIBPNG_CFLAGS="`$(TARGET)-pkg-config libpng --cflags`" \ LIBPNG_LDFLAGS="`$(TARGET)-pkg-config libpng --libs`" \ diff --git a/src/gcc.mk b/src/gcc.mk index 14971b4..2eaeda3 100644 --- a/src/gcc.mk +++ b/src/gcc.mk @@ -42,11 +42,9 @@ define $(PKG)_CONFIGURE --libdir='$(PREFIX)/lib' \ --enable-languages='c,c++,objc,fortran' \ --enable-version-specific-runtime-libs \ - --with-gcc \ --with-gnu-ld \ --with-gnu-as \ --disable-nls \ - --disable-shared \ --disable-multilib \ --without-x \ --disable-win32-registry \ @@ -61,7 +59,7 @@ endef define $(PKG)_POST_BUILD # create pkg-config script (echo '#!/bin/sh'; \ - echo 'PKG_CONFIG_PATH="$$PKG_CONFIG_PATH_$(subst -,_,$(TARGET))" PKG_CONFIG_LIBDIR='\''$(PREFIX)/$(TARGET)/lib/pkgconfig'\'' exec pkg-config --static "$$@"') \ + echo 'PKG_CONFIG_PATH="$$PKG_CONFIG_PATH_$(subst -,_,$(TARGET))" PKG_CONFIG_LIBDIR='\''$(PREFIX)/$(TARGET)/lib/pkgconfig'\'' exec pkg-config "$$@"') \ > '$(PREFIX)/bin/$(TARGET)-pkg-config' chmod 0755 '$(PREFIX)/bin/$(TARGET)-pkg-config' diff --git a/src/gettext.mk b/src/gettext.mk index 1211d79..38faa66 100644 --- a/src/gettext.mk +++ b/src/gettext.mk @@ -28,9 +28,10 @@ endef define $(PKG)_BUILD cd '$(1)/gettext-runtime' && ./configure \ --host='$(TARGET)' \ - --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --enable-threads=win32 \ + --disable-static \ + --enable-shared \ --without-libexpat-prefix \ --without-libxml2-prefix \ CONFIG_SHELL=$(SHELL) diff --git a/src/gmp.mk b/src/gmp.mk index d3cf1e5..fa08d42 100644 --- a/src/gmp.mk +++ b/src/gmp.mk @@ -24,7 +24,8 @@ define $(PKG)_BUILD --host='$(TARGET)' \ --build="`config.guess`" \ --prefix='$(PREFIX)/$(TARGET)' \ - --disable-shared \ + --disable-static \ + --enable-shared \ --enable-cxx \ --without-readline $(MAKE) -C '$(1)' -j '$(JOBS)' diff --git a/src/gnutls-2-shared.patch b/src/gnutls-2-shared.patch new file mode 100644 index 0000000..a860994 --- /dev/null +++ b/src/gnutls-2-shared.patch @@ -0,0 +1,108 @@ +--- gnutls-3.2.3.orig/src/Makefile.am 2013-03-03 10:04:09.000000000 +0100 ++++ gnutls-3.2.3/src/Makefile.am 2013-09-05 22:35:59.000000000 +0200 +@@ -66,16 +66,16 @@ + + if ENABLE_SRP + srptool_SOURCES = srptool.c +-srptool_LDADD = ../lib/libgnutls.la libcmd-srp.la ../gl/libgnu.la +-srptool_LDADD += $(LIBOPTS_LDADD) $(LTLIBINTL) ++srptool_LDADD = ../lib/libgnutls.la libcmd-srp.la ++srptool_LDADD += $(LIBOPTS_LDADD) ../gl/libgnu.la $(LTLIBINTL) + noinst_LTLIBRARIES += libcmd-srp.la + libcmd_srp_la_CFLAGS = + libcmd_srp_la_SOURCES = srptool-args.def srptool-args.c srptool-args.h + endif + + psktool_SOURCES = psk.c +-psktool_LDADD = ../lib/libgnutls.la libcmd-psk.la ../gl/libgnu.la +-psktool_LDADD += $(LIBOPTS_LDADD) $(LTLIBINTL) ++psktool_LDADD = ../lib/libgnutls.la libcmd-psk.la ++psktool_LDADD += $(LIBOPTS_LDADD) ../gl/libgnu.la $(LTLIBINTL) + noinst_LTLIBRARIES += libcmd-psk.la + libcmd_psk_la_CFLAGS = + libcmd_psk_la_SOURCES = psk-args.def psk-args.c psk-args.h +@@ -85,8 +85,8 @@ + + ocsptool_SOURCES = ocsptool.c ocsptool-common.h ocsptool-common.c \ + socket.c socket.h +-ocsptool_LDADD = ../lib/libgnutls.la libcmd-ocsp.la ../gl/libgnu.la +-ocsptool_LDADD += $(LIBOPTS_LDADD) $(LTLIBINTL) $(GETADDRINFO_LIB) ++ocsptool_LDADD = ../lib/libgnutls.la libcmd-ocsp.la ++ocsptool_LDADD += $(LIBOPTS_LDADD) ../gl/libgnu.la $(LTLIBINTL) $(GETADDRINFO_LIB) + noinst_LTLIBRARIES += libcmd-ocsp.la + libcmd_ocsp_la_CFLAGS = + libcmd_ocsp_la_SOURCES = ocsptool-args.def ocsptool-args.h ocsptool-args.c +@@ -98,8 +98,8 @@ + common.h common.c \ + certtool-common.h + gnutls_serv_LDADD = ../lib/libgnutls.la +-gnutls_serv_LDADD += libcmd-serv.la ../gl/libgnu.la +-gnutls_serv_LDADD += $(LIBOPTS_LDADD) $(LTLIBINTL) ++gnutls_serv_LDADD += libcmd-serv.la ++gnutls_serv_LDADD += $(LIBOPTS_LDADD) ../gl/libgnu.la $(LTLIBINTL) + gnutls_serv_LDADD += $(LIBSOCKET) $(GETADDRINFO_LIB) + noinst_LTLIBRARIES += libcmd-serv.la + libcmd_serv_la_CFLAGS = +@@ -116,7 +116,7 @@ + if ENABLE_DANE + gnutls_cli_LDADD += ../libdane/libgnutls-dane.la + endif +-gnutls_cli_LDADD += libcmd-cli.la ../gl/libgnu.la $(LIBOPTS_LDADD) $(LTLIBINTL) ++gnutls_cli_LDADD += libcmd-cli.la $(LIBOPTS_LDADD) ../gl/libgnu.la $(LTLIBINTL) + gnutls_cli_LDADD += $(LIBSOCKET) $(GETADDRINFO_LIB) $(LIB_CLOCK_GETTIME) \ + $(SERVENT_LIB) + noinst_LTLIBRARIES += libcmd-cli.la +@@ -128,8 +128,7 @@ + gnutls_cli_debug_SOURCES = cli-debug.c tests.h tests.c \ + socket.c socket.h common.h common.c + gnutls_cli_debug_LDADD = ../lib/libgnutls.la libcmd-cli-debug.la +-gnutls_cli_debug_LDADD += ../gl/libgnu.la +-gnutls_cli_debug_LDADD += $(LIBOPTS_LDADD) $(LTLIBINTL) ++gnutls_cli_debug_LDADD += $(LIBOPTS_LDADD) ../gl/libgnu.la $(LTLIBINTL) + gnutls_cli_debug_LDADD += $(LIBSOCKET) $(GETADDRINFO_LIB) + noinst_LTLIBRARIES += libcmd-cli-debug.la + libcmd_cli_debug_la_CFLAGS = +@@ -145,8 +144,8 @@ + libcmd_certtool_la_CFLAGS = + libcmd_certtool_la_SOURCES = certtool-args.c certtool-args.def certtool-args.h \ + certtool-cfg.h certtool-cfg.c +-libcmd_certtool_la_LIBADD = ../gl/libgnu.la ../lib/libgnutls.la +-libcmd_certtool_la_LIBADD += $(LIBOPTS_LDADD) $(LTLIBINTL) ++libcmd_certtool_la_LIBADD = ../lib/libgnutls.la ++libcmd_certtool_la_LIBADD += $(LIBOPTS_LDADD) ../gl/libgnu.la $(LTLIBINTL) + libcmd_certtool_la_LIBADD += $(LTLIBREADLINE) + libcmd_certtool_la_LIBADD += $(INET_PTON_LIB) + +@@ -161,8 +160,8 @@ + libcmd_danetool_la_CFLAGS = + libcmd_danetool_la_SOURCES = danetool-args.c danetool-args.def danetool-args.h \ + certtool-cfg.h certtool-cfg.c +-libcmd_danetool_la_LIBADD = ../gl/libgnu.la ../lib/libgnutls.la +-libcmd_danetool_la_LIBADD += $(LIBOPTS_LDADD) $(LTLIBINTL) ++libcmd_danetool_la_LIBADD = ../lib/libgnutls.la ++libcmd_danetool_la_LIBADD += $(LIBOPTS_LDADD) ../gl/libgnu.la $(LTLIBINTL) + libcmd_danetool_la_LIBADD += $(LTLIBREADLINE) + libcmd_danetool_la_LIBADD += $(INET_PTON_LIB) + +@@ -172,8 +171,8 @@ + p11tool_SOURCES = p11tool-args.def p11tool.c pkcs11.c certtool-common.c \ + certtool-extras.c p11tool.h common.c + p11tool_LDADD = ../lib/libgnutls.la +-p11tool_LDADD += libcmd-p11tool.la ../gl/libgnu.la +-p11tool_LDADD += $(LIBOPTS_LDADD) $(LTLIBINTL) ++p11tool_LDADD += libcmd-p11tool.la ++p11tool_LDADD += $(LIBOPTS_LDADD) ../gl/libgnu.la $(LTLIBINTL) + + noinst_LTLIBRARIES += libcmd-p11tool.la + libcmd_p11tool_la_CFLAGS = +@@ -188,8 +187,8 @@ + + tpmtool_SOURCES = tpmtool-args.def tpmtool.c certtool-common.c certtool-extras.c common.c + tpmtool_LDADD = ../lib/libgnutls.la +-tpmtool_LDADD += libcmd-tpmtool.la ../gl/libgnu.la +-tpmtool_LDADD += $(LIBOPTS_LDADD) $(LTLIBINTL) ++tpmtool_LDADD += libcmd-tpmtool.la ++tpmtool_LDADD += $(LIBOPTS_LDADD) ../gl/libgnu.la $(LTLIBINTL) + + noinst_LTLIBRARIES += libcmd-tpmtool.la + libcmd_tpmtool_la_CFLAGS = diff --git a/src/gnutls.mk b/src/gnutls.mk index 569a884..e5458aa 100644 --- a/src/gnutls.mk +++ b/src/gnutls.mk @@ -28,8 +28,8 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --enable-static \ - --disable-shared \ + --disable-static \ + --enable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-rpath \ --disable-nls \ diff --git a/src/icu4c.mk b/src/icu4c.mk index e577103..6438b06 100644 --- a/src/icu4c.mk +++ b/src/icu4c.mk @@ -24,8 +24,8 @@ define $(PKG)_BUILD --host='$(TARGET)' \ --build="`config.guess`" \ --prefix='$(PREFIX)/$(TARGET)' \ - --enable-static \ - --disable-shared \ + --disable-static \ + --enable-shared \ --with-cross-build='$(1).native' \ CFLAGS=-DU_USING_ICU_NAMESPACE=0 \ SHELL=bash diff --git a/src/jpeg.mk b/src/jpeg.mk index 9ae26d6..dfb55d3 100644 --- a/src/jpeg.mk +++ b/src/jpeg.mk @@ -20,7 +20,8 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --prefix='$(PREFIX)/$(TARGET)' \ --host='$(TARGET)' \ - --disable-shared + --disable-static \ + --enable-shared $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS= '$(TARGET)-gcc' \ diff --git a/src/lcms.mk b/src/lcms.mk index ae5bc14..9ce8fa5 100644 --- a/src/lcms.mk +++ b/src/lcms.mk @@ -21,7 +21,8 @@ define $(PKG)_BUILD --prefix='$(PREFIX)/$(TARGET)' \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + --disable-static \ + --enable-shared \ --with-jpeg \ --with-tiff \ --with-zlib diff --git a/src/libgcrypt.mk b/src/libgcrypt.mk index bd3be3d..0ba0128 100644 --- a/src/libgcrypt.mk +++ b/src/libgcrypt.mk @@ -21,7 +21,8 @@ define $(PKG)_CONFIGURE cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + --disable-static \ + --enable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --with-gpg-error-prefix='$(PREFIX)/$(TARGET)' endef diff --git a/src/libgpg_error.mk b/src/libgpg_error.mk index 58732b5..b15b2c3 100644 --- a/src/libgpg_error.mk +++ b/src/libgpg_error.mk @@ -20,8 +20,9 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ + --disable-static \ + --enable-shared \ --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 0acec57..8d42d31 100644 --- a/src/libiconv.mk +++ b/src/libiconv.mk @@ -30,7 +30,8 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ --prefix='$(PREFIX)/$(TARGET)' \ - --disable-shared \ + --disable-static \ + --enable-shared \ --disable-nls $(MAKE) -C '$(1)/libcharset' -j '$(JOBS)' install $(MAKE) -C '$(1)/lib' -j '$(JOBS)' install diff --git a/src/libmng-1-shared.patch b/src/libmng-1-shared.patch new file mode 100644 index 0000000..be07482 --- /dev/null +++ b/src/libmng-1-shared.patch @@ -0,0 +1,11 @@ +--- libmng-2.0.2.orig/Makefile.in 2013-03-05 13:13:02.000000000 +0100 ++++ libmng-2.0.2/Makefile.in 2013-09-05 23:23:29.000000000 +0200 +@@ -329,7 +329,7 @@ + + # libmng release @VERSION@ + libmng_la_LDFLAGS = \ +- -version-number @MNG_MAJOR_NR@:@MNG_MINOR_NR@:@MNG_RELEASE_NR@ ++ -version-number @MNG_MAJOR_NR@:@MNG_MINOR_NR@:@MNG_RELEASE_NR@ -no-undefined + + lib_LTLIBRARIES = libmng.la + include_HEADERS = libmng.h libmng_conf.h libmng_types.h diff --git a/src/libmng.mk b/src/libmng.mk index 6f08e09..7fc4fef 100644 --- a/src/libmng.mk +++ b/src/libmng.mk @@ -20,7 +20,8 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + --disable-static \ + --enable-shared \ --prefix='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' -j '$(JOBS)' install endef diff --git a/src/libodbc++-2-win32-shared.patch b/src/libodbc++-2-win32-shared.patch new file mode 100644 index 0000000..c3c5b70 --- /dev/null +++ b/src/libodbc++-2-win32-shared.patch @@ -0,0 +1,12 @@ +diff -u libodbc++-0.2.5.orig/src/Makefile.in libodbc++-0.2.5/src/Makefile.in +--- libodbc++-0.2.5.orig/src/Makefile.in 2013-09-01 00:26:11.000000000 +0200 ++++ libodbc++-0.2.5/src/Makefile.in 2013-09-01 00:24:42.000000000 +0200 +@@ -278,7 +278,7 @@ + datahandler.h \ + driverinfo.h + +-ldflags = -version-info @lib_version@ ++ldflags = -no-undefined -version-info @lib_version@ + @QT_FALSE@@address@hidden = libodbc++.la + @QT_FALSE@@address@hidden = libodbc++-mt.la + @QT_TRUE@@address@hidden = libodbc++_qt.la diff --git a/src/libodbc++.mk b/src/libodbc++.mk index 25e93b4..646c95f 100644 --- a/src/libodbc++.mk +++ b/src/libodbc++.mk @@ -25,8 +25,10 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --prefix='$(PREFIX)/$(TARGET)' \ --host='$(TARGET)' \ - --disable-shared \ + --disable-static \ + --enable-shared \ --without-tests \ - --disable-dependency-tracking + --disable-dependency-tracking \ + LIBS=-lodbc32 OBJDUMP="i686-pc-mingw32-objdump" $(MAKE) -C '$(1)' -j '$(JOBS)' install doxygen= progref_dist_files= endef diff --git a/src/libpng.mk b/src/libpng.mk index e870e9a..3f99654 100644 --- a/src/libpng.mk +++ b/src/libpng.mk @@ -25,7 +25,8 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + --disable-static \ + --enable-shared \ --prefix='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= ln -sf '$(PREFIX)/$(TARGET)/bin/libpng-config' '$(PREFIX)/bin/$(TARGET)-libpng-config' @@ -33,5 +34,5 @@ define $(PKG)_BUILD '$(TARGET)-gcc' \ -W -Wall -Werror -std=c99 -pedantic \ '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-libpng.exe' \ - `'$(PREFIX)/$(TARGET)/bin/libpng-config' --static --cflags --libs` + `'$(PREFIX)/$(TARGET)/bin/libpng-config' --cflags --libs` endef diff --git a/src/nettle-1-shared.patch b/src/nettle-1-shared.patch new file mode 100644 index 0000000..f84587b --- /dev/null +++ b/src/nettle-1-shared.patch @@ -0,0 +1,26 @@ +--- nettle-2.7.orig/tools/Makefile.in 2013-09-11 09:34:53.000000000 +0200 ++++ nettle-2.7/tools/Makefile.in 2013-09-11 09:35:35.000000000 +0200 +@@ -34,19 +34,19 @@ + DISTFILES = $(SOURCES) Makefile.in input.h misc.h output.h parse.h + + sexp_conv_OBJS = $(sexp_conv_SOURCES:.c=.$(OBJEXT)) $(getopt_OBJS) +-sexp-conv$(EXEEXT): $(sexp_conv_OBJS) ../libnettle.a ++sexp-conv$(EXEEXT): $(sexp_conv_OBJS) ../$(LIBNETTLE_FILE) + $(LINK) $(sexp_conv_OBJS) -lnettle $(LIBS) -o $@ + +-nettle-lfib-stream$(EXEEXT): nettle-lfib-stream.$(OBJEXT) ../libnettle.a ++nettle-lfib-stream$(EXEEXT): nettle-lfib-stream.$(OBJEXT) ../$(LIBNETTLE_FILE) + $(LINK) nettle-lfib-stream.$(OBJEXT) -lnettle $(LIBS) -o $@ + + pkcs1_conv_OBJS = $(pkcs1_conv_SOURCES:.c=.$(OBJEXT)) $(getopt_OBJS) +-pkcs1-conv$(EXEEXT): $(pkcs1_conv_OBJS) ../libnettle.a ../libhogweed.a ++pkcs1-conv$(EXEEXT): $(pkcs1_conv_OBJS) ../$(LIBNETTLE_FILE) ../$(LIBHOGWEED_FILE) + $(LINK) $(pkcs1_conv_OBJS) -lhogweed -lnettle $(LIBS) -o $@ + + # FIXME: Avoid linking with gmp + nettle_hash_OBJS = $(nettle_hash_SOURCES:.c=.$(OBJEXT)) $(getopt_OBJS) +-nettle-hash$(EXEEXT): $(nettle_hash_OBJS) ../libnettle.a ++nettle-hash$(EXEEXT): $(nettle_hash_OBJS) ../$(LIBNETTLE_FILE) + $(LINK) $(nettle_hash_OBJS) -lnettle $(LIBS) -o $@ + + diff --git a/src/nettle.mk b/src/nettle.mk index 15dbd39..e682412 100644 --- a/src/nettle.mk +++ b/src/nettle.mk @@ -22,8 +22,9 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ - --prefix='$(PREFIX)/$(TARGET)' + --prefix='$(PREFIX)/$(TARGET)' \ + --disable-static \ + --enable-shared $(MAKE) -C '$(1)' -j '$(JOBS)' getopt.o getopt1.o $(MAKE) -C '$(1)' -j '$(JOBS)' install endef diff --git a/src/openssl.mk b/src/openssl.mk index 414dd37..0cc5b1d 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 \ + 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 5477802..4a04daf 100644 --- a/src/pcre.mk +++ b/src/pcre.mk @@ -23,8 +23,9 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ + --disable-static \ + --enable-shared \ --enable-pcre16 \ --enable-utf \ --enable-unicode-properties \ diff --git a/src/postgresql.mk b/src/postgresql.mk index 999f1b9..6927e52 100644 --- a/src/postgresql.mk +++ b/src/postgresql.mk @@ -27,7 +27,6 @@ define $(PKG)_BUILD --prefix='$(PREFIX)/$(TARGET)' \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ --disable-rpath \ --without-tcl \ --without-perl \ @@ -46,16 +45,17 @@ 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 + $(MAKE) -C '$(1)'/src/port -j '$(JOBS)' + $(MAKE) -C '$(1)'/src/bin/psql -j '$(JOBS)' install $(INSTALL) -m644 '$(1)/src/include/pg_config.h' '$(PREFIX)/$(TARGET)/include/' $(INSTALL) -m644 '$(1)/src/include/postgres_ext.h' '$(PREFIX)/$(TARGET)/include/' # Build a native pg_config. $(SED) -i 's,-DVAL_,-D_DISABLED_VAL_,g' '$(1).native'/src/bin/pg_config/Makefile cd '$(1).native' && ./configure \ --prefix='$(PREFIX)/$(TARGET)' \ - --disable-shared \ + --disable-static \ + --enable-shared \ --disable-rpath \ --without-tcl \ --without-perl \ diff --git a/src/qt-2-shared.patch b/src/qt-2-shared.patch new file mode 100644 index 0000000..41d38f7 --- /dev/null +++ b/src/qt-2-shared.patch @@ -0,0 +1,24 @@ +diff --git a/tools/activeqt/testcon/testcon.pro b/tools/activeqt/testcon/testcon.pro +index 89f8067..696be2e 100644 +--- a/tools/activeqt/testcon/testcon.pro ++++ b/tools/activeqt/testcon/testcon.pro +@@ -7,6 +7,7 @@ CONFIG += qaxserver qaxserver_no_postlink qaxcontainer + INCLUDEPATH += $$QT_SOURCE_TREE/tools/activeqt/container/debug \ + $$QT_SOURCE_TREE/tools/activeqt/container/release \ + $$QT_BUILD_TREE/src/activeqt/container \ ++ $$QT_BUILD_TREE/src/activeqt/container/.uic/release-shared \ + + SOURCES = main.cpp docuwindow.cpp mainwindow.cpp invokemethod.cpp changeproperties.cpp ambientproperties.cpp controlinfo.cpp + HEADERS = docuwindow.h mainwindow.h invokemethod.h changeproperties.h ambientproperties.h controlinfo.h +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,7 @@ 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 \ + ../../lib/uilib + + # Input diff --git a/src/qt.mk b/src/qt.mk index b279e98..955d92c 100644 --- a/src/qt.mk +++ b/src/qt.mk @@ -33,13 +33,12 @@ define $(PKG)_BUILD -force-pkg-config \ -release \ -exceptions \ - -static \ + -shared \ -prefix '$(PREFIX)/$(TARGET)/qt' \ -prefix-install \ -script \ -no-iconv \ -opengl desktop \ - -no-webkit \ -no-glib \ -no-gstreamer \ -no-phonon \ @@ -51,11 +50,11 @@ define $(PKG)_BUILD -nomake demos \ -nomake docs \ -nomake examples \ - -qt-sql-sqlite \ - -qt-sql-odbc \ - -qt-sql-psql \ + -plugin-sql-sqlite \ + -plugin-sql-odbc \ + -plugin-sql-psql \ -no-sql-mysql \ - -qt-sql-tds -D Q_USE_SYBASE \ + -plugin-sql-tds -D Q_USE_SYBASE \ -system-zlib \ -system-libpng \ -system-libjpeg \ diff --git a/src/sqlite.mk b/src/sqlite.mk index 5502922..e4a2f3a 100644 --- a/src/sqlite.mk +++ b/src/sqlite.mk @@ -20,7 +20,8 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + --disable-static \ + --enable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-readline \ --disable-threadsafe diff --git a/src/tiff.mk b/src/tiff.mk index d8552a1..4e01a70 100644 --- a/src/tiff.mk +++ b/src/tiff.mk @@ -21,7 +21,8 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + --disable-static \ + --enable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --without-x $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= diff --git a/src/xz.mk b/src/xz.mk index dd8f35f..d1b0663 100644 --- a/src/xz.mk +++ b/src/xz.mk @@ -21,7 +21,8 @@ define $(PKG)_BUILD --host='$(TARGET)' \ --build="`config.guess`" \ --prefix='$(PREFIX)/$(TARGET)' \ - --disable-shared \ + --disable-static \ + --enable-shared \ --disable-threads \ --disable-nls $(MAKE) -C '$(1)'/src/liblzma -j '$(JOBS)' install diff --git a/src/zlib.mk b/src/zlib.mk index a61751c..1f4a515 100644 --- a/src/zlib.mk +++ b/src/zlib.mk @@ -18,8 +18,10 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)' && CHOST='$(TARGET)' ./configure \ - --prefix='$(PREFIX)/$(TARGET)' \ - --static - $(MAKE) -C '$(1)' -j '$(JOBS)' install + cd '$(1)' \ + && make install -fwin32/Makefile.gcc \ + SHARED_MODE='1' \ + PREFIX='$(TARGET)-' \ + DESTDIR='$(PREFIX)/$(TARGET)' \ + BINARY_PATH=/bin INCLUDE_PATH=/include LIBRARY_PATH=/lib endef