[patch] pcre-4.2-macos.patch

pcre-4.2-macos.patch (text/plain), 1.47 KB, created by Robin Munn on 2004-08-15 19:03:34 UTC

diff -urN pcre-4.5.orig/configure pcre-4.5/configure
--- pcre-4.5.orig/configure	Sun Aug 15 15:29:25 2004
+++ pcre-4.5/configure	Sun Aug 15 15:26:54 2004
@@ -5122,11 +5122,11 @@
     # FIXME: Relying on posixy $() will cause problems for
     #        cross-compilation, but unfortunately the echo tests do not
     #        yet detect zsh echo's removal of \ escapes.
-    archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linkopts -install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)'
+    archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linkopts -install_name $rpath/$soname $tmp_verstring'
     # We need to add '_' to the symbols in $export_symbols first
     #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
-    hardcode_direct=yes
-    hardcode_shlibpath_var=no
+    hardcode_direct=no
+    hardcode_shlibpath_var=yes
     whole_archive_flag_spec='-all_load $convenience'
     ;;

diff -urN pcre-4.5.orig/ltmain.sh pcre-4.5/ltmain.sh
--- pcre-4.5.orig/ltmain.sh	Sun Aug 15 15:30:00 2004
+++ pcre-4.5/ltmain.sh	Sun Aug 15 15:32:43 2004
@@ -2990,6 +2990,11 @@
 	    done
 	    deplibs="$tmp_deplibs"
 	  done
+	  if test "x$verstring" = "x0.0"; then
+	    tmp_verstring=
+	  else
+	    tmp_verstring="$verstring"
+	  fi
 	  eval cmds=\"$archive_cmds\"
 	  deplibs="$save_deplibs"
 	fi