From 1837b68994e410c91f3d115acfa4341258507a2c Mon Sep 17 00:00:00 2001 From: Mike Baker Date: Sun, 19 Sep 2004 06:50:32 +0000 Subject: [PATCH] fix strip/sstrip issues SVN-Revision: 162 --- obsolete-buildroot/Makefile | 3 ++- obsolete-buildroot/make/berkeleydb.mk | 2 +- obsolete-buildroot/make/bzip2.mk | 2 +- obsolete-buildroot/make/cramfsroot.mk | 2 +- obsolete-buildroot/make/ext2root.mk | 2 +- obsolete-buildroot/make/jffs2root.mk | 2 +- obsolete-buildroot/make/jpeg.mk | 2 +- obsolete-buildroot/make/libglib12.mk | 2 +- obsolete-buildroot/make/ncurses.mk | 2 +- obsolete-buildroot/make/newt.mk | 2 +- obsolete-buildroot/make/openssh.mk | 22 +++++++++++----------- obsolete-buildroot/make/openssl.mk | 8 ++++---- obsolete-buildroot/make/openwrt.mk | 4 ++-- obsolete-buildroot/make/slang.mk | 2 +- obsolete-buildroot/make/squashfsroot.mk | 2 +- obsolete-buildroot/make/valgrind.mk | 2 +- obsolete-buildroot/make/zlib.mk | 4 ++-- 17 files changed, 33 insertions(+), 32 deletions(-) diff --git a/obsolete-buildroot/Makefile b/obsolete-buildroot/Makefile index 859bda478c..a16fe7b812 100644 --- a/obsolete-buildroot/Makefile +++ b/obsolete-buildroot/Makefile @@ -146,7 +146,8 @@ GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-linux KERNEL_CROSS=$(STAGING_DIR)/bin/$(OPTIMIZE_FOR_CPU)-linux-uclibc- TARGET_CROSS=$(STAGING_DIR)/bin/$(OPTIMIZE_FOR_CPU)-linux-uclibc- TARGET_CC=$(TARGET_CROSS)gcc -STRIP=$(TARGET_CROSS)strip --remove-section=.comment --remove-section=.note +#STRIP=$(TARGET_CROSS)strip --remove-section=.comment --remove-section=.note --strip-unneeded +STRIP=$(STAGING_DIR)/bin/sstrip HOST_ARCH:=$(shell $(HOSTCC) -dumpmachine | sed -e s'/-.*//' \ -e 's/sparc.*/sparc/' \ diff --git a/obsolete-buildroot/make/berkeleydb.mk b/obsolete-buildroot/make/berkeleydb.mk index 5b4105a8e6..c935a12319 100644 --- a/obsolete-buildroot/make/berkeleydb.mk +++ b/obsolete-buildroot/make/berkeleydb.mk @@ -74,7 +74,7 @@ $(TARGET_DIR)/lib/libdb-4.1.so: $(STAGING_DIR)/lib/libdb-4.1.so cp -a $(STAGING_DIR)/lib/libdb*so* $(TARGET_DIR)/lib/ rm -f $(TARGET_DIR)/lib/libdb.so $(TARGET_DIR)/lib/libdb.la $(TARGET_DIR)/lib/libdb.a (cd $(TARGET_DIR)/usr/lib; ln -fs /lib/libdb-4.1.so libdb.so) - -$(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libdb*so* + -$(STRIP) $(TARGET_DIR)/lib/libdb*so* $(TARGET_DIR)/usr/lib/libdb.a: $(STAGING_DIR)/lib/libdb-4.1.a cp -dpf $(STAGING_DIR)/include/db.h $(TARGET_DIR)/usr/include/ diff --git a/obsolete-buildroot/make/bzip2.mk b/obsolete-buildroot/make/bzip2.mk index 299105a911..e3ce6f6458 100644 --- a/obsolete-buildroot/make/bzip2.mk +++ b/obsolete-buildroot/make/bzip2.mk @@ -70,7 +70,7 @@ $(TARGET_DIR)/usr/lib/libbz2.a: $(STAGING_DIR)/lib/libbz2.a (cd $(TARGET_DIR)/usr/lib; \ ln -fs /usr/lib/libbz2.so.1.0 libbz2.so; \ ) - -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libbz2.so.1.0 + -$(STRIP) $(TARGET_DIR)/usr/lib/libbz2.so.1.0 touch -c $(TARGET_DIR)/usr/lib/libbz2.a bzip2-headers: $(TARGET_DIR)/usr/lib/libbz2.a diff --git a/obsolete-buildroot/make/cramfsroot.mk b/obsolete-buildroot/make/cramfsroot.mk index 0f1204a258..89f9981f71 100644 --- a/obsolete-buildroot/make/cramfsroot.mk +++ b/obsolete-buildroot/make/cramfsroot.mk @@ -36,7 +36,7 @@ cramfs-dirclean: ############################################################# cramfsroot: cramfs - #-@find $(TARGET_DIR)/lib -type f -name \*.so\* | xargs $(STRIP) --strip-unneeded 2>/dev/null || true; + #-@find $(TARGET_DIR)/lib -type f -name \*.so\* | xargs $(STRIP) 2>/dev/null || true; -@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true; @rm -rf $(TARGET_DIR)/usr/man @rm -rf $(TARGET_DIR)/usr/info diff --git a/obsolete-buildroot/make/ext2root.mk b/obsolete-buildroot/make/ext2root.mk index 0c66c18a9a..c155f8b350 100644 --- a/obsolete-buildroot/make/ext2root.mk +++ b/obsolete-buildroot/make/ext2root.mk @@ -41,7 +41,7 @@ GENEXT2_INODES=$(shell expr $(shell find $(TARGET_DIR) | wc -l) + 400) #GENEXT2_SIZE=100000 ext2root: genext2fs - #-@find $(TARGET_DIR)/lib -type f -name \*.so\* | xargs $(STRIP) --strip-unneeded 2>/dev/null || true; + #-@find $(TARGET_DIR)/lib -type f -name \*.so\* | xargs $(STRIP) 2>/dev/null || true; -@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true; $(GENEXT2_DIR)/genext2fs -i $(GENEXT2_INODES) -b $(GENEXT2_SIZE) \ -d $(TARGET_DIR) -q -D $(SOURCE_DIR)/device_table.txt $(IMAGE) diff --git a/obsolete-buildroot/make/jffs2root.mk b/obsolete-buildroot/make/jffs2root.mk index d5983e9abf..08a66bb138 100644 --- a/obsolete-buildroot/make/jffs2root.mk +++ b/obsolete-buildroot/make/jffs2root.mk @@ -29,7 +29,7 @@ mtd: $(MKFS_JFFS2) ############################################################# jffs2root: mtd - #-@find $(TARGET_DIR)/lib -type f -name \*.so\* | xargs $(STRIP) --strip-unneeded 2>/dev/null || true; + #-@find $(TARGET_DIR)/lib -type f -name \*.so\* | xargs $(STRIP) 2>/dev/null || true; -@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true; @rm -rf $(TARGET_DIR)/usr/man @rm -rf $(TARGET_DIR)/usr/info diff --git a/obsolete-buildroot/make/jpeg.mk b/obsolete-buildroot/make/jpeg.mk index d3f99676de..307217f495 100644 --- a/obsolete-buildroot/make/jpeg.mk +++ b/obsolete-buildroot/make/jpeg.mk @@ -65,7 +65,7 @@ $(STAGING_DIR)/lib/libjpeg.so.62.0.0: $(JPEG_DIR)/.configured $(TARGET_DIR)/lib/libjpeg.so.62.0.0: $(STAGING_DIR)/lib/libjpeg.so.62.0.0 cp -dpf $(STAGING_DIR)/lib/libjpeg.so* $(TARGET_DIR)/usr/lib/ - -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libjpeg.so.62.0.0 + -$(STRIP) $(TARGET_DIR)/usr/lib/libjpeg.so.62.0.0 jpeg: uclibc $(TARGET_DIR)/lib/libjpeg.so.62.0.0 diff --git a/obsolete-buildroot/make/libglib12.mk b/obsolete-buildroot/make/libglib12.mk index f6211ee107..00e13866fe 100644 --- a/obsolete-buildroot/make/libglib12.mk +++ b/obsolete-buildroot/make/libglib12.mk @@ -66,7 +66,7 @@ $(TARGET_DIR)/lib/$(LIBGLIB12_BINARY): $(STAGING_DIR)/lib/$(LIBGLIB12_BINARY) cp -a $(STAGING_DIR)/lib/$(LIBGLIB12_BINARY) $(TARGET_DIR)/lib/ cp -a $(STAGING_DIR)/lib/libglib.so $(TARGET_DIR)/lib/ cp -a $(STAGING_DIR)/lib/libglib-1.2.so.0 $(TARGET_DIR)/lib/ - $(STRIP) --strip-unneeded $(TARGET_DIR)/lib/$(LIBGLIB12_BINARY) + $(STRIP) $(TARGET_DIR)/lib/$(LIBGLIB12_BINARY) libglib12: uclibc $(TARGET_DIR)/lib/$(LIBGLIB12_BINARY) diff --git a/obsolete-buildroot/make/ncurses.mk b/obsolete-buildroot/make/ncurses.mk index f0e91271c5..42a6cd59cf 100644 --- a/obsolete-buildroot/make/ncurses.mk +++ b/obsolete-buildroot/make/ncurses.mk @@ -113,7 +113,7 @@ $(TARGET_DIR)/usr/lib/libncurses.a: $(STAGING_DIR)/lib/libncurses.a (cd $(TARGET_DIR)/usr/include; ln -fs ncurses.h curses.h) rm -f $(TARGET_DIR)/lib/libncurses.so (cd $(TARGET_DIR)/usr/lib; ln -fs /lib/libncurses.so.5.2 libncurses.so) - -$(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libncurses.so.5.2 + -$(STRIP) $(TARGET_DIR)/lib/libncurses.so.5.2 touch -c $(TARGET_DIR)/usr/lib/libncurses.a ncurses-headers: $(TARGET_DIR)/usr/lib/libncurses.a diff --git a/obsolete-buildroot/make/newt.mk b/obsolete-buildroot/make/newt.mk index cc2359e70d..cdf9a9088a 100644 --- a/obsolete-buildroot/make/newt.mk +++ b/obsolete-buildroot/make/newt.mk @@ -56,7 +56,7 @@ $(STAGING_DIR)/lib/libnewt.a: $(NEWT_DIR)/libnewt.so.$(NEWT_VERSION) $(TARGET_DIR)/lib/libnewt.so.$(NEWT_VERSION): $(STAGING_DIR)/lib/libnewt.a cp -a $(STAGING_DIR)/lib/libnewt.so* $(TARGET_DIR)/lib; - -$(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libnewt.so* + -$(STRIP) $(TARGET_DIR)/lib/libnewt.so* touch -c $(TARGET_DIR)/lib/libnewt.so.$(NEWT_VERSION) newt: uclibc slang $(TARGET_DIR)/lib/libnewt.so.$(NEWT_VERSION) diff --git a/obsolete-buildroot/make/openssh.mk b/obsolete-buildroot/make/openssh.mk index 0182f57761..867cf75ec7 100644 --- a/obsolete-buildroot/make/openssh.mk +++ b/obsolete-buildroot/make/openssh.mk @@ -55,17 +55,17 @@ $(OPENSSH_DIR)/.configured: $(OPENSSH_DIR)/.unpacked $(OPENSSH_DIR)/ssh: $(OPENSSH_DIR)/.configured $(MAKE) CC=$(TARGET_CC) -C $(OPENSSH_DIR) - -$(STRIP) --strip-unneeded $(OPENSSH_DIR)/scp - -$(STRIP) --strip-unneeded $(OPENSSH_DIR)/sftp - -$(STRIP) --strip-unneeded $(OPENSSH_DIR)/sftp-server - -$(STRIP) --strip-unneeded $(OPENSSH_DIR)/ssh - -$(STRIP) --strip-unneeded $(OPENSSH_DIR)/ssh-add - -$(STRIP) --strip-unneeded $(OPENSSH_DIR)/ssh-agent - -$(STRIP) --strip-unneeded $(OPENSSH_DIR)/ssh-keygen - -$(STRIP) --strip-unneeded $(OPENSSH_DIR)/ssh-keyscan - -$(STRIP) --strip-unneeded $(OPENSSH_DIR)/ssh-keysign - -$(STRIP) --strip-unneeded $(OPENSSH_DIR)/ssh-rand-helper - -$(STRIP) --strip-unneeded $(OPENSSH_DIR)/sshd + -$(STRIP) $(OPENSSH_DIR)/scp + -$(STRIP) $(OPENSSH_DIR)/sftp + -$(STRIP) $(OPENSSH_DIR)/sftp-server + -$(STRIP) $(OPENSSH_DIR)/ssh + -$(STRIP) $(OPENSSH_DIR)/ssh-add + -$(STRIP) $(OPENSSH_DIR)/ssh-agent + -$(STRIP) $(OPENSSH_DIR)/ssh-keygen + -$(STRIP) $(OPENSSH_DIR)/ssh-keyscan + -$(STRIP) $(OPENSSH_DIR)/ssh-keysign + -$(STRIP) $(OPENSSH_DIR)/ssh-rand-helper + -$(STRIP) $(OPENSSH_DIR)/sshd $(TARGET_DIR)/usr/bin/ssh: $(OPENSSH_DIR)/ssh $(MAKE) CC=$(TARGET_CC) DESTDIR=$(TARGET_DIR) -C $(OPENSSH_DIR) install diff --git a/obsolete-buildroot/make/openssl.mk b/obsolete-buildroot/make/openssl.mk index d9bb477ed0..c9726a65a8 100644 --- a/obsolete-buildroot/make/openssl.mk +++ b/obsolete-buildroot/make/openssl.mk @@ -55,8 +55,8 @@ $(TARGET_DIR)/usr/lib/libcrypto.so.0.9.7: $(STAGING_DIR)/lib/libcrypto.a cp -fa $(STAGING_DIR)/lib/libcrypto.so* $(TARGET_DIR)/usr/lib/ cp -fa $(STAGING_DIR)/lib/libssl.so* $(TARGET_DIR)/usr/lib/ #cp -fa $(STAGING_DIR)/bin/openssl $(TARGET_DIR)/bin/ - -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libssl.so.0.9.7 - -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libcrypto.so.0.9.7 + -$(STRIP) $(TARGET_DIR)/usr/lib/libssl.so.0.9.7 + -$(STRIP) $(TARGET_DIR)/usr/lib/libcrypto.so.0.9.7 $(TARGET_DIR)/usr/lib/libssl.a: $(STAGING_DIR)/lib/libcrypto.a mkdir -p $(TARGET_DIR)/usr/include @@ -75,8 +75,8 @@ $(LIBSSL_IPK): uclibc $(STAGING_DIR)/lib/libcrypto.a mkdir -p $(OPENSSL_IPK_BUILD_DIR)/usr/lib cp -fa $(STAGING_DIR)/lib/libcrypto.so* $(OPENSSL_IPK_BUILD_DIR)/usr/lib/ cp -fa $(STAGING_DIR)/lib/libssl.so* $(OPENSSL_IPK_BUILD_DIR)/usr/lib/ - -$(STRIP) --strip-unneeded $(OPENSSL_IPK_BUILD_DIR)/usr/lib/libssl.so.0.9.7 - -$(STRIP) --strip-unneeded $(OPENSSL_IPK_BUILD_DIR)/usr/lib/libcrypto.so.0.9.7 + -$(STRIP) $(OPENSSL_IPK_BUILD_DIR)/usr/lib/libssl.so.0.9.7 + -$(STRIP) $(OPENSSL_IPK_BUILD_DIR)/usr/lib/libcrypto.so.0.9.7 cd $(BUILD_DIR); $(IPKG_BUILD) $(OPENSSL_IPK_BUILD_DIR) openssl-ipk: $(LIBSSL_IPK) diff --git a/obsolete-buildroot/make/openwrt.mk b/obsolete-buildroot/make/openwrt.mk index efe6ebedc4..fbf1cffb81 100644 --- a/obsolete-buildroot/make/openwrt.mk +++ b/obsolete-buildroot/make/openwrt.mk @@ -23,7 +23,7 @@ # Currently the dependencies are not all handled. But that's true of # our buildroot in general, since it wasn't really set up for end users. -OPENWRT_TARGETS:= gcc3_3 openwrt-linux openwrt-kmodules.tar.bz2 \ +OPENWRT_TARGETS:= $(STAGING_DIR)/bin/sstrip gcc3_3 openwrt-linux openwrt-kmodules.tar.bz2 \ openwrt-shared openwrt-mtd openwrt-nvram openwrt-wlconf \ bridge dnsmasq1 iptables wtools busybox \ openwrt-rootprep @@ -202,7 +202,7 @@ openwrt-rootprep: ###################################################################### -openwrt-prune: openwrt-base $(STAGING_DIR)/bin/sstrip +openwrt-prune: openwrt-base # remove unneeded uClibc libs rm -rf $(TARGET_DIR)/lib/libthread_db* rm -rf $(TARGET_DIR)/lib/libpthread* diff --git a/obsolete-buildroot/make/slang.mk b/obsolete-buildroot/make/slang.mk index 17dcaddd59..f7e2200368 100644 --- a/obsolete-buildroot/make/slang.mk +++ b/obsolete-buildroot/make/slang.mk @@ -31,7 +31,7 @@ $(STAGING_DIR)/lib/libslang.so.1: $(SLANG_DIR)/libslang.so $(TARGET_DIR)/lib/libslang.so.1: $(STAGING_DIR)/lib/libslang.so.1 cp -a $(STAGING_DIR)/lib/libslang.so* $(TARGET_DIR)/lib; - -$(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libslang.so* + -$(STRIP) $(TARGET_DIR)/lib/libslang.so* touch -c $(TARGET_DIR)/lib/libslang.so.1 slang: uclibc $(STAGING_DIR)/lib/libslang.so.1 $(TARGET_DIR)/lib/libslang.so.1 diff --git a/obsolete-buildroot/make/squashfsroot.mk b/obsolete-buildroot/make/squashfsroot.mk index 6c66982e29..9d8722e59a 100644 --- a/obsolete-buildroot/make/squashfsroot.mk +++ b/obsolete-buildroot/make/squashfsroot.mk @@ -35,7 +35,7 @@ squashfs-dirclean: ############################################################# squashfsroot: squashfs - #-@find $(TARGET_DIR)/lib -type f -name \*.so\* | xargs $(STRIP) --strip-unneeded 2>/dev/null || true; + #-@find $(TARGET_DIR)/lib -type f -name \*.so\* | xargs $(STRIP) 2>/dev/null || true; #-@find $(TARGET_DIR) -type f -perm +111 | xargs $(STAGING_DIR)/bin/sstrip 2>/dev/null || true; @rm -rf $(TARGET_DIR)/usr/man @rm -rf $(TARGET_DIR)/usr/info diff --git a/obsolete-buildroot/make/valgrind.mk b/obsolete-buildroot/make/valgrind.mk index ed295a3cfb..1c39c31fc3 100644 --- a/obsolete-buildroot/make/valgrind.mk +++ b/obsolete-buildroot/make/valgrind.mk @@ -46,7 +46,7 @@ $(VALGRIND_DIR)/.configured: $(VALGRIND_DIR)/.patched $(VALGRIND_DIR)/coregrind/valgrind.so: $(VALGRIND_DIR)/.configured $(MAKE) -C $(VALGRIND_DIR) - -$(STRIP) --strip-unneeded $(VALGRIND_DIR)/*.so* + -$(STRIP) $(VALGRIND_DIR)/*.so* touch -c $(VALGRIND_DIR)/coregrind/valgrind.so $(TARGET_DIR)/usr/bin/valgrind: $(VALGRIND_DIR)/coregrind/valgrind.so diff --git a/obsolete-buildroot/make/zlib.mk b/obsolete-buildroot/make/zlib.mk index 85b01d75bc..8583718c7d 100644 --- a/obsolete-buildroot/make/zlib.mk +++ b/obsolete-buildroot/make/zlib.mk @@ -48,7 +48,7 @@ $(STAGING_DIR)/lib/libz.so.1.1.4: $(ZLIB_DIR)/libz.so.1.1.4 $(TARGET_DIR)/lib/libz.so.1.1.4: $(STAGING_DIR)/lib/libz.so.1.1.4 cp -dpf $(STAGING_DIR)/lib/libz.so* $(TARGET_DIR)/lib; - -$(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libz.so* + -$(STRIP) $(TARGET_DIR)/lib/libz.so* touch -c $(TARGET_DIR)/lib/libz.so.1.1.4 $(TARGET_DIR)/usr/lib/libz.a: $(STAGING_DIR)/lib/libz.so.1.1.4 @@ -69,7 +69,7 @@ $(ZLIB_IPK): uclibc $(STAGING_DIR)/lib/libz.so.1.1.4 cp $(SOURCE_DIR)/openwrt/ipkg/zlib/control $(ZLIB_IPK_DIR)/CONTROL/control mkdir -p $(ZLIB_IPK_DIR)/lib cp -dpf $(STAGING_DIR)/lib/libz.so* $(ZLIB_IPK_DIR)/lib; - -$(STRIP) --strip-unneeded $(ZLIB_IPK_DIR)/lib/libz.so* + -$(STRIP) $(ZLIB_IPK_DIR)/lib/libz.so* touch -c $(ZLIB_IPK_DIR)/lib/libz.so.1.1.4 cd $(BUILD_DIR); $(IPKG_BUILD) $(ZLIB_IPK_DIR)