respect original setting of INHIBIT_PACKAGE_STRIP

BKrev: 4135b8325bbp10XZc2WNZ6F0pJ_GYg

diff --git a/gcc/gcc-cross_3.3.4.oe b/gcc/gcc-cross_3.3.4.oe
index 8271745..427da7c 100644 (file)
--- a/gcc/gcc-cross_3.3.4.oe
+++ b/gcc/gcc-cross_3.3.4.oe
@@ -7,6 +7,7 @@ PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
 
 # Files for these are defined in the main gcc.oe
 PACKAGES = "libgcc libstdc++ libg2c"
+OLD_INHIBIT_PACKAGE_STRIP := "${INHIBIT_PACKAGE_STRIP}"
 INHIBIT_PACKAGE_STRIP = 1
 
 EXTRA_OECONF_PATHS = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \
@@ -90,7 +91,9 @@ do_install () {
 
        # Manually run the target stripper since we won't get it run by
        # the packaging.
-       ${TARGET_PREFIX}strip ${D}/${TGT_LIBDIR}/libstdc++.so.*
-       ${TARGET_PREFIX}strip ${D}/${TGT_LIBDIR}/libg2c.so.*
-       ${TARGET_PREFIX}strip ${D}/lib/libgcc_s.so.*
+       if [ "x${OLD_INHIBIT_PACKAGE_STRIP}" != "x1" ]; then
+               ${TARGET_PREFIX}strip ${D}/${TGT_LIBDIR}/libstdc++.so.*
+               ${TARGET_PREFIX}strip ${D}/${TGT_LIBDIR}/libg2c.so.*
+               ${TARGET_PREFIX}strip ${D}/lib/libgcc_s.so.*
+       fi
 }

diff --git a/gcc/gcc-cross_3.4.1.oe b/gcc/gcc-cross_3.4.1.oe
index 493c666..b644eb0 100644 (file)
--- a/gcc/gcc-cross_3.4.1.oe
+++ b/gcc/gcc-cross_3.4.1.oe
@@ -7,6 +7,7 @@ PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
 
 # Files for these are defined in the main gcc.oe
 PACKAGES = "libgcc libstdc++ libg2c"
+OLD_INHIBIT_PACKAGE_STRIP := "${INHIBIT_PACKAGE_STRIP}"
 INHIBIT_PACKAGE_STRIP = 1
 
 EXTRA_OECONF_PATHS = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \
@@ -86,8 +87,10 @@ do_install () {
 
        # Manually run the target stripper since we won't get it run by
        # the packaging.
-       ${TARGET_PREFIX}strip ${D}/${TGT_LIBDIR}/libstdc++.so.*
-       ${TARGET_PREFIX}strip ${D}/${TGT_LIBDIR}/libg2c.so.*
-       ${TARGET_PREFIX}strip ${D}/lib/libgcc_s.so.*
+       if [ "x${OLD_INHIBIT_PACKAGE_STRIP}" != "x1" ]; then
+               ${TARGET_PREFIX}strip ${D}/${TGT_LIBDIR}/libstdc++.so.*
+               ${TARGET_PREFIX}strip ${D}/${TGT_LIBDIR}/libg2c.so.*
+               ${TARGET_PREFIX}strip ${D}/lib/libgcc_s.so.*
+       fi
 }