diff options
| author | Tony Theodore <tonyt@logyst.com> | 2014-02-17 05:01:50 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2014-02-17 05:01:50 (GMT) |
| commit | 89f10e44f86b314387c0d0968193fe26d4eef22f (patch) | |
| tree | a8709023591944a9ebf2218beb14e4e46878cd59 | |
| parent | d48821a8bb3d8652d156904ae6d85816a0259cc9 (diff) | |
| download | mxe-89f10e44f86b314387c0d0968193fe26d4eef22f.zip mxe-89f10e44f86b314387c0d0968193fe26d4eef22f.tar.gz mxe-89f10e44f86b314387c0d0968193fe26d4eef22f.tar.bz2 | |
packages curl fftw fltk freetds gnutls libidn libssh2: enable/fix shared build
| -rw-r--r-- | src/curl.mk | 5 | ||||
| -rw-r--r-- | src/fftw.mk | 3 | ||||
| -rw-r--r-- | src/fltk.mk | 7 | ||||
| -rw-r--r-- | src/freetds.mk | 2 | ||||
| -rw-r--r-- | src/gnutls.mk | 2 | ||||
| -rw-r--r-- | src/libidn.mk | 5 | ||||
| -rw-r--r-- | src/libssh2.mk | 4 |
7 files changed, 6 insertions, 22 deletions
diff --git a/src/curl.mk b/src/curl.mk index 1941220..b899945 100644 --- a/src/curl.mk +++ b/src/curl.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) \ --with-gnutls \ --with-libidn \ --enable-sspi \ diff --git a/src/fftw.mk b/src/fftw.mk index 8bfb541..b4eac9b 100644 --- a/src/fftw.mk +++ b/src/fftw.mk @@ -21,14 +21,12 @@ endef define $(PKG)_BUILD cd '$(1)' && ./configure \ $(MXE_CONFIGURE_OPTS) \ - --build="`config.guess`" \ --enable-threads $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= cd '$(1)' && ./configure \ $(MXE_CONFIGURE_OPTS) \ - --build="`config.guess`" \ --enable-threads \ --enable-long-double $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= @@ -36,7 +34,6 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ $(MXE_CONFIGURE_OPTS) \ - --build="`config.guess`" \ --enable-threads \ --enable-float $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= diff --git a/src/fltk.mk b/src/fltk.mk index 37f0ba5..235d2b6 100644 --- a/src/fltk.mk +++ b/src/fltk.mk @@ -21,10 +21,7 @@ define $(PKG)_BUILD cd '$(1)' && autoconf $(SED) -i 's,\$$uname,MINGW,g' '$(1)/configure' cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ - --disable-shared \ - --prefix='$(PREFIX)/$(TARGET)' \ + $(MXE_CONFIGURE_OPTS) \ --enable-threads \ LIBS='-lws2_32' # enable exceptions, because disabling them doesn't make any sense on PCs @@ -35,5 +32,5 @@ define $(PKG)_BUILD '$(TARGET)-g++' \ -W -Wall -Werror -pedantic -ansi \ '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-fltk.exe' \ - `$(TARGET)-fltk-config --cxxflags --ldstaticflags` + `$(TARGET)-fltk-config --cxxflags --ld$(if $(BUILD_STATIC),static)flags` endef diff --git a/src/freetds.mk b/src/freetds.mk index 0731899..f81e581 100644 --- a/src/freetds.mk +++ b/src/freetds.mk @@ -32,7 +32,7 @@ define $(PKG)_BUILD --enable-sspi \ --disable-threadsafe \ --with-tdsver=7.2 \ - --with$(if $(BUILD_SHARED),out)-gnutls \ + --with-gnutls \ PKG_CONFIG='$(TARGET)-pkg-config' $(MAKE) -C '$(1)' -j '$(JOBS)' install man_MANS= endef diff --git a/src/gnutls.mk b/src/gnutls.mk index 2be7de2..2b997d7 100644 --- a/src/gnutls.mk +++ b/src/gnutls.mk @@ -48,5 +48,3 @@ 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/libidn.mk b/src/libidn.mk index 7e71c83..c5fe124 100644 --- a/src/libidn.mk +++ b/src/libidn.mk @@ -19,11 +19,8 @@ endef define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ - --disable-shared \ + $(MXE_CONFIGURE_OPTS) \ --disable-csharp \ - --prefix='$(PREFIX)/$(TARGET)' \ --with-libiconv-prefix='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= diff --git a/src/libssh2.mk b/src/libssh2.mk index 1020b2f..9ea781b 100644 --- a/src/libssh2.mk +++ b/src/libssh2.mk @@ -20,9 +20,7 @@ endef define $(PKG)_BUILD cd '$(1)' && ./buildconf cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --disable-shared \ - --prefix='$(PREFIX)/$(TARGET)' \ + $(MXE_CONFIGURE_OPTS) \ --without-openssl \ --with-libgcrypt \ PKG_CONFIG='$(TARGET)-pkg-config' |