Commit 8df03b43 authored by Fabrice Fontaine's avatar Fabrice Fontaine Committed by Quanah Gibson-Mount
Browse files

ITS#9327 - Fix stripping when cross-compiling



Probably-Signed-off-by: default avatarDave Bender <bender@benegon.com>
[yann.morin.1998@free.fr: patch was made by Dave, but he
 forgot his SoB line, so I added it]
Signed-off-by: Yann E. MORIN's avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
[Retrieved from:
https://git.buildroot.net/buildroot/tree/package/openldap/0001-fix_cross_strip.patch

]
Signed-off-by: Fabrice Fontaine's avatarFabrice Fontaine <fontaine.fabrice@gmail.com>
parent 5aa7e0f6
...@@ -993,7 +993,7 @@ install ) ...@@ -993,7 +993,7 @@ install )
if [ ".$opt_t" = .yes ]; then if [ ".$opt_t" = .yes ]; then
echo "strip $dsttmp" 1>&2 echo "strip $dsttmp" 1>&2
fi fi
strip $dsttmp || shtool_exit $? $STRIP $dsttmp || shtool_exit $?
fi fi
if [ ".$opt_o" != . ]; then if [ ".$opt_o" != . ]; then
if [ ".$opt_t" = .yes ]; then if [ ".$opt_t" = .yes ]; then
......
...@@ -59,7 +59,7 @@ INSTALL_PROGRAM = $(INSTALL) ...@@ -59,7 +59,7 @@ INSTALL_PROGRAM = $(INSTALL)
INSTALL_DATA = $(INSTALL) -m 644 INSTALL_DATA = $(INSTALL) -m 644
INSTALL_SCRIPT = $(INSTALL) INSTALL_SCRIPT = $(INSTALL)
STRIP = -s STRIP_OPTS = -s
LINT = lint LINT = lint
5LINT = 5lint 5LINT = 5lint
......
...@@ -129,7 +129,7 @@ install-local: FORCE ...@@ -129,7 +129,7 @@ install-local: FORCE
-$(MKDIR) $(DESTDIR)$(bindir) -$(MKDIR) $(DESTDIR)$(bindir)
@( \ @( \
for prg in $(PROGRAMS); do \ for prg in $(PROGRAMS); do \
$(LTINSTALL) $(INSTALLFLAGS) $(STRIP) -m 755 $$prg$(EXEEXT) \ $(LTINSTALL) $(INSTALLFLAGS) $(STRIP_OPTS) -m 755 $$prg$(EXEEXT) \
$(DESTDIR)$(bindir); \ $(DESTDIR)$(bindir); \
done \ done \
) )
......
...@@ -657,6 +657,15 @@ if test -z "${AR}"; then ...@@ -657,6 +657,15 @@ if test -z "${AR}"; then
fi fi
fi fi
if test -z "${STRIP}"; then
AC_CHECK_PROGS(STRIP,strip,missing)
if test "${STRIP}" = "missing" ; then
AC_MSG_ERROR([Unable to locate strip(1) or suitable replacement. Check PATH or set STRIP.])
fi
fi
AC_LIBTOOL_WIN32_DLL AC_LIBTOOL_WIN32_DLL
AC_LIBTOOL_DLOPEN AC_LIBTOOL_DLOPEN
AC_PROG_MAKE_SET AC_PROG_MAKE_SET
......
...@@ -372,7 +372,7 @@ install-local-srv: install-slapd install-tools \ ...@@ -372,7 +372,7 @@ install-local-srv: install-slapd install-tools \
install-slapd: FORCE install-slapd: FORCE
-$(MKDIR) $(DESTDIR)$(libexecdir) -$(MKDIR) $(DESTDIR)$(libexecdir)
-$(MKDIR) $(DESTDIR)$(localstatedir)/run -$(MKDIR) $(DESTDIR)$(localstatedir)/run
$(LTINSTALL) $(INSTALLFLAGS) $(STRIP) -m 755 \ $(LTINSTALL) $(INSTALLFLAGS) $(STRIP_OPTS) -m 755 \
slapd$(EXEEXT) $(DESTDIR)$(libexecdir) slapd$(EXEEXT) $(DESTDIR)$(libexecdir)
@for i in $(SUBDIRS); do \ @for i in $(SUBDIRS); do \
if test -d $$i && test -f $$i/Makefile ; then \ if test -d $$i && test -f $$i/Makefile ; then \
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment