mirror of
https://git.openldap.org/openldap/openldap.git
synced 2024-11-27 02:22:00 +08:00
ITS#9327 - Fix stripping when cross-compiling
Probably-Signed-off-by: Dave 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" <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 <fontaine.fabrice@gmail.com>
This commit is contained in:
parent
5aa7e0f69b
commit
8df03b435e
@ -993,7 +993,7 @@ install )
|
||||
if [ ".$opt_t" = .yes ]; then
|
||||
echo "strip $dsttmp" 1>&2
|
||||
fi
|
||||
strip $dsttmp || shtool_exit $?
|
||||
$STRIP $dsttmp || shtool_exit $?
|
||||
fi
|
||||
if [ ".$opt_o" != . ]; then
|
||||
if [ ".$opt_t" = .yes ]; then
|
||||
|
@ -59,7 +59,7 @@ INSTALL_PROGRAM = $(INSTALL)
|
||||
INSTALL_DATA = $(INSTALL) -m 644
|
||||
INSTALL_SCRIPT = $(INSTALL)
|
||||
|
||||
STRIP = -s
|
||||
STRIP_OPTS = -s
|
||||
|
||||
LINT = lint
|
||||
5LINT = 5lint
|
||||
|
@ -129,7 +129,7 @@ install-local: FORCE
|
||||
-$(MKDIR) $(DESTDIR)$(bindir)
|
||||
@( \
|
||||
for prg in $(PROGRAMS); do \
|
||||
$(LTINSTALL) $(INSTALLFLAGS) $(STRIP) -m 755 $$prg$(EXEEXT) \
|
||||
$(LTINSTALL) $(INSTALLFLAGS) $(STRIP_OPTS) -m 755 $$prg$(EXEEXT) \
|
||||
$(DESTDIR)$(bindir); \
|
||||
done \
|
||||
)
|
||||
|
@ -657,6 +657,15 @@ if test -z "${AR}"; then
|
||||
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_DLOPEN
|
||||
AC_PROG_MAKE_SET
|
||||
|
@ -372,7 +372,7 @@ install-local-srv: install-slapd install-tools \
|
||||
install-slapd: FORCE
|
||||
-$(MKDIR) $(DESTDIR)$(libexecdir)
|
||||
-$(MKDIR) $(DESTDIR)$(localstatedir)/run
|
||||
$(LTINSTALL) $(INSTALLFLAGS) $(STRIP) -m 755 \
|
||||
$(LTINSTALL) $(INSTALLFLAGS) $(STRIP_OPTS) -m 755 \
|
||||
slapd$(EXEEXT) $(DESTDIR)$(libexecdir)
|
||||
@for i in $(SUBDIRS); do \
|
||||
if test -d $$i && test -f $$i/Makefile ; then \
|
||||
|
Loading…
Reference in New Issue
Block a user