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