1*4882a593SmuzhiyunFix stripping when cross-compiling 2*4882a593Smuzhiyun 3*4882a593SmuzhiyunProbably-Signed-off-by: Dave Bender <bender@benegon.com> 4*4882a593Smuzhiyun[yann.morin.1998@free.fr: patch was made by Dave, but he 5*4882a593Smuzhiyun forgot his SoB line, so I added it] 6*4882a593SmuzhiyunSigned-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> 7*4882a593Smuzhiyun 8*4882a593Smuzhiyundiff -rupN openldap-2.4.40/build/shtool openldap-2.4.40-br/build/shtool 9*4882a593Smuzhiyun--- openldap-2.4.40/build/shtool 2014-09-18 21:48:49.000000000 -0400 10*4882a593Smuzhiyun+++ openldap-2.4.40-br/build/shtool 2015-01-21 13:21:35.689829372 -0500 11*4882a593Smuzhiyun@@ -981,7 +981,7 @@ install ) 12*4882a593Smuzhiyun if [ ".$opt_t" = .yes ]; then 13*4882a593Smuzhiyun echo "strip $dsttmp" 1>&2 14*4882a593Smuzhiyun fi 15*4882a593Smuzhiyun- strip $dsttmp || shtool_exit $? 16*4882a593Smuzhiyun+ $STRIP $dsttmp || shtool_exit $? 17*4882a593Smuzhiyun fi 18*4882a593Smuzhiyun if [ ".$opt_o" != . ]; then 19*4882a593Smuzhiyun if [ ".$opt_t" = .yes ]; then 20*4882a593Smuzhiyundiff -rupN openldap-2.4.40/build/top.mk openldap-2.4.40-br/build/top.mk 21*4882a593Smuzhiyun--- openldap-2.4.40/build/top.mk 2014-09-18 21:48:49.000000000 -0400 22*4882a593Smuzhiyun+++ openldap-2.4.40-br/build/top.mk 2015-01-21 13:23:41.027810097 -0500 23*4882a593Smuzhiyun@@ -59,7 +59,7 @@ INSTALL_PROGRAM = $(INSTALL) 24*4882a593Smuzhiyun INSTALL_DATA = $(INSTALL) -m 644 25*4882a593Smuzhiyun INSTALL_SCRIPT = $(INSTALL) 26*4882a593Smuzhiyun 27*4882a593Smuzhiyun-STRIP = -s 28*4882a593Smuzhiyun+STRIP_OPTS = -s 29*4882a593Smuzhiyun 30*4882a593Smuzhiyun LINT = lint 31*4882a593Smuzhiyun 5LINT = 5lint 32*4882a593Smuzhiyundiff -rupN openldap-2.4.40/clients/tools/Makefile.in openldap-2.4.40-br/clients/tools/Makefile.in 33*4882a593Smuzhiyun--- openldap-2.4.40/clients/tools/Makefile.in 2014-09-18 21:48:49.000000000 -0400 34*4882a593Smuzhiyun+++ openldap-2.4.40-br/clients/tools/Makefile.in 2015-01-21 13:23:35.827727946 -0500 35*4882a593Smuzhiyun@@ -120,7 +120,7 @@ install-local: FORCE 36*4882a593Smuzhiyun -$(MKDIR) $(DESTDIR)$(bindir) 37*4882a593Smuzhiyun @( \ 38*4882a593Smuzhiyun for prg in $(PROGRAMS); do \ 39*4882a593Smuzhiyun- $(LTINSTALL) $(INSTALLFLAGS) $(STRIP) -m 755 $$prg$(EXEEXT) \ 40*4882a593Smuzhiyun+ $(LTINSTALL) $(INSTALLFLAGS) $(STRIP_OPTS) -m 755 $$prg$(EXEEXT) \ 41*4882a593Smuzhiyun $(DESTDIR)$(bindir); \ 42*4882a593Smuzhiyun done \ 43*4882a593Smuzhiyun ) 44*4882a593Smuzhiyundiff -rupN openldap-2.4.40/configure.in openldap-2.4.40-br/configure.in 45*4882a593Smuzhiyun--- openldap-2.4.40/configure.in 2014-09-18 21:48:49.000000000 -0400 46*4882a593Smuzhiyun+++ openldap-2.4.40-br/configure.in 2015-01-16 15:50:48.874816786 -0500 47*4882a593Smuzhiyun@@ -668,6 +668,15 @@ if test -z "${AR}"; then 48*4882a593Smuzhiyun fi 49*4882a593Smuzhiyun fi 50*4882a593Smuzhiyun 51*4882a593Smuzhiyun+if test -z "${STRIP}"; then 52*4882a593Smuzhiyun+ AC_CHECK_PROGS(STRIP,strip,missing) 53*4882a593Smuzhiyun+ 54*4882a593Smuzhiyun+ if test "${STRIP}" = "missing" ; then 55*4882a593Smuzhiyun+ AC_MSG_ERROR([Unable to locate strip(1) or suitable replacement. Check PATH or set STRIP.]) 56*4882a593Smuzhiyun+ fi 57*4882a593Smuzhiyun+fi 58*4882a593Smuzhiyun+ 59*4882a593Smuzhiyun+ 60*4882a593Smuzhiyun AC_LIBTOOL_WIN32_DLL 61*4882a593Smuzhiyun AC_LIBTOOL_DLOPEN 62*4882a593Smuzhiyun AC_PROG_LIBTOOL 63*4882a593Smuzhiyundiff -rupN openldap-2.4.40/servers/slapd/Makefile.in openldap-2.4.40-br/servers/slapd/Makefile.in 64*4882a593Smuzhiyun--- openldap-2.4.40/servers/slapd/Makefile.in 2015-01-16 15:04:52.507473256 -0500 65*4882a593Smuzhiyun+++ openldap-2.4.40-br/servers/slapd/Makefile.in 2015-01-16 15:05:02.299627229 -0500 66*4882a593Smuzhiyun@@ -378,7 +378,7 @@ install-local-srv: install-slapd install 67*4882a593Smuzhiyun install-slapd: FORCE 68*4882a593Smuzhiyun -$(MKDIR) $(DESTDIR)$(libexecdir) 69*4882a593Smuzhiyun -$(MKDIR) $(DESTDIR)$(localstatedir)/run 70*4882a593Smuzhiyun- $(LTINSTALL) $(INSTALLFLAGS) $(STRIP) -m 755 \ 71*4882a593Smuzhiyun+ $(LTINSTALL) $(INSTALLFLAGS) $(STRIP_OPTS) -m 755 \ 72*4882a593Smuzhiyun slapd$(EXEEXT) $(DESTDIR)$(libexecdir) 73*4882a593Smuzhiyun @for i in $(SUBDIRS); do \ 74*4882a593Smuzhiyun if test -d $$i && test -f $$i/Makefile ; then \ 75