0001-fix_cross_strip.patch 2.9 KB

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