diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/cblas.mk | 4 | ||||
| -rw-r--r-- | src/curl.mk | 1 | ||||
| -rw-r--r-- | src/eigen.mk | 2 | ||||
| -rw-r--r-- | src/gcc-3-static-libgcc.patch | 61 | ||||
| -rw-r--r-- | src/libgsasl-1-fixes.patch | 2 | ||||
| -rw-r--r-- | src/libgsasl.mk | 10 |
6 files changed, 69 insertions, 11 deletions
diff --git a/src/cblas.mk b/src/cblas.mk index 8f0d584..bcecdc9 100644 --- a/src/cblas.mk +++ b/src/cblas.mk @@ -35,10 +35,10 @@ define $(PKG)_BUILD '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ '$(1)/examples/cblas_example1.c' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \ - -lcblas -lblas -lgfortran + -lcblas -lblas -lgfortran -lquadmath '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ '$(1)/examples/cblas_example2.c' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG)-F77.exe' \ - -lcblas -lblas -lgfortran -DADD_ + -lcblas -lblas -lgfortran -lquadmath -DADD_ endef diff --git a/src/curl.mk b/src/curl.mk index 044c459..dc3390c 100644 --- a/src/curl.mk +++ b/src/curl.mk @@ -20,6 +20,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ $(MXE_CONFIGURE_OPTS) \ --with-gnutls \ + --without-ssl \ --with-libidn \ --enable-sspi \ --enable-ipv6 \ diff --git a/src/eigen.mk b/src/eigen.mk index d7cafc7..b13c39a 100644 --- a/src/eigen.mk +++ b/src/eigen.mk @@ -27,7 +27,7 @@ define $(PKG)_BUILD '$(TARGET)-g++' -W -Wall '$(2).cpp' -o \ '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \ - `'$(TARGET)-pkg-config' --cflags --lib eigen3` + `'$(TARGET)-pkg-config' --cflags --libs eigen3` endef $(PKG)_BUILD_SHARED = diff --git a/src/gcc-3-static-libgcc.patch b/src/gcc-3-static-libgcc.patch new file mode 100644 index 0000000..3b7e042 --- /dev/null +++ b/src/gcc-3-static-libgcc.patch @@ -0,0 +1,61 @@ +This file is part of MXE. +See index.html for further information. + +This patch has been taken from: +http://gcc.gnu.org/bugzilla/show_bug.cgi?id=60981 + +diff -ur gcc-4.9.0.orig/lto-plugin/configure gcc-4.9.0/lto-plugin/configure +--- gcc-4.9.0.orig/lto-plugin/configure 2014-04-25 20:34:02.000000000 +1000 ++++ gcc-4.9.0/lto-plugin/configure 2014-04-25 20:34:58.000000000 +1000 +@@ -4087,8 +4087,50 @@ + done + CFLAGS="$save_CFLAGS" + ++# Check whether -static-libstdc++ -static-libgcc is supported. ++have_static_libs=no ++if test "$GCC" = yes; then ++ saved_LDFLAGS="$LDFLAGS" ++ ++ LDFLAGS="$LDFLAGS -static-libstdc++ -static-libgcc" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether g++ accepts -static-libstdc++ -static-libgcc" >&5 ++$as_echo_n "checking whether g++ accepts -static-libstdc++ -static-libgcc... " >&6; } ++ ac_ext=cpp ++ac_cpp='$CXXCPP $CPPFLAGS' ++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ++ ++ ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++#if (__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 5) ++#error -static-libstdc++ not implemented ++#endif ++int main() {} ++_ACEOF ++if ac_fn_cxx_try_link "$LINENO"; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; }; have_static_libs=yes ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++ ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++ ++ ++ LDFLAGS="$saved_LDFLAGS" ++fi ++ + # Need -Wc to get it through libtool. +-if test "x$GCC" = xyes; then ac_lto_plugin_ldflags="-Wc,-static-libgcc"; fi ++if test "x$have_static_libs" = xhave_static_libs; then ac_lto_plugin_ldflags="-Wc,-static-libgcc"; fi + + case `pwd` in + *\ * | *\ *) diff --git a/src/libgsasl-1-fixes.patch b/src/libgsasl-1-fixes.patch index 6695b55..561684c 100644 --- a/src/libgsasl-1-fixes.patch +++ b/src/libgsasl-1-fixes.patch @@ -30,7 +30,7 @@ index b0c477d..d8d8ccc 100644 Version: @VERSION@ Libs: -L${libdir} -lgsasl Libs.private: @LTLIBGCRYPT@ @LTLIBIDN@ @LTLIBNTLM@ -+Requires.private: nettle ++Requires: nettle Cflags: -I${includedir} -- 1.7.7 diff --git a/src/libgsasl.mk b/src/libgsasl.mk index 96097a8..feef05d 100644 --- a/src/libgsasl.mk +++ b/src/libgsasl.mk @@ -19,15 +19,13 @@ endef define $(PKG)_BUILD cd '$(1)' && touch src/libgsasl-7.def && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ - --disable-shared \ - --prefix='$(PREFIX)/$(TARGET)' \ + $(MXE_CONFIGURE_OPTS) \ --disable-nls \ --with-libgcrypt \ --with-libiconv-prefix='$(PREFIX)/$(TARGET)' \ --with-libidn-prefix='$(PREFIX)/$(TARGET)' \ - --with-libntlm-prefix='$(PREFIX)/$(TARGET)' + --with-libntlm-prefix='$(PREFIX)/$(TARGET)' \ + LIBS="`$(TARGET)-pkg-config --libs-only-l nettle`" $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= '$(TARGET)-gcc' \ @@ -35,5 +33,3 @@ define $(PKG)_BUILD '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-libgsasl.exe' \ `'$(TARGET)-pkg-config' libgsasl --cflags --libs` endef - -$(PKG)_BUILD_SHARED = |