patches/mingw-libgnurx/2.5.1/build-static-library.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Tue Aug 02 18:28:10 2011 +0200 (2011-08-02)
changeset 2590 b64cfb67944e
permissions -rw-r--r--
scripts/functions: svn retrieval first tries the mirror for tarballs

The svn download helper looks for the local tarballs dir to see if it
can find a pre-downloaded tarball, and if it does not find it, does
the actual fetch to upstream via svn.

In the process, it does not even try to get a tarball from the local
mirror, which can be useful if the mirror has been pre-populated
manually (or with a previously downloaded tree).

Fake a tarball get with the standard tarball-download helper, but
without specifying any upstream URL, which makes the helper directly
try the LAN mirror.

Of course, if no mirror is specified, no URL wil be available, and
the standard svn retrieval will kick in.

Reported-by: ANDY KENNEDY <ANDY.KENNEDY@adtran.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
bartvdrmeulen@2018
     1
--- mingw-libgnurx-2.5.1.orig/configure	2009-11-03 08:19:15.000000000 +0100
bartvdrmeulen@2018
     2
+++ mingw-libgnurx-2.5.1/configure	2009-11-03 08:31:37.000000000 +0100
bartvdrmeulen@2018
     3
@@ -273,7 +273,7 @@
bartvdrmeulen@2018
     4
 PACKAGE_STRING='MinGW libgnurx 2.5.1'
bartvdrmeulen@2018
     5
 PACKAGE_BUGREPORT='https://sourceforge.net/tracker/?group_id=2435&atid=102435'
bartvdrmeulen@2018
     6
bartvdrmeulen@2018
     7
-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'
bartvdrmeulen@2018
     8
+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'
bartvdrmeulen@2018
     9
 ac_subst_files=''
bartvdrmeulen@2018
    10
bartvdrmeulen@2018
    11
 # Initialize some variables set by options.
bartvdrmeulen@2018
    12
@@ -2190,21 +2190,54 @@
bartvdrmeulen@2018
    13
bartvdrmeulen@2018
    14
 fi
bartvdrmeulen@2018
    15
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
bartvdrmeulen@2018
    16
-ac_ext=c
bartvdrmeulen@2018
    17
-ac_cpp='$CPP $CPPFLAGS'
bartvdrmeulen@2018
    18
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
bartvdrmeulen@2018
    19
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
bartvdrmeulen@2018
    20
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
bartvdrmeulen@2018
    21
bartvdrmeulen@2018
    22
-  ac_ext=c
bartvdrmeulen@2018
    23
+
bartvdrmeulen@2018
    24
+for ac_prog in ar; do
bartvdrmeulen@2018
    25
+set dummy ${ac_tool_prefix}$ac_prog; ac_word=$2
bartvdrmeulen@2018
    26
+echo "$as_me:$LINENO: checking for $ac_word" >&5
bartvdrmeulen@2018
    27
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
bartvdrmeulen@2018
    28
+if test "${ac_cv_prog_AR+set}" = set; then
bartvdrmeulen@2018
    29
+  echo $ECHO_N "(cached) $ECHO_C" >&6
bartvdrmeulen@2018
    30
+else
bartvdrmeulen@2018
    31
+  if test -n "$AR"; then
bartvdrmeulen@2018
    32
+  ac_cv_prog_AR="$AR" # Let the user override the test.
bartvdrmeulen@2018
    33
+else
bartvdrmeulen@2018
    34
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
bartvdrmeulen@2018
    35
+for as_dir in $PATH
bartvdrmeulen@2018
    36
+do
bartvdrmeulen@2018
    37
+  IFS=$as_save_IFS
bartvdrmeulen@2018
    38
+  test -z "$as_dir" && as_dir=.
bartvdrmeulen@2018
    39
+  for ac_exec_ext in '' $ac_executable_extensions; do
bartvdrmeulen@2018
    40
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
bartvdrmeulen@2018
    41
+    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
bartvdrmeulen@2018
    42
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
bartvdrmeulen@2018
    43
+    break 2
bartvdrmeulen@2018
    44
+  fi
bartvdrmeulen@2018
    45
+done
bartvdrmeulen@2018
    46
+done
bartvdrmeulen@2018
    47
+
bartvdrmeulen@2018
    48
+  test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar"
bartvdrmeulen@2018
    49
+fi
bartvdrmeulen@2018
    50
+fi
bartvdrmeulen@2018
    51
+AR=$ac_cv_prog_AR
bartvdrmeulen@2018
    52
+if test -n "$AR"; then
bartvdrmeulen@2018
    53
+  echo "$as_me:$LINENO: result: $AR" >&5
bartvdrmeulen@2018
    54
+echo "${ECHO_T}$AR" >&6
bartvdrmeulen@2018
    55
+else
bartvdrmeulen@2018
    56
+  echo "$as_me:$LINENO: result: no" >&5
bartvdrmeulen@2018
    57
+echo "${ECHO_T}no" >&6
bartvdrmeulen@2018
    58
+fi
bartvdrmeulen@2018
    59
+done
bartvdrmeulen@2018
    60
+
bartvdrmeulen@2018
    61
+ac_ext=c
bartvdrmeulen@2018
    62
 ac_cpp='$CPP $CPPFLAGS'
bartvdrmeulen@2018
    63
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
bartvdrmeulen@2018
    64
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
bartvdrmeulen@2018
    65
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
bartvdrmeulen@2018
    66
bartvdrmeulen@2018
    67
- popCFLAGS=$CFLAGS
bartvdrmeulen@2018
    68
- echo 'int main(void){return 0;}' > conftest.$ac_ext
bartvdrmeulen@2018
    69
- echo "$as_me:$LINENO: checking whether $CC accepts the -mthreads option" >&5
bartvdrmeulen@2018
    70
+popCFLAGS=$CFLAGS
bartvdrmeulen@2018
    71
+echo 'int main(void){return 0;}' > conftest.$ac_ext
bartvdrmeulen@2018
    72
+echo "$as_me:$LINENO: checking whether $CC accepts the -mthreads option" >&5
bartvdrmeulen@2018
    73
 echo $ECHO_N "checking whether $CC accepts the -mthreads option... $ECHO_C" >&6
bartvdrmeulen@2018
    74
    CFLAGS="$popCFLAGS $CC_QUALIFIED -mthreads"
bartvdrmeulen@2018
    75
    if (eval $ac_compile) 2>&5; then
bartvdrmeulen@2018
    76
@@ -3038,6 +3069,7 @@
bartvdrmeulen@2018
    77
 s,@EXEEXT@,$EXEEXT,;t t
bartvdrmeulen@2018
    78
 s,@OBJEXT@,$OBJEXT,;t t
bartvdrmeulen@2018
    79
 s,@CC_QUALIFIED@,$CC_QUALIFIED,;t t
bartvdrmeulen@2018
    80
+s,@AR@,$AR,;t t
bartvdrmeulen@2018
    81
 s,@DLLVERSION@,$DLLVERSION,;t t
bartvdrmeulen@2018
    82
 s,@ZIPCMD@,$ZIPCMD,;t t
bartvdrmeulen@2018
    83
 s,@ZIPEXT@,$ZIPEXT,;t t
bartvdrmeulen@2018
    84
--- mingw-libgnurx-2.5.1.orig/Makefile.in	2009-11-03 08:17:49.000000000 +0100
bartvdrmeulen@2018
    85
+++ mingw-libgnurx-2.5.1/Makefile.in	2009-11-03 08:57:37.000000000 +0100
bartvdrmeulen@2018
    86
@@ -39,6 +39,7 @@
bartvdrmeulen@2018
    87
 mandir = @mandir@
bartvdrmeulen@2018
    88
bartvdrmeulen@2018
    89
 CC = @CC_QUALIFIED@
bartvdrmeulen@2018
    90
+AR = @AR@
bartvdrmeulen@2018
    91
 CFLAGS = @CFLAGS@ -I ${srcdir}
bartvdrmeulen@2018
    92
 LDFLAGS = @LDFLAGS@
bartvdrmeulen@2018
    93
bartvdrmeulen@2018
    94
@@ -67,8 +68,8 @@
bartvdrmeulen@2018
    95
 libgnurx-$(DLLVERSION).dll libgnurx.dll.a: $(OBJECTS)
bartvdrmeulen@2018
    96
 	$(CC) $(CFLAGS) -shared -o libgnurx-$(DLLVERSION).dll $(LDFLAGS) $(OBJECTS)
bartvdrmeulen@2018
    97
bartvdrmeulen@2018
    98
-libregex.a: libgnurx.dll.a
bartvdrmeulen@2018
    99
-	cp -p libgnurx.dll.a $@
bartvdrmeulen@2018
   100
+libregex.a: $(OBJECTS)
bartvdrmeulen@2018
   101
+	$(AR) cru $@ $(OBJECTS)
bartvdrmeulen@2018
   102
bartvdrmeulen@2018
   103
 gnurx.lib: libgnurx-$(DLLVERSION).dll