File mpc-0.9-noundefined.patch of Package mingw64-mpc

Overview Repositories Revisions Requests Users Attributes Meta

File mpc-0.9-noundefined.patch of Package mingw64-mpc (Revision aff8945383820d459249d44420a52551)

Currently displaying revision aff8945383820d459249d44420a52551 , Show latest

diff -urEbwB mpc-0.9/configure.ac mpc-0.9/configure.ac
--- mpc-0.9/configure.ac	2011-04-01 08:32:31.951641094 +0200
+++ mpc-0.9/configure.ac	2011-04-01 08:57:42.388211262 +0200
@@ -37,18 +37,18 @@
 AC_ARG_WITH([mpfr_include],
             [AC_HELP_STRING([--with-mpfr-include=DIR],
                             [MPFR include directory])],
-            [CPPFLAGS="-I$withval $CPPFLAGS"])
+            [extra_cppflags="-I$withval $extra_cppflags"])
 AC_ARG_WITH([mpfr_lib],
             [AC_HELP_STRING([--with-mpfr-lib=DIR],
                             [MPFR lib directory])],
-            [LDFLAGS="-L$withval $LDFLAGS"])
+            [extra_ldflags="-L$withval $extra_ldflags"])
 AC_ARG_WITH([mpfr],
             [AC_HELP_STRING([--with-mpfr=DIR],
                            [MPFR install directory])],
             [
             if test -z "$with_mpfr_include" -a -z "$with_mpfr_lib" ; then
-               CPPFLAGS="-I$withval/include $CPPFLAGS"
-               LDFLAGS="-L$withval/lib $LDFLAGS"
+               extra_cppflags="-I$withval/include $extra_cppflags"
+               extra_ldflags="-L$withval/lib $extra_ldflags"
             else
                AC_MSG_FAILURE([Do not use --with-mpfr and --with-mpfr-include/--with-mpfr-lib options simultaneously.])
             fi
@@ -56,22 +56,26 @@
 AC_ARG_WITH([gmp_include],
             [AC_HELP_STRING([--with-gmp-include=DIR],
                             [GMP include directory])],
-            [CPPFLAGS="-I$withval $CPPFLAGS"])
+            [extra_cppflags="-I$withval $extra_cppflags"])
 AC_ARG_WITH([gmp_lib],
             [AC_HELP_STRING([--with-gmp-lib=DIR],
                             [GMP lib directory])],
-            [LDFLAGS="-L$withval $LDFLAGS"])
+            [extra_ldflags="-L$withval $extra_ldflags"])
 AC_ARG_WITH([gmp],
             [AC_HELP_STRING([--with-gmp=DIR],
                            [GMP install directory])],
             [
             if test -z "$with_gmp_lib" -a -z "$with_gmp_include" ; then
-               CPPFLAGS="-I$withval/include $CPPFLAGS"
-               LDFLAGS="-L$withval/lib $LDFLAGS"
+               extra_cppflags="-I$withval/include $extra_cppflags"
+               extra_ldflags="-L$withval/lib $extra_ldflags"
             else
                AC_MSG_FAILURE([Do not use --with-gmp and --with-gmp-include/--with-gmp-lib options simultaneously.])
             fi
             ])
+
+AC_SUBST([MPC_CPPFLAGS],[$extra_cppflags])
+AC_SUBST([MPC_LDFLAGS],[$extra_ldflags])
+
 AC_ARG_ENABLE([logging],
              [AC_HELP_STRING([--enable-logging],
                              [enable logging of function calls to stderr (default = no)])],
@@ -105,6 +109,12 @@
  AC_MSG_ERROR([gmp.h can't be found, or is unusable.])
 ])
 
+# Backup variables for tests
+mpc_temp_cppflags=$CPPFLAGS
+mpc_temp_lflags=$LDFLAGS
+CPPFLAGS=$extra_cppflags
+LDFLAGS=$extra_ldflags
+
 dnl Check for GMP CFLAGS in gmp.h
 if test -z "$user_redefine_cc" ; then
    MPC_GMP_CC_CFLAGS
@@ -121,6 +129,10 @@
 dnl Finally set up LibTool
 AC_PROG_LIBTOOL
 
+# Restore variables
+CPPFLAGS=$mpc_temp_cppflags
+LDFLAGS=$mpc_temp_lflags
+
 # Checks for header files.
 AC_HEADER_STDC
 AC_CHECK_HEADERS([complex.h locale.h inttypes.h stdint.h limits.h unistd.h sys/time.h])
diff -urEbwB mpc-0.9/m4/mpc.m4 mpc-0.9/m4/mpc.m4
--- mpc-0.9/m4/mpc.m4	2011-04-01 08:32:31.952641194 +0200
+++ mpc-0.9/m4/mpc.m4	2011-04-01 09:03:55.211242406 +0200
@@ -132,7 +132,8 @@
 AC_DEFUN([MPC_WINDOWS], [
    AC_MSG_CHECKING(for DLL/static GMP)
    if test "$enable_shared" = yes; then
-     LDFLAGS="$LDFLAGS -no-undefined"
+     MPC_NO_UNDEFINED="-no-undefined"
+     AC_SUBST([MPC_NO_UNDEFINED])
      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include "gmp.h"
 #if !__GMP_LIBGMP_DLL
diff -urEbwB mpc-0.9/src/Makefile.am mpc-0.9/src/Makefile.am
--- mpc-0.9/src/Makefile.am	2011-04-01 08:32:31.946640594 +0200
+++ mpc-0.9/src/Makefile.am	2011-04-01 08:55:18.077691194 +0200
@@ -1,8 +1,9 @@
 ## src/Makefile.am -- Process this file with automake to produce Makefile.in
-AM_CFLAGS=@WARNINGCFLAGS@
+AM_CPPFLAGS=@MPC_CPPFLAGS@ @WARNINGCFLAGS@
+AM_LDFLAGS=@MPC_LDFLAGS@ @MPC_NO_UNDEFINED@
 
 lib_LTLIBRARIES = libmpc.la
-libmpc_la_LDFLAGS = -version-info 2:0:0
+libmpc_la_LDFLAGS = -version-info 2:0:0 $(AM_LDFLAGS)
 libmpc_la_SOURCES = mpc-impl.h abs.c acos.c acosh.c add.c add_fr.c         \
   add_si.c add_ui.c arg.c asin.c asinh.c atan.c atanh.c clear.c cmp.c cmp_si_si.c   \
   conj.c cosh.c div_2exp.c div.c div_fr.c div_ui.c exp.c fma.c fr_div.c    \
diff -urEbwB mpc-0.9/src/mpc.h mpc-0.9/src/mpc.h
--- mpc-0.9/src/mpc.h	2011-04-01 08:32:31.949640894 +0200
+++ mpc-0.9/src/mpc.h	2011-04-01 09:19:37.109346019 +0200
@@ -134,11 +134,15 @@
 /* Support for WINDOWS Dll:
    Check if we are inside a MPC build, and if so export the functions.
    Otherwise does the same thing as GMP */
+#ifdef _MSC_VER
 #if defined(__MPC_WITHIN_MPC) && __GMP_LIBGMP_DLL
 # define __MPC_DECLSPEC __GMP_DECLSPEC_EXPORT
 #else
 # define __MPC_DECLSPEC __GMP_DECLSPEC
 #endif
+#else
+# define __MPC_DECLSPEC
+#endif
 
 #if defined (__cplusplus)
 extern "C" {
diff -urEbwB mpc-0.9/tests/Makefile.am mpc-0.9/tests/Makefile.am
--- mpc-0.9/tests/Makefile.am	2011-04-01 08:32:31.940639994 +0200
+++ mpc-0.9/tests/Makefile.am	2011-04-01 08:55:18.078691297 +0200
@@ -1,6 +1,6 @@
 ## Makefile.am -- Process this file with automake to produce Makefile.in
 AM_CFLAGS=@WARNINGCFLAGS@
-AM_CPPFLAGS = -I$(top_srcdir)/src
+AM_CPPFLAGS = -I$(top_srcdir)/src @MPC_CPPFLAGS@
 LDADD = libmpc-tests.la $(top_builddir)/src/libmpc.la
 # LOADLIBES (documented in the "GNU make" manual and equivalent to LDLIBS)
 # enables to compile a program foo.c in the test directory by simply doing

Places

File mpc-0.9-noundefined.patch of Package mingw64-mpc (Revision aff8945383820d459249d44420a52551)

Places