texk/web2c: Use the osx-strip shell script to strip Mac OS X binaries

git-svn-id: svn://tug.org/texlive/trunk@22401 c570f23f-e606-0410-a88d-b1316a301751

11 files changed, 147 insertions, 3 deletions

diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index ef22b230238..f6cb0698e68 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-10  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* osx-strip: New shell script to strip Mac OS X binaries.
+	* configure.ac: Use osx-strip for Mac OS X.
+
 2011-05-05  Karl Berry  <karl@tug.org>
 
 	* man/pktype.man: output is always to stdout.
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index 757ec57ad19..9322736d870 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -80,7 +80,7 @@ DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \
 	$(srcdir)/luatexdir/am/txt2zlib.am \
 	$(srcdir)/mplibdir/am/libmplib.am \
 	$(srcdir)/mplibdir/am/mplib.am \
-	$(srcdir)/omegaware/am/omegaware.am \
+	$(srcdir)/omegaware/am/omegaware.am $(srcdir)/osx-strip.in \
 	$(srcdir)/pdftexdir/am/libpdftex.am \
 	$(srcdir)/pdftexdir/am/pdftex.am \
 	$(srcdir)/pdftexdir/am/pdftosrc.am \
@@ -270,7 +270,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/w2c/c-auto.h ff-config.h
-CONFIG_CLEAN_FILES = web2c-sh tangle-sh ctangleboot-sh
+CONFIG_CLEAN_FILES = web2c-sh tangle-sh ctangleboot-sh osx-strip
 CONFIG_CLEAN_VPATH_FILES =
 ARFLAGS = cru
 libff_a_AR = $(AR) $(ARFLAGS)
@@ -1104,6 +1104,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PATH_STRIP = @PATH_STRIP@
 PKG_CONFIG = @PKG_CONFIG@
 POPPLER_DEPEND = @POPPLER_DEPEND@
 POPPLER_INCLUDES = @POPPLER_INCLUDES@
@@ -2514,6 +2515,8 @@ tangle-sh: $(top_builddir)/config.status $(srcdir)/tangle-sh.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 ctangleboot-sh: $(top_builddir)/config.status $(srcdir)/ctangleboot-sh.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
+osx-strip: $(top_builddir)/config.status $(srcdir)/osx-strip.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
 libff.a: $(libff_a_OBJECTS) $(libff_a_DEPENDENCIES) 
 	-rm -f libff.a
 	$(libff_a_AR) libff.a $(libff_a_OBJECTS) $(libff_a_LIBADD)
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index 3d6b8806606..f976e77c50e 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -762,6 +762,7 @@ CXXFLAGS
 CXX
 cross_FALSE
 cross_TRUE
+PATH_STRIP
 WARNING_CFLAGS
 CPP
 OTOOL64
@@ -13219,6 +13220,109 @@ fi
 eval kpse_build_alias=\${build_alias-$build}
 
 
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PATH_STRIP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PATH_STRIP in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PATH_STRIP="$PATH_STRIP" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_PATH_STRIP="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PATH_STRIP=$ac_cv_path_PATH_STRIP
+if test -n "$PATH_STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATH_STRIP" >&5
+$as_echo "$PATH_STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_PATH_STRIP"; then
+  ac_pt_PATH_STRIP=$PATH_STRIP
+  # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_PATH_STRIP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_PATH_STRIP in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_PATH_STRIP="$ac_pt_PATH_STRIP" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_ac_pt_PATH_STRIP="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+ac_pt_PATH_STRIP=$ac_cv_path_ac_pt_PATH_STRIP
+if test -n "$ac_pt_PATH_STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PATH_STRIP" >&5
+$as_echo "$ac_pt_PATH_STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_pt_PATH_STRIP" = x; then
+    PATH_STRIP=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    PATH_STRIP=$ac_pt_PATH_STRIP
+  fi
+else
+  PATH_STRIP="$ac_cv_path_PATH_STRIP"
+fi
+
+
+case $host_os in
+  darwin*) STRIP='$(top_builddir)/osx-strip' ;;
+esac
+
  if test "x$cross_compiling" = xyes; then
   cross_TRUE=
   cross_FALSE='#'
@@ -22706,6 +22810,8 @@ ac_config_files="$ac_config_files tangle-sh"
 
 ac_config_files="$ac_config_files ctangleboot-sh"
 
+ac_config_files="$ac_config_files osx-strip"
+
 
 
 
@@ -23956,6 +24062,7 @@ do
     "web2c-sh") CONFIG_FILES="$CONFIG_FILES web2c-sh" ;;
     "tangle-sh") CONFIG_FILES="$CONFIG_FILES tangle-sh" ;;
     "ctangleboot-sh") CONFIG_FILES="$CONFIG_FILES ctangleboot-sh" ;;
+    "osx-strip") CONFIG_FILES="$CONFIG_FILES osx-strip" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
@@ -25468,6 +25575,7 @@ fi
     "web2c-sh":F) chmod +x web2c-sh ;;
     "tangle-sh":F) chmod +x tangle-sh ;;
     "ctangleboot-sh":F) chmod +x ctangleboot-sh ;;
+    "osx-strip":F) chmod +x osx-strip ;;
 
   esac
 done # for ac_tag
diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac
index 4b5866436a6..428e58df26a 100644
--- a/Build/source/texk/web2c/configure.ac
+++ b/Build/source/texk/web2c/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with Autoconf to produce a configure script for Web2c.
 dnl
-dnl   Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org>
+dnl   Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
 dnl
 dnl   This file is free software; the copyright holder
 dnl   gives unlimited permission to copy and/or distribute it,
@@ -37,6 +37,12 @@ dnl Common code for all programs using libkpathsea.
 KPSE_COMMON([web2c programs])
 KPSE_CANONICAL_HOST
 
+AC_PATH_TOOL([PATH_STRIP], [strip])
+
+case $host_os in
+  darwin*) STRIP='$(top_builddir)/osx-strip' ;;
+esac
+
 AM_CONDITIONAL([cross], [test "x$cross_compiling" = xyes])
 
 AC_PROG_CXX
@@ -367,6 +373,7 @@ AC_CONFIG_FILES([Makefile doc/Makefile lib/Makefile man/Makefile
 AC_CONFIG_FILES([web2c-sh], [chmod +x web2c-sh])
 AC_CONFIG_FILES([tangle-sh], [chmod +x tangle-sh])
 AC_CONFIG_FILES([ctangleboot-sh], [chmod +x ctangleboot-sh])
+AC_CONFIG_FILES([osx-strip], [chmod +x osx-strip])
 
 dnl The subdirectory web2c must be configured for the build system.
 dnl When cross compiling, can not share the cache file with the subdirectory!
diff --git a/Build/source/texk/web2c/doc/Makefile.in b/Build/source/texk/web2c/doc/Makefile.in
index a6824c7833f..16d6bf4654b 100644
--- a/Build/source/texk/web2c/doc/Makefile.in
+++ b/Build/source/texk/web2c/doc/Makefile.in
@@ -207,6 +207,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PATH_STRIP = @PATH_STRIP@
 PKG_CONFIG = @PKG_CONFIG@
 POPPLER_DEPEND = @POPPLER_DEPEND@
 POPPLER_INCLUDES = @POPPLER_INCLUDES@
diff --git a/Build/source/texk/web2c/lib/Makefile.in b/Build/source/texk/web2c/lib/Makefile.in
index f039e8cf906..64e75d5ca8c 100644
--- a/Build/source/texk/web2c/lib/Makefile.in
+++ b/Build/source/texk/web2c/lib/Makefile.in
@@ -205,6 +205,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PATH_STRIP = @PATH_STRIP@
 PKG_CONFIG = @PKG_CONFIG@
 POPPLER_DEPEND = @POPPLER_DEPEND@
 POPPLER_INCLUDES = @POPPLER_INCLUDES@
diff --git a/Build/source/texk/web2c/man/Makefile.in b/Build/source/texk/web2c/man/Makefile.in
index 48b16fefa35..e9d5ab8df34 100644
--- a/Build/source/texk/web2c/man/Makefile.in
+++ b/Build/source/texk/web2c/man/Makefile.in
@@ -213,6 +213,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PATH_STRIP = @PATH_STRIP@
 PKG_CONFIG = @PKG_CONFIG@
 POPPLER_DEPEND = @POPPLER_DEPEND@
 POPPLER_INCLUDES = @POPPLER_INCLUDES@
diff --git a/Build/source/texk/web2c/omegafonts/Makefile.in b/Build/source/texk/web2c/omegafonts/Makefile.in
index 46d408141ce..42e65fa0b98 100644
--- a/Build/source/texk/web2c/omegafonts/Makefile.in
+++ b/Build/source/texk/web2c/omegafonts/Makefile.in
@@ -221,6 +221,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PATH_STRIP = @PATH_STRIP@
 PKG_CONFIG = @PKG_CONFIG@
 POPPLER_DEPEND = @POPPLER_DEPEND@
 POPPLER_INCLUDES = @POPPLER_INCLUDES@
diff --git a/Build/source/texk/web2c/osx-strip.in b/Build/source/texk/web2c/osx-strip.in
new file mode 100644
index 00000000000..be23f652ff8
--- /dev/null
+++ b/Build/source/texk/web2c/osx-strip.in
@@ -0,0 +1,15 @@
+#! @SHELL@
+# osx-strip: shell script to strip luatex (and other binaries)
+#    for Mac OS X, keeping the global symbols.
+#
+#   Copyright (C) 2001 Peter Breitenlohner <tex-live@tug.org>
+#      and Philipp Stephani <st_philipp@yahoo.de>
+#
+#   This file is free software; the copyright holders
+#   give unlimited permission to copy and/or distribute it,
+#   with or without modifications, as long as this notice is preserved.
+#
+case $1 in
+  -S | -x) exec @PATH_STRIP@ "$@" ;;
+  *) exec @PATH_STRIP@ -S -x "$@" ;;
+esac
diff --git a/Build/source/texk/web2c/otps/Makefile.in b/Build/source/texk/web2c/otps/Makefile.in
index 3786070a333..39d4ca469fc 100644
--- a/Build/source/texk/web2c/otps/Makefile.in
+++ b/Build/source/texk/web2c/otps/Makefile.in
@@ -242,6 +242,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PATH_STRIP = @PATH_STRIP@
 PKG_CONFIG = @PKG_CONFIG@
 POPPLER_DEPEND = @POPPLER_DEPEND@
 POPPLER_INCLUDES = @POPPLER_INCLUDES@
diff --git a/Build/source/texk/web2c/window/Makefile.in b/Build/source/texk/web2c/window/Makefile.in
index 5f9a80d38c7..32ea27545b8 100644
--- a/Build/source/texk/web2c/window/Makefile.in
+++ b/Build/source/texk/web2c/window/Makefile.in
@@ -203,6 +203,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PATH_STRIP = @PATH_STRIP@
 PKG_CONFIG = @PKG_CONFIG@
 POPPLER_DEPEND = @POPPLER_DEPEND@
 POPPLER_INCLUDES = @POPPLER_INCLUDES@