1.1 --- a/patches/mingw-libgnurx/2.5.1/build-static-library.patch Tue Nov 13 15:06:18 2012 +0000
1.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
1.3 @@ -1,103 +0,0 @@
1.4 ---- mingw-libgnurx-2.5.1.orig/configure 2009-11-03 08:19:15.000000000 +0100
1.5 -+++ mingw-libgnurx-2.5.1/configure 2009-11-03 08:31:37.000000000 +0100
1.6 -@@ -273,7 +273,7 @@
1.7 - PACKAGE_STRING='MinGW libgnurx 2.5.1'
1.8 - PACKAGE_BUGREPORT='https://sourceforge.net/tracker/?group_id=2435&atid=102435'
1.9 -
1.10 --ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CC_QUALIFIED DLLVERSION ZIPCMD ZIPEXT MSVCLIB ac_ct_MSVCLIB GNURX_LIB install_dev LIBOBJS LTLIBOBJS'
1.11 -+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CC_QUALIFIED AR DLLVERSION ZIPCMD ZIPEXT MSVCLIB ac_ct_MSVCLIB GNURX_LIB install_dev LIBOBJS LTLIBOBJS'
1.12 - ac_subst_files=''
1.13 -
1.14 - # Initialize some variables set by options.
1.15 -@@ -2190,21 +2190,54 @@
1.16 -
1.17 - fi
1.18 - rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
1.19 --ac_ext=c
1.20 --ac_cpp='$CPP $CPPFLAGS'
1.21 --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
1.22 --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
1.23 --ac_compiler_gnu=$ac_cv_c_compiler_gnu
1.24 -
1.25 -- ac_ext=c
1.26 -+
1.27 -+for ac_prog in ar; do
1.28 -+set dummy ${ac_tool_prefix}$ac_prog; ac_word=$2
1.29 -+echo "$as_me:$LINENO: checking for $ac_word" >&5
1.30 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
1.31 -+if test "${ac_cv_prog_AR+set}" = set; then
1.32 -+ echo $ECHO_N "(cached) $ECHO_C" >&6
1.33 -+else
1.34 -+ if test -n "$AR"; then
1.35 -+ ac_cv_prog_AR="$AR" # Let the user override the test.
1.36 -+else
1.37 -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.38 -+for as_dir in $PATH
1.39 -+do
1.40 -+ IFS=$as_save_IFS
1.41 -+ test -z "$as_dir" && as_dir=.
1.42 -+ for ac_exec_ext in '' $ac_executable_extensions; do
1.43 -+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.44 -+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
1.45 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.46 -+ break 2
1.47 -+ fi
1.48 -+done
1.49 -+done
1.50 -+
1.51 -+ test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar"
1.52 -+fi
1.53 -+fi
1.54 -+AR=$ac_cv_prog_AR
1.55 -+if test -n "$AR"; then
1.56 -+ echo "$as_me:$LINENO: result: $AR" >&5
1.57 -+echo "${ECHO_T}$AR" >&6
1.58 -+else
1.59 -+ echo "$as_me:$LINENO: result: no" >&5
1.60 -+echo "${ECHO_T}no" >&6
1.61 -+fi
1.62 -+done
1.63 -+
1.64 -+ac_ext=c
1.65 - ac_cpp='$CPP $CPPFLAGS'
1.66 - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
1.67 - ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
1.68 - ac_compiler_gnu=$ac_cv_c_compiler_gnu
1.69 -
1.70 -- popCFLAGS=$CFLAGS
1.71 -- echo 'int main(void){return 0;}' > conftest.$ac_ext
1.72 -- echo "$as_me:$LINENO: checking whether $CC accepts the -mthreads option" >&5
1.73 -+popCFLAGS=$CFLAGS
1.74 -+echo 'int main(void){return 0;}' > conftest.$ac_ext
1.75 -+echo "$as_me:$LINENO: checking whether $CC accepts the -mthreads option" >&5
1.76 - echo $ECHO_N "checking whether $CC accepts the -mthreads option... $ECHO_C" >&6
1.77 - CFLAGS="$popCFLAGS $CC_QUALIFIED -mthreads"
1.78 - if (eval $ac_compile) 2>&5; then
1.79 -@@ -3038,6 +3069,7 @@
1.80 - s,@EXEEXT@,$EXEEXT,;t t
1.81 - s,@OBJEXT@,$OBJEXT,;t t
1.82 - s,@CC_QUALIFIED@,$CC_QUALIFIED,;t t
1.83 -+s,@AR@,$AR,;t t
1.84 - s,@DLLVERSION@,$DLLVERSION,;t t
1.85 - s,@ZIPCMD@,$ZIPCMD,;t t
1.86 - s,@ZIPEXT@,$ZIPEXT,;t t
1.87 ---- mingw-libgnurx-2.5.1.orig/Makefile.in 2009-11-03 08:17:49.000000000 +0100
1.88 -+++ mingw-libgnurx-2.5.1/Makefile.in 2009-11-03 08:57:37.000000000 +0100
1.89 -@@ -39,6 +39,7 @@
1.90 - mandir = @mandir@
1.91 -
1.92 - CC = @CC_QUALIFIED@
1.93 -+AR = @AR@
1.94 - CFLAGS = @CFLAGS@ -I ${srcdir}
1.95 - LDFLAGS = @LDFLAGS@
1.96 -
1.97 -@@ -67,8 +68,8 @@
1.98 - libgnurx-$(DLLVERSION).dll libgnurx.dll.a: $(OBJECTS)
1.99 - $(CC) $(CFLAGS) -shared -o libgnurx-$(DLLVERSION).dll $(LDFLAGS) $(OBJECTS)
1.100 -
1.101 --libregex.a: libgnurx.dll.a
1.102 -- cp -p libgnurx.dll.a $@
1.103 -+libregex.a: $(OBJECTS)
1.104 -+ $(AR) cru $@ $(OBJECTS)
1.105 -
1.106 - gnurx.lib: libgnurx-$(DLLVERSION).dll