Patchwork [meta-oe] openldap: do not strip during install

login
register
mail settings
Submitter Marcin Juszkiewicz
Date March 21, 2013, 1:38 p.m.
Message ID <1363873108-2848-1-git-send-email-marcin.juszkiewicz@linaro.org>
Download mbox | patch
Permalink /patch/46621/
State Accepted
Commit 6cbd81ed18465affba841311ec1cdf3eb6800dba
Headers show

Comments

Marcin Juszkiewicz - March 21, 2013, 1:38 p.m.
Before:
WARNING: File '/usr/lib/openldap/slapd' from openldap was already stripped, this will prevent future debugging!
WARNING: File '/usr/bin/ldapsearch' from openldap was already stripped, this will prevent future debugging!
WARNING: File '/usr/bin/ldapmodify' from openldap was already stripped, this will prevent future debugging!
WARNING: File '/usr/bin/ldapdelete' from openldap was already stripped, this will prevent future debugging!
WARNING: File '/usr/bin/ldapmodrdn' from openldap was already stripped, this will prevent future debugging!
WARNING: File '/usr/bin/ldappasswd' from openldap was already stripped, this will prevent future debugging!
WARNING: File '/usr/bin/ldapwhoami' from openldap was already stripped, this will prevent future debugging!
WARNING: File '/usr/bin/ldapcompare' from openldap was already stripped, this will prevent future debugging!
WARNING: File '/usr/bin/ldapexop' from openldap was already stripped, this will prevent future debugging!
WARNING: File '/usr/bin/ldapurl' from openldap was already stripped, this will prevent future debugging!

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
---
 meta-oe/recipes-support/openldap/openldap-2.4.23/install-strip.patch | 2 +-
 meta-oe/recipes-support/openldap/openldap_2.4.23.bb                  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
Martin Jansa - March 22, 2013, 9:21 a.m.
On Thu, Mar 21, 2013 at 02:38:28PM +0100, Marcin Juszkiewicz wrote:
> Before:
> WARNING: File '/usr/lib/openldap/slapd' from openldap was already stripped, this will prevent future debugging!
> WARNING: File '/usr/bin/ldapsearch' from openldap was already stripped, this will prevent future debugging!
> WARNING: File '/usr/bin/ldapmodify' from openldap was already stripped, this will prevent future debugging!
> WARNING: File '/usr/bin/ldapdelete' from openldap was already stripped, this will prevent future debugging!
> WARNING: File '/usr/bin/ldapmodrdn' from openldap was already stripped, this will prevent future debugging!
> WARNING: File '/usr/bin/ldappasswd' from openldap was already stripped, this will prevent future debugging!
> WARNING: File '/usr/bin/ldapwhoami' from openldap was already stripped, this will prevent future debugging!
> WARNING: File '/usr/bin/ldapcompare' from openldap was already stripped, this will prevent future debugging!
> WARNING: File '/usr/bin/ldapexop' from openldap was already stripped, this will prevent future debugging!
> WARNING: File '/usr/bin/ldapurl' from openldap was already stripped, this will prevent future debugging!

Applied, thanks!

> 
> Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
> ---
>  meta-oe/recipes-support/openldap/openldap-2.4.23/install-strip.patch | 2 +-
>  meta-oe/recipes-support/openldap/openldap_2.4.23.bb                  | 1 +
>  2 files changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/meta-oe/recipes-support/openldap/openldap-2.4.23/install-strip.patch b/meta-oe/recipes-support/openldap/openldap-2.4.23/install-strip.patch
> index 9d7640c..2992b70 100644
> --- a/meta-oe/recipes-support/openldap/openldap-2.4.23/install-strip.patch
> +++ b/meta-oe/recipes-support/openldap/openldap-2.4.23/install-strip.patch
> @@ -8,7 +8,7 @@
>   	$(CC) $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS_MOD)
>   
>  -LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL) 
> -+LTINSTALL = STRIPPROG="@STRIP@" $(LIBTOOL) --mode=install $(top_srcdir)/contrib/ldapc++/install-sh -c
> ++LTINSTALL = STRIPPROG="" $(LIBTOOL) --mode=install $(top_srcdir)/contrib/ldapc++/install-sh -c
>   LTFINISH = $(LIBTOOL) --mode=finish
>   
>   # Misc UNIX commands used in build environment
> diff --git a/meta-oe/recipes-support/openldap/openldap_2.4.23.bb b/meta-oe/recipes-support/openldap/openldap_2.4.23.bb
> index 319c50d..1c6c32f 100644
> --- a/meta-oe/recipes-support/openldap/openldap_2.4.23.bb
> +++ b/meta-oe/recipes-support/openldap/openldap_2.4.23.bb
> @@ -19,6 +19,7 @@ SRC_URI += "file://initscript"
>  SRC_URI[md5sum] = "90150b8c0d0192e10b30157e68844ddf"
>  SRC_URI[sha256sum] = "5a5ede91d5e8ab3c7f637620aa29a3b96eb34318a8b26c8eef2d2c789fc055e3"
>  
> +PR = "r1"
>  # The original top.mk used INSTALL, not INSTALL_STRIP_PROGRAM when
>  # installing .so and executables, this fails in cross compilation
>  # environments
> -- 
> 1.8.1.2
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Patch

diff --git a/meta-oe/recipes-support/openldap/openldap-2.4.23/install-strip.patch b/meta-oe/recipes-support/openldap/openldap-2.4.23/install-strip.patch
index 9d7640c..2992b70 100644
--- a/meta-oe/recipes-support/openldap/openldap-2.4.23/install-strip.patch
+++ b/meta-oe/recipes-support/openldap/openldap-2.4.23/install-strip.patch
@@ -8,7 +8,7 @@ 
  	$(CC) $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS_MOD)
  
 -LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL) 
-+LTINSTALL = STRIPPROG="@STRIP@" $(LIBTOOL) --mode=install $(top_srcdir)/contrib/ldapc++/install-sh -c
++LTINSTALL = STRIPPROG="" $(LIBTOOL) --mode=install $(top_srcdir)/contrib/ldapc++/install-sh -c
  LTFINISH = $(LIBTOOL) --mode=finish
  
  # Misc UNIX commands used in build environment
diff --git a/meta-oe/recipes-support/openldap/openldap_2.4.23.bb b/meta-oe/recipes-support/openldap/openldap_2.4.23.bb
index 319c50d..1c6c32f 100644
--- a/meta-oe/recipes-support/openldap/openldap_2.4.23.bb
+++ b/meta-oe/recipes-support/openldap/openldap_2.4.23.bb
@@ -19,6 +19,7 @@  SRC_URI += "file://initscript"
 SRC_URI[md5sum] = "90150b8c0d0192e10b30157e68844ddf"
 SRC_URI[sha256sum] = "5a5ede91d5e8ab3c7f637620aa29a3b96eb34318a8b26c8eef2d2c789fc055e3"
 
+PR = "r1"
 # The original top.mk used INSTALL, not INSTALL_STRIP_PROGRAM when
 # installing .so and executables, this fails in cross compilation
 # environments