From e4ead9c13ccad1b89743fdd46e8675f45758aec3 Mon Sep 17 00:00:00 2001 From: Ulf Samuelsson Date: Tue, 21 Aug 2007 01:53:57 +0000 Subject: Remove switches if sstrip is run --- package/Makefile.in | 10 ++++++++++ package/acpid/acpid.mk | 4 ++-- package/alsa-lib/alsa-lib.mk | 6 +++--- package/argus/argus.mk | 2 +- package/asterisk/asterisk.mk | 2 +- package/atk/atk.mk | 2 +- package/avahi/avahi.mk | 6 +++--- package/berkeleydb/berkeleydb.mk | 2 +- package/boa/boa.mk | 2 +- package/bzip2/bzip2.mk | 2 +- package/cairo/cairo.mk | 2 +- package/curl/curl.mk | 4 ++-- package/cvs/cvs.mk | 2 +- package/dbus-glib/dbus-glib.mk | 2 +- package/dbus/dbus.mk | 2 +- package/directfb/directfb.mk | 2 +- package/dmalloc/dmalloc.mk | 2 +- package/dropbear/dropbear.mk | 2 +- package/expat/expat.mk | 2 +- package/fbset/fbset.mk | 4 ++-- package/fontconfig/fontconfig.mk | 6 +++--- package/freetype/freetype.mk | 2 +- package/gmp/gmp.mk | 2 +- package/hal/hal.mk | 2 +- package/imagemagick/imagemagick.mk | 22 +++++++++++----------- package/iperf/iperf.mk | 2 +- package/ipsec-tools/ipsec-tools.mk | 4 ++-- package/jpeg/jpeg.mk | 2 +- package/kexec/kexec.mk | 2 +- package/libaio/libaio.mk | 2 +- package/libdrm/libdrm.mk | 2 +- package/libglib12/libglib12.mk | 4 ++-- package/libglib2/libglib2.mk | 8 ++++---- package/libgtk12/libgtk12.mk | 4 ++-- package/libgtk2/libgtk2.mk | 4 ++-- package/libid3tag/libid3tag.mk | 2 +- package/liblockfile/liblockfile.mk | 2 +- package/libmad/libmad.mk | 2 +- package/libpng/libpng.mk | 2 +- package/libsysfs/libsysfs.mk | 2 +- package/libungif/libungif.mk | 2 +- package/libxml2/libxml2.mk | 2 +- package/lighttpd/lighttpd.mk | 4 ++-- package/lockfile-progs/lockfile-progs.mk | 2 +- package/lzma/lzma.mk | 2 +- package/madplay/madplay.mk | 2 +- package/matchbox/matchbox.mk | 28 ++++++++++++++-------------- package/mdadm/mdadm.mk | 2 +- package/metacity/metacity.mk | 2 +- package/microcom/microcom.mk | 2 +- package/mpfr/mpfr.mk | 2 +- package/mpg123/mpg123.mk | 2 +- package/mplayer/mplayer.mk | 2 +- package/ncftp/ncftp.mk | 2 +- package/ncurses/ncurses.mk | 4 ++-- package/netcat/netcat.mk | 2 +- package/newt/newt.mk | 2 +- package/openntpd/openntpd.mk | 2 +- package/openssh/openssh.mk | 22 +++++++++++----------- package/openssl/openssl.mk | 4 ++-- package/pango/pango.mk | 10 +++++----- package/php/php.mk | 4 ++-- package/qtopia4/qtopia4.mk | 2 +- package/rxvt/rxvt.mk | 2 +- package/samba/samba.mk | 4 ++-- package/sdl/sdl.mk | 2 +- package/setserial/setserial.mk | 2 +- package/slang/slang.mk | 2 +- package/sqlite/sqlite.mk | 2 +- package/tcl/tcl.mk | 2 +- package/tiff/tiff.mk | 2 +- package/tinyhttpd/tinyhttpd.mk | 2 +- package/tslib/tslib.mk | 10 +++++----- package/udev/udev.mk | 6 +++--- package/valgrind/valgrind.mk | 2 +- package/vpnc/vpnc.mk | 2 +- package/xerces/xerces.mk | 4 ++-- package/xorg/xorg.mk | 2 +- package/zlib/zlib.mk | 2 +- 79 files changed, 153 insertions(+), 143 deletions(-) (limited to 'package') diff --git a/package/Makefile.in b/package/Makefile.in index 1589cf14b..e3d7f8301 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -138,9 +138,19 @@ TARGET_LDCONFIG=$(TARGET_CROSS)ldconfig INSTALL=/usr/bin/install ifeq ($(BR2_STRIP_strip),y) STRIP=$(TARGET_CROSS)strip --remove-section=.comment --remove-section=.note +STRIP_DISCARD_ALL:=--discard-all +STRIP_STRIP_UNNEEDED:=--strip-unneeded +STRIP_STRIP_ALL:=--strip-all +REMOVE_SECTION_COMMENT:=--remove-section=.comment +REMOVE_SECTION_NOTE:=--remove-section=.note endif ifeq ($(BR2_STRIP_sstrip),y) STRIP=$(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-sstrip +STRIP_DISCARD_ALL:= +STRIP_STRIP_UNNEEDED:= +STRIP_STRIP_ALL:= +REMOVE_SECTION_COMMENT:= +REMOVE_SECTION_NOTE:= endif ifeq ($(BR2_STRIP_none),y) STRIP=true -Not_stripping diff --git a/package/acpid/acpid.mk b/package/acpid/acpid.mk index 627506b75..731217ddf 100644 --- a/package/acpid/acpid.mk +++ b/package/acpid/acpid.mk @@ -18,8 +18,8 @@ $(ACPID_DIR)/.unpacked: $(DL_DIR)/$(ACPID_SOURCE) $(ACPID_DIR)/acpid: $(ACPID_DIR)/.unpacked $(MAKE) CC=$(TARGET_CC) -C $(ACPID_DIR) - $(STRIP) -s $(ACPID_DIR)/acpid - $(STRIP) -s $(ACPID_DIR)/acpi_listen + $(STRIP) $(STRIP_STRIP_ALL) $(ACPID_DIR)/acpid + $(STRIP) $(STRIP_STRIP_ALL) $(ACPID_DIR)/acpi_listen touch -c $(ACPID_DIR)/acpid $(ACPID_DIR)/acpi_listen $(TARGET_DIR)/usr/sbin/acpid: $(ACPID_DIR)/acpid diff --git a/package/alsa-lib/alsa-lib.mk b/package/alsa-lib/alsa-lib.mk index f823f6f90..90b17f950 100644 --- a/package/alsa-lib/alsa-lib.mk +++ b/package/alsa-lib/alsa-lib.mk @@ -53,11 +53,11 @@ $(TARGET_DIR)/$(ALSA_LIB_TARGET_BINARY): $(STAGING_DIR)/$(ALSA_LIB_TARGET_BINARY cp -dpf $(STAGING_DIR)/lib/libasound.so* $(TARGET_DIR)/usr/lib/ cp -rdpf $(STAGING_DIR)/usr/share/alsa/* $(TARGET_DIR)/usr/share/alsa/ cp -rdpf $(STAGING_DIR)/usr/lib/alsa-lib/* $(TARGET_DIR)/usr/lib/alsa-lib/ - -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libasound.so* - -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/alsa-lib/*.so + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libasound.so* + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/alsa-lib/*.so touch -c $@ -alsa-lib: linux26 uclibc $(TARGET_DIR)/$(ALSA_LIB_TARGET_BINARY) +alsa-lib: uclibc $(TARGET_DIR)/$(ALSA_LIB_TARGET_BINARY) alsa-lib-clean: rm -f $(TARGET_DIR)/$(ALSA_LIB_TARGET_BINARY) diff --git a/package/argus/argus.mk b/package/argus/argus.mk index 338df5315..c8e42523b 100644 --- a/package/argus/argus.mk +++ b/package/argus/argus.mk @@ -49,7 +49,7 @@ $(ARGUS_DIR)/$(ARGUS_BINARY): $(ARGUS_DIR)/.configured $(TARGET_DIR)/$(ARGUS_TARGET_BINARY): $(ARGUS_DIR)/$(ARGUS_BINARY) cp -dpf $(ARGUS_DIR)/$(ARGUS_BINARY) $@ - $(STRIP) -s $@ + $(STRIP) $(STRIP_STRIP_ALL) $@ argus: uclibc libpcap $(TARGET_DIR)/$(ARGUS_TARGET_BINARY) diff --git a/package/asterisk/asterisk.mk b/package/asterisk/asterisk.mk index 986b6cd2f..2e18b79b4 100644 --- a/package/asterisk/asterisk.mk +++ b/package/asterisk/asterisk.mk @@ -29,7 +29,7 @@ $(TARGET_DIR)/$(ASTERISK_TARGET_BINARY): $(ASTERISK_DIR)/$(ASTERISK_BINARY) $(STRIP) $(TARGET_DIR)/usr/sbin/asterisk $(STRIP) $(TARGET_DIR)/usr/sbin/stereorize $(STRIP) $(TARGET_DIR)/usr/sbin/streamplayer - $(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/asterisk/modules/*.so + $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/asterisk/modules/*.so $(INSTALL) -m 755 $(ASTERISK_DIR)/contrib/init.d/rc.debian.asterisk $(TARGET_DIR)/etc/init.d/S60asterisk mv $(TARGET_DIR)/usr/include/asterisk $(STAGING_DIR)/usr/include/ rm -Rf $(TARGET_DIR)/usr/share/man diff --git a/package/atk/atk.mk b/package/atk/atk.mk index 76875f46e..0f6975c11 100644 --- a/package/atk/atk.mk +++ b/package/atk/atk.mk @@ -121,7 +121,7 @@ $(STAGING_DIR)/lib/$(ATK_BINARY): $(ATK_DIR)/atk/.libs/$(ATK_BINARY) $(TARGET_DIR)/lib/libatk-1.0.so.0: $(STAGING_DIR)/lib/$(ATK_BINARY) cp -a $(STAGING_DIR)/lib/libatk-1.0.so $(TARGET_DIR)/lib/ cp -a $(STAGING_DIR)/lib/libatk-1.0.so.0* $(TARGET_DIR)/lib/ - $(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libatk-1.0.so.0.* + $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libatk-1.0.so.0.* touch -c $(TARGET_DIR)/lib/libatk-1.0.so.0 atk: libglib2 pkgconfig $(TARGET_DIR)/lib/libatk-1.0.so.0 diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk index f66742423..f32501b28 100644 --- a/package/avahi/avahi.mk +++ b/package/avahi/avahi.mk @@ -159,7 +159,7 @@ $(TARGET_DIR)/usr/sbin/avahi-autoipd: $(STAGING_DIR)/usr/sbin/avahi-autoipd cp -af $(BASE_DIR)/package/avahi/busybox-udhcpc-default.script $(TARGET_DIR)/usr/share/udhcpc/default.script cp -af $(BASE_DIR)/package/avahi/S05avahi-setup.sh $(TARGET_DIR)/etc/init.d/ chmod 0755 $(TARGET_DIR)/usr/share/udhcpc/default.script - $(STRIP) --strip-unneeded $@ + $(STRIP) $(STRIP_STRIP_UNNEEDED) $@ $(STAGING_DIR)/usr/lib/libavahi-common.so: $(AVAHI_DIR)/.compiled $(MAKE) DESTDIR=$(STAGING_DIR) -C $(AVAHI_DIR)/avahi-common install @@ -178,8 +178,8 @@ $(TARGET_DIR)/usr/sbin/avahi-daemon: $(STAGING_DIR)/usr/sbin/avahi-daemon cp -dpf $(STAGING_DIR)/lib/libavahi-*.so* $(TARGET_DIR)/usr/lib/ mkdir -p $(TARGET_DIR)/etc/avahi/services cp -af $(BASE_DIR)/package/avahi/S50avahi-daemon $(TARGET_DIR)/etc/init.d/ - $(STRIP) --strip-unneeded $@ - $(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libavahi-*.so* + $(STRIP) $(STRIP_STRIP_UNNEEDED) $@ + $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libavahi-*.so* avahi: uclibc busybox libdaemon $(AVAHI_TARGETS) diff --git a/package/berkeleydb/berkeleydb.mk b/package/berkeleydb/berkeleydb.mk index 2726b785d..953125775 100644 --- a/package/berkeleydb/berkeleydb.mk +++ b/package/berkeleydb/berkeleydb.mk @@ -67,7 +67,7 @@ $(TARGET_DIR)/lib/$(DB_SHARLIB): $(STAGING_DIR)/lib/$(DB_SHARLIB) 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/$(DB_SHARLIB) libdb.so) - -$(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libdb*so* + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libdb*so* $(TARGET_DIR)/usr/lib/libdb.a: $(STAGING_DIR)/lib/libdb-$(DB_SO_VERSION).a cp -dpf $(STAGING_DIR)/usr/include/db.h $(TARGET_DIR)/usr/include/ diff --git a/package/boa/boa.mk b/package/boa/boa.mk index c27b14584..4bc4a344e 100644 --- a/package/boa/boa.mk +++ b/package/boa/boa.mk @@ -60,7 +60,7 @@ $(BOA_WORKDIR)/.installed: $(BOA_WORKDIR)/src/boa $(BOA_WORKDIR)/src/boa_indexer mkdir -p $(TARGET_DIR)/etc/boa cp -f package/boa/boa.conf $(TARGET_DIR)/etc/boa cp -f package/boa/mime.types $(TARGET_DIR)/etc/mime.types - $(STRIP) --strip-all $(TARGET_DIR)/usr/sbin/boa $(TARGET_DIR)/usr/lib/boa/boa_indexer + $(STRIP) $(STRIP_STRIP_ALL) $(TARGET_DIR)/usr/sbin/boa $(TARGET_DIR)/usr/lib/boa/boa_indexer touch $(BOA_WORKDIR)/.installed boa: uclibc $(BOA_WORKDIR)/.installed diff --git a/package/bzip2/bzip2.mk b/package/bzip2/bzip2.mk index d213365ea..e89b1e83a 100644 --- a/package/bzip2/bzip2.mk +++ b/package/bzip2/bzip2.mk @@ -75,7 +75,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) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libbz2.so.1.0 touch -c $@ bzip2-headers: $(TARGET_DIR)/usr/lib/libbz2.a diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk index 0d3063874..d3b834a46 100644 --- a/package/cairo/cairo.mk +++ b/package/cairo/cairo.mk @@ -125,7 +125,7 @@ $(STAGING_DIR)/lib/$(CAIRO_BINARY): $(CAIRO_DIR)/src/.libs/$(CAIRO_BINARY) $(TARGET_DIR)/lib/libcairo.so.2.9.3: $(STAGING_DIR)/lib/$(CAIRO_BINARY) cp -a $(STAGING_DIR)/lib/libcairo.so $(TARGET_DIR)/lib/ cp -a $(STAGING_DIR)/lib/libcairo.so.2* $(TARGET_DIR)/lib/ - $(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libcairo.so.2.* + $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libcairo.so.2.* touch -c $(TARGET_DIR)/lib/libcairo.so.2.9.3 cairo: uclibc gettext libintl pkgconfig libglib2 $(XSERVER) $(TARGET_DIR)/lib/libcairo.so.2.9.3 diff --git a/package/curl/curl.mk b/package/curl/curl.mk index 2de35fdd3..a4020e1b9 100644 --- a/package/curl/curl.mk +++ b/package/curl/curl.mk @@ -48,11 +48,11 @@ $(TARGET_DIR)/usr/lib/libcurl.so.3.0.0: $(STAGING_DIR)/bin/$(CURL_BINARY) -mkdir $(TARGET_DIR)/usr/lib -mkdir $(TARGET_DIR)/usr/bin cp -a $(STAGING_DIR)/lib/libcurl.so* $(TARGET_DIR)/usr/lib - $(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libcurl.so.3.0.0 + $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libcurl.so.3.0.0 $(TARGET_DIR)/usr/bin/$(CURL_BINARY): $(TARGET_DIR)/usr/lib/libcurl.so.3.0.0 cp -a $(STAGING_DIR)/bin/$(CURL_BINARY) $(TARGET_DIR)/usr/bin - $(STRIP) --strip-unneeded $(TARGET_DIR)/usr/bin/$(CURL_BINARY) + $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/$(CURL_BINARY) curl: uclibc $(TARGET_DIR)/usr/bin/$(CURL_BINARY) diff --git a/package/cvs/cvs.mk b/package/cvs/cvs.mk index 7e2ecb8df..8e65259b7 100644 --- a/package/cvs/cvs.mk +++ b/package/cvs/cvs.mk @@ -72,7 +72,7 @@ $(CVS_DIR)/$(CVS_BINARY): $(CVS_DIR)/.configured $(TARGET_DIR)/$(CVS_TARGET_BINARY): $(CVS_DIR)/$(CVS_BINARY) install -D $(CVS_DIR)/$(CVS_BINARY) $(TARGET_DIR)/$(CVS_TARGET_BINARY) - $(STRIP) -s $(TARGET_DIR)/$(CVS_TARGET_BINARY) + $(STRIP) $(STRIP_STRIP_ALL) $(TARGET_DIR)/$(CVS_TARGET_BINARY) cvs: uclibc ncurses $(TARGET_DIR)/$(CVS_TARGET_BINARY) diff --git a/package/dbus-glib/dbus-glib.mk b/package/dbus-glib/dbus-glib.mk index d82a3ad79..196691e91 100644 --- a/package/dbus-glib/dbus-glib.mk +++ b/package/dbus-glib/dbus-glib.mk @@ -58,7 +58,7 @@ $(STAGING_DIR)/usr/lib/libdbus-glib-1.so.2.0.0: $(DBUS_GLIB_DIR)/$(DBUS_GLIB_BIN $(TARGET_DIR)/$(DBUS_GLIB_TARGET_BINARY): $(STAGING_DIR)/usr/lib/libdbus-glib-1.so.2.0.0 cp -a $(DBUS_GLIB_DIR)/dbus/.libs/libdbus-glib-1.so.2* $(TARGET_DIR)/usr/lib cp -a $(DBUS_GLIB_DIR)/dbus/.libs/dbus-binding-tool $(TARGET_DIR)/usr/bin - -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libdbus-glib-1.so.2.0.0 + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libdbus-glib-1.so.2.0.0 dbus-glib: uclibc dbus libglib2 $(TARGET_DIR)/$(DBUS_GLIB_TARGET_BINARY) diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index ad961b0b0..ce11c5355 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -62,7 +62,7 @@ $(TARGET_DIR)/$(DBUS_TARGET_BINARY): $(STAGING_DIR)/usr/lib/libdbus-1.so rm -rf $(TARGET_DIR)/usr/lib/dbus-1.0 rm -f $(TARGET_DIR)/usr/lib/libdbus-1.la \ $(TARGET_DIR)/usr/lib/libdbus-1.so - -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libdbus-1.so.3.2.0 + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libdbus-1.so.3.2.0 $(MAKE) DESTDIR=$(TARGET_DIR) initddir=/etc/init.d -C $(DBUS_DIR)/bus install $(INSTALL) -m 0755 -D package/dbus/S97messagebus $(TARGET_DIR)/etc/init.d rm -f $(TARGET_DIR)/etc/init.d/messagebus diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk index 3fe106171..0de264493 100644 --- a/package/directfb/directfb.mk +++ b/package/directfb/directfb.mk @@ -92,7 +92,7 @@ $(STAGING_DIR)/usr/lib/libdirectfb.so: $(DIRECTFB_DIR)/.compiled $(TARGET_DIR)/usr/lib/libdirectfb.so: $(STAGING_DIR)/usr/lib/libdirectfb.so cp -dpf $(STAGING_DIR)/usr/lib/libdirect* $(STAGING_DIR)/usr/lib/libfusion* $(TARGET_DIR)/usr/lib/ cp -rdpf $(STAGING_DIR)/usr/lib/directfb-* $(TARGET_DIR)/usr/lib/ - -$(STRIP) --strip-unneeded \ + -$(STRIP) $(STRIP_STRIP_UNNEEDED) \ $(TARGET_DIR)/usr/lib/libdirectfb.so \ $(TARGET_DIR)/usr/lib/libdirect.so \ $(TARGET_DIR)/usr/lib/libfusion.so diff --git a/package/dmalloc/dmalloc.mk b/package/dmalloc/dmalloc.mk index e93bf7679..471179705 100644 --- a/package/dmalloc/dmalloc.mk +++ b/package/dmalloc/dmalloc.mk @@ -80,7 +80,7 @@ $(TARGET_DIR)/$(DMALLOC_TARGET_BINARY): $(DMALLOC_DIR)/$(DMALLOC_BINARY) (cd $(STAGING_DIR)/usr/lib; \ mv libdmalloc*.so $(TARGET_DIR)/usr/lib); cp -dpf $(STAGING_DIR)/usr/bin/dmalloc $(TARGET_DIR)/$(DMALLOC_TARGET_BINARY) - $(STRIP) -s $(TARGET_DIR)/$(DMALLOC_TARGET_BINARY) + $(STRIP) $(STRIP_STRIP_ALL) $(TARGET_DIR)/$(DMALLOC_TARGET_BINARY) dmalloc: uclibc $(TARGET_DIR)/$(DMALLOC_TARGET_BINARY) diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk index 9b87a0287..6c3f4aa85 100644 --- a/package/dropbear/dropbear.mk +++ b/package/dropbear/dropbear.mk @@ -50,7 +50,7 @@ $(TARGET_DIR)/$(DROPBEAR_TARGET_BINARY): $(DROPBEAR_DIR)/$(DROPBEAR_BINARY) $(INSTALL) -d -m 755 $(TARGET_DIR)/usr/bin $(INSTALL) -m 755 $(DROPBEAR_DIR)/$(DROPBEAR_BINARY) \ $(TARGET_DIR)/$(DROPBEAR_TARGET_BINARY) - $(STRIP) --strip-unneeded $(TARGET_DIR)/$(DROPBEAR_TARGET_BINARY) + $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(DROPBEAR_TARGET_BINARY) ln -snf ../sbin/dropbear $(TARGET_DIR)/usr/bin/scp ln -snf ../sbin/dropbear $(TARGET_DIR)/usr/bin/ssh ln -snf ../sbin/dropbear $(TARGET_DIR)/usr/bin/dbclient diff --git a/package/expat/expat.mk b/package/expat/expat.mk index fb1b00826..46a590fc4 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -61,7 +61,7 @@ $(STAGING_DIR)/$(EXPAT_TARGET_BINARY): $(EXPAT_DIR)/$(EXPAT_BINARY) $(TARGET_DIR)/$(EXPAT_TARGET_BINARY): $(STAGING_DIR)/$(EXPAT_TARGET_BINARY) cp -dpf $(STAGING_DIR)/usr/lib/libexpat.so* $(TARGET_DIR)/usr/lib/ #cp -dpf $(STAGING_DIR)/usr/bin/xmlwf $(TARGET_DIR)/usr/bin/xmlwf - -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libexpat.so* + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libexpat.so* touch -c $@ expat: uclibc pkgconfig $(TARGET_DIR)/$(EXPAT_TARGET_BINARY) diff --git a/package/fbset/fbset.mk b/package/fbset/fbset.mk index 2f2e4bdd3..fd717d014 100644 --- a/package/fbset/fbset.mk +++ b/package/fbset/fbset.mk @@ -28,10 +28,10 @@ $(FBSET_DIR)/$(FBSET_BINARY): $(FBSET_DIR)/.unpacked $(TARGET_DIR)/$(FBSET_TARGET_BINARY): $(FBSET_DIR)/$(FBSET_BINARY) $(INSTALL) -m 755 $(FBSET_DIR)/$(FBSET_BINARY) $(TARGET_DIR)/$(FBSET_TARGET_BINARY) - -$(STRIP) --strip-unneeded $(TARGET_DIR)/$(FBSET_TARGET_BINARY) + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(FBSET_TARGET_BINARY) touch -c $@ -fbset: linux26 uclibc $(TARGET_DIR)/$(FBSET_TARGET_BINARY) +fbset: uclibc $(TARGET_DIR)/$(FBSET_TARGET_BINARY) fbset-clean: rm -f $(TARGET_DIR)/$(FBSET_TARGET_BINARY) diff --git a/package/fontconfig/fontconfig.mk b/package/fontconfig/fontconfig.mk index ab1c822d5..e9b9f0d42 100644 --- a/package/fontconfig/fontconfig.mk +++ b/package/fontconfig/fontconfig.mk @@ -73,13 +73,13 @@ $(TARGET_DIR)/usr/lib/libfontconfig.so: $(STAGING_DIR)/usr/lib/libfontconfig.so cp -dpf $(STAGING_DIR)/usr/lib/libfontconfig.so* $(TARGET_DIR)/usr/lib/ mkdir -p $(TARGET_DIR)/etc/fonts cp $(STAGING_DIR)/etc/fonts/fonts.conf $(TARGET_DIR)/etc/fonts/ - -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libfontconfig.so + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libfontconfig.so mkdir -p $(TARGET_DIR)/var/cache/fontconfig mkdir -p $(TARGET_DIR)/usr/bin cp -a $(STAGING_DIR)/usr/bin/fc-cache $(TARGET_DIR)/usr/bin/ - -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/bin/fc-cache + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/fc-cache cp -a $(STAGING_DIR)/usr/bin/fc-list $(TARGET_DIR)/usr/bin/ - -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/bin/fc-list + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/fc-list touch -c $@ fontconfig: uclibc freetype host-freetype expat $(TARGET_DIR)/usr/lib/libfontconfig.so diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk index 427ba9169..1bf66918d 100644 --- a/package/freetype/freetype.mk +++ b/package/freetype/freetype.mk @@ -65,7 +65,7 @@ $(STAGING_DIR)/lib/libfreetype.so: $(FREETYPE_DIR)/.compiled $(TARGET_DIR)/lib/libfreetype.so: $(STAGING_DIR)/lib/libfreetype.so cp -dpf $(STAGING_DIR)/lib/libfreetype.so* $(TARGET_DIR)/lib/ - -$(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libfreetype.so + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libfreetype.so # freetype for the host, needed for build-tools of fontconfig diff --git a/package/gmp/gmp.mk b/package/gmp/gmp.mk index c1f155522..1f69b27a9 100644 --- a/package/gmp/gmp.mk +++ b/package/gmp/gmp.mk @@ -52,7 +52,7 @@ $(GMP_TARGET_DIR)/.libs/$(GMP_BINARY): $(GMP_TARGET_DIR)/.configured $(STAGING_DIR)/usr/lib/$(GMP_BINARY): $(GMP_TARGET_DIR)/.libs/$(GMP_BINARY) $(MAKE) DESTDIR=$(STAGING_DIR) -C $(GMP_TARGET_DIR) install - $(STRIP) --strip-unneeded $(STAGING_DIR)/usr/lib/libgmp$(LIBTGTEXT)* + $(STRIP) $(STRIP_STRIP_UNNEEDED) $(STAGING_DIR)/usr/lib/libgmp$(LIBTGTEXT)* $(TARGET_DIR)/usr/lib/libgmp.so $(TARGET_DIR)/usr/lib/libgmp.so.$(GMP_LIBVERSION) $(TARGET_DIR)/usr/lib/libgmp.a: $(STAGING_DIR)/usr/lib/$(GMP_BINARY) cp -dpf $(STAGING_DIR)/usr/lib/libgmp$(LIBTGTEXT)* $(TARGET_DIR)/usr/lib/ diff --git a/package/hal/hal.mk b/package/hal/hal.mk index 3d4ded713..fa2307657 100644 --- a/package/hal/hal.mk +++ b/package/hal/hal.mk @@ -86,7 +86,7 @@ $(TARGET_DIR)/$(HAL_TARGET_BINARY): $(HAL_DIR)/hald/hald hald-probe-hiddev hald-addon-hid-ups; do \ rm -f $(TARGET_DIR)/usr/libexec/$$file; \ done - -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libhal* + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libhal* hal: uclibc dbus-glib hwdata udev-volume_id $(TARGET_DIR)/$(HAL_TARGET_BINARY) diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index 13014552a..dfccaaa82 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -69,11 +69,11 @@ $(STAGING_DIR)/usr/lib/libMagick.a: $(IMAGEMAGICK_DIR)/.compiled $(IMAGEMAGICK_LIB): $(STAGING_DIR)/usr/lib/libMagick.a $(IMAGEMAGICK_COPY) $(STAGING_DIR)/usr/lib/libWand.so* $(TARGET_DIR)/usr/lib/ - -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libWand.so* + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libWand.so* mkdir -p $(TARGET_DIR)/usr/lib/ImageMagick-$(IMAGEMAGICK_VERSION) $(IMAGEMAGICK_COPY) -r $(STAGING_DIR)/usr/lib/ImageMagick-$(IMAGEMAGICK_VERSION) $(TARGET_DIR)/usr/lib $(IMAGEMAGICK_COPY) $(STAGING_DIR)/usr/lib/libMagick.so* $(TARGET_DIR)/usr/lib/ - -$(STRIP) --strip-unneeded $(IMAGEMAGICK_LIB)* + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(IMAGEMAGICK_LIB)* touch -c $@ $(IMAGEMAGICK_DIR)/.libinstall: $(IMAGEMAGICK_LIB) @@ -84,47 +84,47 @@ $(IMAGEMAGICK_DIR)/.libinstall: $(IMAGEMAGICK_LIB) $(TARGET_DIR)/usr/bin/animate: $(IMAGEMAGICK_LIB) ls -l $(IMAGEMAGICK_LIB) >> datefile $(IMAGEMAGICK_COPY) $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-animate $(TARGET_DIR)/usr/bin/animate - -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/bin/animate + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/animate touch $@ $(TARGET_DIR)/usr/bin/compare: $(IMAGEMAGICK_LIB) $(IMAGEMAGICK_COPY) $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-compare $(TARGET_DIR)/usr/bin/compare - -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/bin/compare + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/compare touch $@ $(TARGET_DIR)/usr/bin/composite: $(IMAGEMAGICK_LIB) $(IMAGEMAGICK_COPY) $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-composite $(TARGET_DIR)/usr/bin/composite - -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/bin/composite + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/composite touch $@ $(TARGET_DIR)/usr/bin/conjure: $(IMAGEMAGICK_LIB) $(IMAGEMAGICK_COPY) $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-conjure $(TARGET_DIR)/usr/bin/conjure - -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/bin/conjure + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/conjure touch $@ $(TARGET_DIR)/usr/bin/display: $(IMAGEMAGICK_LIB) $(IMAGEMAGICK_COPY) $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-display $(TARGET_DIR)/usr/bin/display - -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/bin/display + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/display touch $@ $(TARGET_DIR)/usr/bin/import: $(IMAGEMAGICK_LIB) $(IMAGEMAGICK_COPY) $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-import $(TARGET_DIR)/usr/bin/import - -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/bin/import + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/import touch $@ $(TARGET_DIR)/usr/bin/mogrify: $(IMAGEMAGICK_LIB) $(IMAGEMAGICK_COPY) $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-mogrify $(TARGET_DIR)/usr/bin/mogrify - -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/bin/mogrify + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/mogrify touch $@ $(TARGET_DIR)/usr/bin/montage: $(IMAGEMAGICK_LIB) $(IMAGEMAGICK_COPY) $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-montage $(TARGET_DIR)/usr/bin/montage - -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/bin/montage + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/montage touch $@ $(TARGET_DIR)/usr/bin/convert: $(IMAGEMAGICK_LIB) $(IMAGEMAGICK_COPY) $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-convert $(TARGET_DIR)/usr/bin/convert - -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/bin/convert + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/convert touch $@ imagemagick: uclibc jpeg tiff $(IMAGEMAGICK_LIB) \ diff --git a/package/iperf/iperf.mk b/package/iperf/iperf.mk index f5aeeb367..3571141b7 100644 --- a/package/iperf/iperf.mk +++ b/package/iperf/iperf.mk @@ -48,7 +48,7 @@ $(IPERF_DIR)/.configured: $(IPERF_DIR)/.unpacked $(IPERF_DIR)/src/iperf: $(IPERF_DIR)/.configured $(MAKE) CC=$(TARGET_CC) -C $(IPERF_DIR) - -$(STRIP) --strip-unneeded $(IPERF_DIR)/src/iperf + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(IPERF_DIR)/src/iperf $(TARGET_DIR)/usr/bin/iperf: $(IPERF_DIR)/src/iperf cp $(IPERF_DIR)/src/iperf $(TARGET_DIR)/usr/bin/iperf diff --git a/package/ipsec-tools/ipsec-tools.mk b/package/ipsec-tools/ipsec-tools.mk index 28d40006f..d3d2e6194 100644 --- a/package/ipsec-tools/ipsec-tools.mk +++ b/package/ipsec-tools/ipsec-tools.mk @@ -106,8 +106,8 @@ $(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_RACOONCTL): \ $(IPSEC_TOOLS_DIR)/$(IPSEC_TOOLS_BINARY_RACOON) \ $(IPSEC_TOOLS_DIR)/$(IPSEC_TOOLS_BINARY_RACOONCTL) $(MAKE) -C $(IPSEC_TOOLS_DIR) DESTDIR=$(TARGET_DIR) install - $(STRIP) --strip-unneeded --remove-section=.comment \ - --remove-section=.note \ + $(STRIP) $(STRIP_STRIP_UNNEEDED) $(REMOVE_SECTION_COMMENT) \ + $(REMOVE_SECTION_NOTE) \ $(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_SETKEY) \ $(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_RACOON) \ $(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_RACOONCTL) diff --git a/package/jpeg/jpeg.mk b/package/jpeg/jpeg.mk index 02a180010..29c504936 100644 --- a/package/jpeg/jpeg.mk +++ b/package/jpeg/jpeg.mk @@ -74,7 +74,7 @@ $(STAGING_DIR)/lib/libjpeg.a: $(JPEG_DIR)/.libs/libjpeg.a $(TARGET_DIR)/usr/lib/libjpeg.so: $(STAGING_DIR)/lib/libjpeg.a cp -dpf $(STAGING_DIR)/lib/libjpeg.so* $(TARGET_DIR)/usr/lib/ - -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libjpeg.so* + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libjpeg.so* touch -c $(TARGET_DIR)/usr/lib/libjpeg.so jpeg: uclibc $(TARGET_DIR)/usr/lib/libjpeg.so diff --git a/package/kexec/kexec.mk b/package/kexec/kexec.mk index a7c218b2d..00f59f1fd 100644 --- a/package/kexec/kexec.mk +++ b/package/kexec/kexec.mk @@ -62,7 +62,7 @@ $(TARGET_DIR)/$(KEXEC_TARGET_BINARY): $(KEXEC_DIR)/objdir-$(GNU_TARGET_NAME)/bui cp -dpf $(KEXEC_DIR)/objdir-$(GNU_TARGET_NAME)/build/sbin/$(KEXEC_BINARY) \ $(KEXEC_DIR)/objdir-$(GNU_TARGET_NAME)/build/sbin/kdump \ $(TARGET_DIR)/sbin/ - $(STRIP) -s $(TARGET_DIR)/sbin/k{exec,dump} + $(STRIP) $(STRIP_STRIP_ALL) $(TARGET_DIR)/sbin/k{exec,dump} kexec: uclibc $(TARGET_DIR)/$(KEXEC_TARGET_BINARY) diff --git a/package/libaio/libaio.mk b/package/libaio/libaio.mk index 49bdd8643..ffdc5fb39 100644 --- a/package/libaio/libaio.mk +++ b/package/libaio/libaio.mk @@ -28,7 +28,7 @@ $(STAGING_DIR)/usr/lib/libaio.so: $(LIBAIO_DIR)/src/libaio.so.$(LIBAIO_SOVER) $(TARGET_DIR)/usr/lib/libaio.so: $(STAGING_DIR)/usr/lib/libaio.so cp -dpf $(STAGING_DIR)/usr/lib/libaio.so* $(TARGET_DIR)/usr/lib/ - -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libaio.so + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libaio.so libaio: uclibc $(TARGET_DIR)/usr/lib/libaio.so diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk index 5425bd3d6..fc2e066ef 100644 --- a/package/libdrm/libdrm.mk +++ b/package/libdrm/libdrm.mk @@ -58,7 +58,7 @@ $(STAGING_DIR)/lib/libdrm.so: $(LIBDRM_DIR)/.compiled $(TARGET_DIR)/lib/libdrm.so: $(STAGING_DIR)/lib/libdrm.so cp -dpf $(STAGING_DIR)/lib/libdrm.so* $(TARGET_DIR)/lib/ - -$(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libdrm.so + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libdrm.so libdrm: uclibc pkgconfig $(TARGET_DIR)/lib/libdrm.so diff --git a/package/libglib12/libglib12.mk b/package/libglib12/libglib12.mk index c5dd62bf1..82eb6f235 100644 --- a/package/libglib12/libglib12.mk +++ b/package/libglib12/libglib12.mk @@ -73,8 +73,8 @@ $(TARGET_DIR)/lib/libglib-1.2.so.0.0.10: $(STAGING_DIR)/lib/$(LIBGLIB12_BINARY) cp -dpf $(STAGING_DIR)/lib/libgmodule.so $(TARGET_DIR)/lib/ cp -dpf $(STAGING_DIR)/lib/libgmodule-1.2.so.0 $(TARGET_DIR)/lib/ cp -dpf $(STAGING_DIR)/lib/libgmodule-1.2.so.0.0.10 $(TARGET_DIR)/lib/ - $(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libglib-1.2.so.0.0.10 - $(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libgmodule-1.2.so.0.0.10 + $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libglib-1.2.so.0.0.10 + $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libgmodule-1.2.so.0.0.10 libglib12: uclibc $(TARGET_DIR)/lib/libglib-1.2.so.0.0.10 diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index 01e647d25..787953a90 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -125,10 +125,10 @@ $(TARGET_DIR)/lib/libglib-2.0.so.0.1200.6: $(STAGING_DIR)/lib/$(LIBGLIB2_BINARY) cp -a $(STAGING_DIR)/lib/libgobject-2.0.so.0* $(TARGET_DIR)/lib/ cp -a $(STAGING_DIR)/lib/libgthread-2.0.so $(TARGET_DIR)/lib/ cp -a $(STAGING_DIR)/lib/libgthread-2.0.so.0* $(TARGET_DIR)/lib/ - $(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libglib-2.0.so.0.* - $(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libgmodule-2.0.so.0.* - $(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libgobject-2.0.so.0.* - $(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libgthread-2.0.so.0.* + $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libglib-2.0.so.0.* + $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libgmodule-2.0.so.0.* + $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libgobject-2.0.so.0.* + $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libgthread-2.0.so.0.* touch -c $(TARGET_DIR)/lib/libglib-2.0.so.0.1200.6 libglib2: uclibc gettext libintl pkgconfig $(TARGET_DIR)/lib/libglib-2.0.so.0.1200.6 diff --git a/package/libgtk12/libgtk12.mk b/package/libgtk12/libgtk12.mk index a52ee01a1..1a04aa826 100644 --- a/package/libgtk12/libgtk12.mk +++ b/package/libgtk12/libgtk12.mk @@ -82,8 +82,8 @@ $(TARGET_DIR)/lib/libgtk-1.2.so.0.9.1: $(STAGING_DIR)/lib/$(LIBGTK12_BINARY) cp -a $(STAGING_DIR)/lib/libgdk.so $(TARGET_DIR)/lib/ cp -a $(STAGING_DIR)/lib/libgdk-1.2.so.0 $(TARGET_DIR)/lib/ cp -a $(STAGING_DIR)/lib/libgdk-1.2.so.0.9.1 $(TARGET_DIR)/lib/ - $(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libgtk-1.2.so.0.9.1 - $(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libgdk-1.2.so.0.9.1 + $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libgtk-1.2.so.0.9.1 + $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libgdk-1.2.so.0.9.1 touch -c $(TARGET_DIR)/lib/libgtk-1.2.so.0.9.1 libgtk12: uclibc libglib12 $(XSERVER) $(TARGET_DIR)/lib/libgtk-1.2.so.0.9.1 diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk index 937966282..284ae6c05 100644 --- a/package/libgtk2/libgtk2.mk +++ b/package/libgtk2/libgtk2.mk @@ -132,8 +132,8 @@ $(TARGET_DIR)/lib/libgtk-x11-2.0.so.0: $(STAGING_DIR)/lib/$(LIBGTK2_BINARY) cp -a $(STAGING_DIR)/lib/libgtk-x11-2.0.so.0* $(TARGET_DIR)/lib/ cp -a $(STAGING_DIR)/lib/libgdk*-2.0.so $(TARGET_DIR)/lib/ cp -a $(STAGING_DIR)/lib/libgdk*-2.0.so.0* $(TARGET_DIR)/lib/ - $(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libgtk-x11-2.0.so.0* - $(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libgdk*-2.0.so.0* + $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libgtk-x11-2.0.so.0* + $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libgdk*-2.0.so.0* mkdir -p $(TARGET_DIR)/lib/gtk-2.0/2.10.0/engines cp -a $(STAGING_DIR)/lib/gtk-2.0/2.10.0/engines/*.so \ $(TARGET_DIR)/lib/gtk-2.0/2.10.0/engines/ diff --git a/package/libid3tag/libid3tag.mk b/package/libid3tag/libid3tag.mk index 419c438a5..24164fdc9 100644 --- a/package/libid3tag/libid3tag.mk +++ b/package/libid3tag/libid3tag.mk @@ -45,7 +45,7 @@ $(STAGING_DIR)/$(LIBID3TAG_TARGET_BIN): $(LIBID3TAG_DIR)/src/.libs/$(LIBID3TAG_B $(TARGET_DIR)/$(LIBID3TAG_TARGET_BIN): $(STAGING_DIR)/$(LIBID3TAG_TARGET_BIN) cp -dpf $(STAGING_DIR)/usr/lib/libid3tag.so* $(TARGET_DIR)/usr/lib/ - -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libid3tag.so* + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libid3tag.so* libid3tag: uclibc libmad $(TARGET_DIR)/$(LIBID3TAG_TARGET_BIN) diff --git a/package/liblockfile/liblockfile.mk b/package/liblockfile/liblockfile.mk index 490927cff..a6e562a26 100644 --- a/package/liblockfile/liblockfile.mk +++ b/package/liblockfile/liblockfile.mk @@ -41,7 +41,7 @@ $(STAGING_DIR)/lib/$(LIBLOCKFILE_BINARY): $(LIBLOCKFILE_DIR)/.configured $(TARGET_DIR)/usr/lib/$(LIBLOCKFILE_BINARY): $(STAGING_DIR)/lib/$(LIBLOCKFILE_BINARY) -mkdir -p $(TARGET_DIR)/usr/lib cp -a $(STAGING_DIR)/lib/liblockfile.so* $(TARGET_DIR)/usr/lib - $(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/$(LIBLOCKFILE_BINARY) + $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/$(LIBLOCKFILE_BINARY) liblockfile: uclibc $(TARGET_DIR)/usr/lib/$(LIBLOCKFILE_BINARY) diff --git a/package/libmad/libmad.mk b/package/libmad/libmad.mk index 6da95cc0d..3a01ac243 100644 --- a/package/libmad/libmad.mk +++ b/package/libmad/libmad.mk @@ -44,7 +44,7 @@ $(STAGING_DIR)/usr/lib/libmad.so: $(LIBMAD_DIR)/libmad.la $(TARGET_DIR)/usr/lib/libmad.so: $(STAGING_DIR)/usr/lib/libmad.so cp -dpf $(STAGING_DIR)/usr/lib/libmad.so* $(TARGET_DIR)/usr/lib/ - $(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libmad* + $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libmad* $(TARGET_DIR)/usr/lib/libmad.a: $(STAGING_DIR)/usr/lib/libmad.so mkdir -p $(TARGET_DIR)/usr/include diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk index 2f4801b93..2d8283757 100644 --- a/package/libpng/libpng.mk +++ b/package/libpng/libpng.mk @@ -74,7 +74,7 @@ $(STAGING_DIR)/usr/lib/libpng.so: $(LIBPNG_DIR)/.compiled $(TARGET_DIR)/usr/lib/libpng.so: $(STAGING_DIR)/usr/lib/libpng.so cp -dpf $(STAGING_DIR)/usr/lib/libpng*.so* $(TARGET_DIR)/usr/lib/ - -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libpng* + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libpng* png libpng: uclibc zlib pkgconfig $(TARGET_DIR)/usr/lib/libpng.so diff --git a/package/libsysfs/libsysfs.mk b/package/libsysfs/libsysfs.mk index 9ff31a2c7..362732250 100644 --- a/package/libsysfs/libsysfs.mk +++ b/package/libsysfs/libsysfs.mk @@ -62,7 +62,7 @@ $(STAGING_DIR)/usr/lib/libsysfs.so: $(LIBSYSFS_DIR)/.compiled $(TARGET_DIR)/usr/lib/libsysfs.so: $(STAGING_DIR)/usr/lib/libsysfs.so cp -dpf $(STAGING_DIR)/usr/lib/libsysfs.so* $(TARGET_DIR)/usr/lib/ - -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libsysfs.so + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libsysfs.so libsysfs: uclibc $(TARGET_DIR)/usr/lib/libsysfs.so diff --git a/package/libungif/libungif.mk b/package/libungif/libungif.mk index 9c8b986ee..d365bcdca 100644 --- a/package/libungif/libungif.mk +++ b/package/libungif/libungif.mk @@ -49,7 +49,7 @@ $(STAGING_DIR)/usr/lib/libungif.a: $(LIBUNGIF_DIR)/lib/.libs/libungif.a $(TARGET_DIR)/$(LIBUNGIF_TARGET_BINARY): $(STAGING_DIR)/usr/lib/libungif.a cp -dpf $(STAGING_DIR)/$(LIBUNGIF_TARGET_BINARY)* $(TARGET_DIR)/usr/lib/ - -$(STRIP) --strip-unneeded $(TARGET_DIR)/$(LIBUNGIF_TARGET_BINARY)* + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(LIBUNGIF_TARGET_BINARY)* libungif: uclibc $(TARGET_DIR)/$(LIBUNGIF_TARGET_BINARY) diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk index 2b4a3f7d4..f8088f77e 100644 --- a/package/libxml2/libxml2.mk +++ b/package/libxml2/libxml2.mk @@ -58,7 +58,7 @@ $(STAGING_DIR)/usr/lib/libxml2.so: $(LIBXML2_DIR)/.configured $(TARGET_DIR)/usr/lib/libxml2.so: $(STAGING_DIR)/usr/lib/libxml2.so mkdir -p $(TARGET_DIR)/usr/include $(TARGET_DIR)/usr/lib cp -dpf $(STAGING_DIR)/usr/lib/libxml2.so* $(TARGET_DIR)/usr/lib/ - $(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libxml2.so* + $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libxml2.so* $(TARGET_DIR)/usr/lib/libxml2.a: $(STAGING_DIR)/usr/lib/libxml2.so cp -dpf $(STAGING_DIR)/usr/lib/libxml2.*a $(TARGET_DIR)/usr/lib/ diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index 42fe190e1..252d08b18 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -68,8 +68,8 @@ $(TARGET_DIR)/$(LIGHTTPD_TARGET_BINARY): $(LIGHTTPD_DIR)/$(LIGHTTPD_BINARY) $(MAKE) DESTDIR=$(TARGET_DIR) -C $(LIGHTTPD_DIR) install @rm -rf $(TARGET_DIR)/usr/share/man $(TARGET_DIR)/usr/man @rm -rf $(TARGET_DIR)/usr/lib/lighttpd/*.la - $(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/lighttpd/*.so - $(STRIP) --strip-unneeded $(TARGET_DIR)/$(LIGHTTPD_TARGET_BINARY) + $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/lighttpd/*.so + $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(LIGHTTPD_TARGET_BINARY) @if [ ! -f $(TARGET_DIR)/etc/lighttpd/lighttpd.conf ] ; then \ $(INSTALL) -m 0644 -D $(LIGHTTPD_DIR)/doc/lighttpd.conf $(TARGET_DIR)/etc/lighttpd/lighttpd.conf; \ fi; diff --git a/package/lockfile-progs/lockfile-progs.mk b/package/lockfile-progs/lockfile-progs.mk index ecf09b034..1fe073f6f 100644 --- a/package/lockfile-progs/lockfile-progs.mk +++ b/package/lockfile-progs/lockfile-progs.mk @@ -23,7 +23,7 @@ $(TARGET_DIR)/$(LOCKFILE_PROGS_BINARY): $(LOCKFILE_PROGS_DIR)/.unpacked $(MAKE) $(TARGET_CONFIGURE_OPTS) LDFLAGS="$(TARGET_LDFLAGS)" \ -C $(LOCKFILE_PROGS_DIR) cp -a $(LOCKFILE_PROGS_DIR)/bin/lockfile* $(TARGET_DIR)/usr/bin - $(STRIP) --strip-unneeded $(TARGET_DIR)/$(LOCKFILE_PROGS_BINARY) + $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(LOCKFILE_PROGS_BINARY) lockfile-progs: uclibc liblockfile $(TARGET_DIR)/$(LOCKFILE_PROGS_BINARY) diff --git a/package/lzma/lzma.mk b/package/lzma/lzma.mk index 31acdfc15..8d6d24ae5 100644 --- a/package/lzma/lzma.mk +++ b/package/lzma/lzma.mk @@ -99,7 +99,7 @@ $(LZMA_TARGET_DIR)/src/lzma/lzma: $(LZMA_TARGET_DIR)/.configured $(TARGET_DIR)/$(LZMA_TARGET_BINARY): $(LZMA_TARGET_DIR)/src/lzma/lzma cp -dpf $(LZMA_TARGET_DIR)/src/lzma/lzma $@ - -$(STRIP) --strip-unneeded $@ + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $@ touch -c $@ #lzma-headers: $(TARGET_DIR)/$(LZMA_TARGET_BINARY) diff --git a/package/madplay/madplay.mk b/package/madplay/madplay.mk index 5df0791ad..b7533ff10 100644 --- a/package/madplay/madplay.mk +++ b/package/madplay/madplay.mk @@ -50,7 +50,7 @@ $(MADPLAY_DIR)/$(MADPLAY_BIN): $(MADPLAY_DIR)/.configured $(TARGET_DIR)/$(MADPLAY_TARGET_BIN): $(MADPLAY_DIR)/$(MADPLAY_BIN) $(INSTALL) -D $(MADPLAY_DIR)/$(MADPLAY_BIN) $(TARGET_DIR)/$(MADPLAY_TARGET_BIN) - $(STRIP) --strip-unneeded $(TARGET_DIR)/$(MADPLAY_TARGET_BIN) + $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(MADPLAY_TARGET_BIN) madplay: uclibc $(MADPLAY_ALSA_DEP) libmad libid3tag $(TARGET_DIR)/$(MADPLAY_TARGET_BIN) diff --git a/package/matchbox/matchbox.mk b/package/matchbox/matchbox.mk index f3ca97def..36f6b41df 100644 --- a/package/matchbox/matchbox.mk +++ b/package/matchbox/matchbox.mk @@ -561,58 +561,58 @@ $(STAGING_DIR)/usr/bin/$(MATCHBOX_KB_BIN): $(MATCHBOX_KB_DIR)/.compiled $(TARGET_DIR)/usr/lib/libmb.so: $(STAGING_DIR)/usr/lib/libmb.so cp -dpf $(STAGING_DIR)/usr/lib/libmb.so* $(TARGET_DIR)/usr/lib/ - -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libmb.so + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libmb.so $(TARGET_DIR)/usr/lib/$(MATCHBOX_SNOTIFY_BIN): $(STAGING_DIR)/usr/lib/$(MATCHBOX_SNOTIFY_BIN) cp -dpf $(STAGING_DIR)/usr/lib/$(MATCHBOX_SNOTIFY_BIN)* $(TARGET_DIR)/usr/lib/ - -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/$(MATCHBOX_SNOTIFY_BIN) + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/$(MATCHBOX_SNOTIFY_BIN) $(TARGET_DIR)/usr/bin/$(MATCHBOX_WM_BIN): $(STAGING_DIR)/usr/bin/$(MATCHBOX_WM_BIN) cp -dpf $(STAGING_DIR)/usr/bin/$(MATCHBOX_WM_BIN) $(TARGET_DIR)/usr/bin/ - -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/bin/$(MATCHBOX_WM_BIN) + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/$(MATCHBOX_WM_BIN) cp -dpf $(STAGING_DIR)/usr/bin/matchbox-remote $(TARGET_DIR)/usr/bin/ - -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/bin/matchbox-remote + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/matchbox-remote cp -af $(STAGING_DIR)/etc/matchbox/ $(TARGET_DIR)/etc/ cp -af $(STAGING_DIR)/usr/share/matchbox $(TARGET_DIR)/usr/share/ $(TARGET_DIR)/usr/bin/$(MATCHBOX_SM_BIN): $(STAGING_DIR)/usr/bin/$(MATCHBOX_SM_BIN) cp -dpf $(STAGING_DIR)/usr/bin/$(MATCHBOX_SM_BIN) $(TARGET_DIR)/usr/bin/ - -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/bin/$(MATCHBOX_SM_BIN) + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/$(MATCHBOX_SM_BIN) mkdir -p $(TARGET_DIR)/usr/share/matchbox/pixmaps/ cp -af $(STAGING_DIR)/usr/share/matchbox/pixmaps/hourglass-*.png $(TARGET_DIR)/usr/share/matchbox/pixmaps/ $(TARGET_DIR)/usr/bin/matchbox-session: $(STAGING_DIR)/usr/bin/matchbox-session cp -dpf $(STAGING_DIR)/usr/bin/matchbox-session $(TARGET_DIR)/usr/bin/ - -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/bin/matchbox-session + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/matchbox-session cp -af $(STAGING_DIR)/etc/matchbox/ $(TARGET_DIR)/etc/ cp -af $(STAGING_DIR)/usr/share/matchbox $(TARGET_DIR)/usr/share/ $(TARGET_DIR)/usr/bin/$(MATCHBOX_PL_BIN): $(STAGING_DIR)/usr/bin/$(MATCHBOX_PL_BIN) cp -dpf $(STAGING_DIR)/usr/bin/$(MATCHBOX_PL_BIN) $(TARGET_DIR)/usr/bin/ - -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/bin/$(MATCHBOX_PL_BIN) + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/$(MATCHBOX_PL_BIN) cp -dpf $(STAGING_DIR)/usr/bin/mb-applet-* $(TARGET_DIR)/usr/bin/ - -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/bin/mb-applet-* + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/mb-applet-* cp -af $(STAGING_DIR)/usr/share/matchbox/* $(TARGET_DIR)/usr/share/matchbox/ $(TARGET_DIR)/usr/bin/$(MATCHBOX_DP_BIN): $(STAGING_DIR)/usr/bin/$(MATCHBOX_DP_BIN) cp -dpf $(STAGING_DIR)/usr/bin/$(MATCHBOX_DP_BIN) $(TARGET_DIR)/usr/bin/ - -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/bin/$(MATCHBOX_DP_BIN) + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/$(MATCHBOX_DP_BIN) cp -dpf $(STAGING_DIR)/usr/lib/dotdesktop.so $(TARGET_DIR)/usr/lib/ - -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/dotdesktop.so + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/dotdesktop.so cp -dpf $(STAGING_DIR)/usr/lib/simplefilebrowser.so $(TARGET_DIR)/usr/lib/ - -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/simplefilebrowser.so + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/simplefilebrowser.so cp -dpf $(STAGING_DIR)/usr/lib/tasks.so $(TARGET_DIR)/usr/lib/ - -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/tasks.so + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/tasks.so cp -af $(STAGING_DIR)/usr/share/matchbox/* $(TARGET_DIR)/usr/share/matchbox/ cp -f ./package/matchbox/mbdesktop_modules $(TARGET_DIR)/etc/matchbox/ $(TARGET_DIR)/usr/lib/$(MATCHBOX_FK_BIN).so: $(STAGING_DIR)/usr/lib/$(MATCHBOX_FK_BIN).so cp -dpf $(STAGING_DIR)/usr/lib/$(MATCHBOX_FK_BIN).so* $(TARGET_DIR)/usr/lib/ - -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/$(MATCHBOX_FK_BIN).so + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/$(MATCHBOX_FK_BIN).so $(TARGET_DIR)/usr/bin/$(MATCHBOX_KB_BIN): $(STAGING_DIR)/usr/bin/$(MATCHBOX_KB_BIN) cp -dpf $(STAGING_DIR)/usr/bin/$(MATCHBOX_KB_BIN) $(TARGET_DIR)/usr/bin/ - -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/bin/$(MATCHBOX_KB_BIN) + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/$(MATCHBOX_KB_BIN) mkdir -p $(TARGET_DIR)/usr/share/matchbox/pixmaps/ cp -dpf $(STAGING_DIR)/usr/share/matchbox/pixmaps/matchbox-keyboard.png $(TARGET_DIR)/usr/share/matchbox/pixmaps/ cp -af $(STAGING_DIR)/usr/share/matchbox/matchbox-keyboard $(TARGET_DIR)/usr/share/matchbox/ diff --git a/package/mdadm/mdadm.mk b/package/mdadm/mdadm.mk index 08df50e53..c8e7b995f 100644 --- a/package/mdadm/mdadm.mk +++ b/package/mdadm/mdadm.mk @@ -40,7 +40,7 @@ $(MDADM_DIR)/$(MDADM_BINARY): $(MDADM_DIR)/.unpacked $(TARGET_DIR)/$(MDADM_TARGET_BINARY): $(MDADM_DIR)/$(MDADM_BINARY) $(MAKE) DESTDIR=$(TARGET_DIR) -C $(MDADM_DIR) install rm -Rf $(TARGET_DIR)/usr/share/man - $(STRIP) -s $@ + $(STRIP) $(STRIP_STRIP_ALL) $@ mdadm: uclibc $(TARGET_DIR)/$(MDADM_TARGET_BINARY) diff --git a/package/metacity/metacity.mk b/package/metacity/metacity.mk index eb972d134..5907343cd 100644 --- a/package/metacity/metacity.mk +++ b/package/metacity/metacity.mk @@ -125,7 +125,7 @@ $(STAGING_DIR)/lib/*metacity*.so: $(METACITY_DIR)/.compiled $(TARGET_DIR)/lib/*metacity*.so: $(STAGING_DIR)/lib/*metacity*.so cp -dpf $(STAGING_DIR)/lib/*metacity*.so* $(TARGET_DIR)/lib/ - -$(STRIP) --strip-unneeded $(TARGET_DIR)/lib/*metacity*.so + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/*metacity*.so cp -dpf $(STAGING_DIR)/bin/*metacity* $(TARGET_DIR)/bin/ mkdir -p $(TARGET_DIR)/usr/share/metacity/icons cp -dpf $(STAGING_DIR)/usr/share/metacity/icons/* $(TARGET_DIR)/usr/share/metacity/icons/ diff --git a/package/microcom/microcom.mk b/package/microcom/microcom.mk index 80d54e596..201a26194 100644 --- a/package/microcom/microcom.mk +++ b/package/microcom/microcom.mk @@ -54,7 +54,7 @@ ifeq ($(BR2_PREFER_IMA),y) else $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(MICROCOM_DIR) endif - $(STRIP) -s $@ + $(STRIP) $(STRIP_STRIP_ALL) $@ $(TARGET_DIR)/usr/bin/microcom: $(MICROCOM_DIR)/microcom install -c $(MICROCOM_DIR)/microcom $(TARGET_DIR)/usr/bin/microcom diff --git a/package/mpfr/mpfr.mk b/package/mpfr/mpfr.mk index 0c5f07fee..f6659e13f 100644 --- a/package/mpfr/mpfr.mk +++ b/package/mpfr/mpfr.mk @@ -68,7 +68,7 @@ $(MPFR_TARGET_DIR)/.libs/$(MPFR_BINARY): $(MPFR_TARGET_DIR)/.configured $(STAGING_DIR)/usr/lib/$(MPFR_BINARY): $(MPFR_TARGET_DIR)/.libs/$(MPFR_BINARY) $(MAKE) DESTDIR=$(STAGING_DIR) -C $(MPFR_TARGET_DIR) install; - $(STRIP) --strip-unneeded $(STAGING_DIR)/usr/lib/libmpfr$(LIBTGTEXT)* + $(STRIP) $(STRIP_STRIP_UNNEEDED) $(STAGING_DIR)/usr/lib/libmpfr$(LIBTGTEXT)* $(TARGET_DIR)/usr/lib/libmpfr.so $(TARGET_DIR)/usr/lib/libmpfr.so.$(MPFR_LIBVERSION) $(TARGET_DIR)/usr/lib/libmpfr.a: $(STAGING_DIR)/usr/lib/$(MPFR_BINARY) cp -dpf $(STAGING_DIR)/usr/lib/libmpfr$(LIBTGTEXT)* $(TARGET_DIR)/usr/lib/ diff --git a/package/mpg123/mpg123.mk b/package/mpg123/mpg123.mk index 588a2fa80..22494573c 100644 --- a/package/mpg123/mpg123.mk +++ b/package/mpg123/mpg123.mk @@ -51,7 +51,7 @@ $(MPG123_DIR)/$(MPG123_BIN): $(MPG123_DIR)/.configured $(TARGET_DIR)/$(MPG123_TARGET_BIN): $(MPG123_DIR)/$(MPG123_BIN) $(INSTALL) -D $(MPG123_DIR)/src/$(MPG123_BIN) $(TARGET_DIR)/$(MPG123_TARGET_BIN) - $(STRIP) --strip-unneeded $(TARGET_DIR)/$(MPG123_TARGET_BIN) + $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(MPG123_TARGET_BIN) mpg123: uclibc $(MPG123_ALSA_DEP) $(TARGET_DIR)/$(MPG123_TARGET_BIN) diff --git a/package/mplayer/mplayer.mk b/package/mplayer/mplayer.mk index ee9dd0d04..1fe103db6 100644 --- a/package/mplayer/mplayer.mk +++ b/package/mplayer/mplayer.mk @@ -55,7 +55,7 @@ $(MPLAYER_DIR)/$(MPLAYER_BINARY): $(MPLAYER_DIR)/.configured $(TARGET_DIR)/$(MPLAYER_TARGET_BINARY): $(MPLAYER_DIR)/$(MPLAYER_BINARY) $(INSTALL) -m 0755 -D $(MPLAYER_DIR)/$(MPLAYER_BINARY) $(TARGET_DIR)/$(MPLAYER_TARGET_BINARY) - -$(STRIP) --strip-unneeded $(TARGET_DIR)/$(MPLAYER_TARGET_BINARY) + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(MPLAYER_TARGET_BINARY) touch -c $@ mplayer: uclibc libmad $(TARGET_DIR)/$(MPLAYER_TARGET_BINARY) diff --git a/package/ncftp/ncftp.mk b/package/ncftp/ncftp.mk index 62c55c95d..e8eaac1a2 100644 --- a/package/ncftp/ncftp.mk +++ b/package/ncftp/ncftp.mk @@ -41,7 +41,7 @@ $(NCFTP_DIR)/bin/%: $(NCFTP_DIR)/.configured $(TARGET_DIR)/usr/bin/ncftp $(TARGET_DIR)/usr/bin/ncftp%: $(addprefix $(NCFTP_DIR)/bin/, $(NCFTP_TARGET_BINS)) $(INSTALL) -m 0755 $(NCFTP_DIR)/bin/$(notdir $@) $(TARGET_DIR)/usr/bin - $(STRIP) -s $@ + $(STRIP) $(STRIP_STRIP_ALL) $@ ncftp: uclibc $(addprefix $(TARGET_DIR)/usr/bin/, $(NCFTP_TARGET_BINS)) diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk index c70066b76..b9fee9c82 100644 --- a/package/ncurses/ncurses.mk +++ b/package/ncurses/ncurses.mk @@ -118,7 +118,7 @@ $(TARGET_DIR)/lib/libncurses.so.$(NCURSES_VERSION): $(STAGING_DIR)/lib/libncurse cp -dpf $(STAGING_DIR)/usr/share/terminfo/a/ansi $(TARGET_DIR)/usr/share/terminfo/a mkdir -p $(TARGET_DIR)/usr/share/terminfo/l cp -dpf $(STAGING_DIR)/usr/share/terminfo/l/linux $(TARGET_DIR)/usr/share/terminfo/l - -$(STRIP) --strip-unneeded $@ + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $@ touch -c $@ $(TARGET_DIR)/usr/lib/libncurses.a: $(STAGING_DIR)/lib/libncurses.a @@ -137,7 +137,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.$(NCURSES_VERSION) libncurses.so) - -$(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libncurses.so.$(NCURSES_VERSION) + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libncurses.so.$(NCURSES_VERSION) touch -c $@ ncurses: $(TARGET_DIR)/lib/libncurses.so.$(NCURSES_VERSION) diff --git a/package/netcat/netcat.mk b/package/netcat/netcat.mk index cc172096a..8c2dc7a62 100644 --- a/package/netcat/netcat.mk +++ b/package/netcat/netcat.mk @@ -39,7 +39,7 @@ $(NETCAT_DIR)/$(NETCAT_BINARY): $(NETCAT_DIR)/.configured $(TARGET_DIR)/$(NETCAT_TARGET_BINARY): $(NETCAT_DIR)/$(NETCAT_BINARY) install -D $(NETCAT_DIR)/$(NETCAT_BINARY) $(TARGET_DIR)/$(NETCAT_TARGET_BINARY) - $(STRIP) -s $@ + $(STRIP) $(STRIP_STRIP_ALL) $@ netcat: uclibc $(TARGET_DIR)/$(NETCAT_TARGET_BINARY) diff --git a/package/newt/newt.mk b/package/newt/newt.mk index 588aacb28..96d02e012 100644 --- a/package/newt/newt.mk +++ b/package/newt/newt.mk @@ -60,7 +60,7 @@ $(STAGING_DIR)/usr/lib/libnewt.a: $(NEWT_DIR)/libnewt.so.$(NEWT_VERSION) $(TARGET_DIR)/usr/lib/libnewt.so.$(NEWT_VERSION): $(STAGING_DIR)/usr/lib/libnewt.a cp -a $(STAGING_DIR)/usr/lib/libnewt.so* $(TARGET_DIR)/usr/lib/; - -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libnewt.so* + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libnewt.so* touch -c $@ newt: uclibc slang $(TARGET_DIR)/usr/lib/libnewt.so.$(NEWT_VERSION) diff --git a/package/openntpd/openntpd.mk b/package/openntpd/openntpd.mk index 04e689388..ba853c8f1 100644 --- a/package/openntpd/openntpd.mk +++ b/package/openntpd/openntpd.mk @@ -54,7 +54,7 @@ $(TARGET_DIR)/$(OPENNTPD_TARGET_BINARY): $(OPENNTPD_DIR)/$(OPENNTPD_BINARY) $(MAKE) DESTDIR=$(TARGET_DIR) STRIP_OPT="" -C $(OPENNTPD_DIR) install -$(STRIP) $(TARGET_DIR)/$(OPENNTPD_TARGET_BINARY) cp -af $(OPENNTPD_DIR)/ntpd.conf $(TARGET_DIR)/etc/ntpd.conf - # Why in earth do we wipe the whole man directory here? + # Why on earth do we wipe the whole man directory here? #rm -Rf $(TARGET_DIR)/usr/man ntpd: uclibc $(TARGET_DIR)/$(OPENNTPD_TARGET_BINARY) diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index 912abfc7b..8996201c4 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -47,17 +47,17 @@ $(OPENSSH_DIR)/.configured: $(OPENSSH_DIR)/.unpacked $(OPENSSH_DIR)/ssh: $(OPENSSH_DIR)/.configured $(MAKE) $(TARGET_CONFIGURE_OPTS) -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) $(STRIP_STRIP_UNNEEDED) $(OPENSSH_DIR)/scp + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(OPENSSH_DIR)/sftp + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(OPENSSH_DIR)/sftp-server + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(OPENSSH_DIR)/ssh + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(OPENSSH_DIR)/ssh-add + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(OPENSSH_DIR)/ssh-agent + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(OPENSSH_DIR)/ssh-keygen + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(OPENSSH_DIR)/ssh-keyscan + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(OPENSSH_DIR)/ssh-keysign + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(OPENSSH_DIR)/ssh-rand-helper + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(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/package/openssl/openssl.mk b/package/openssl/openssl.mk index 64e36a0f2..3ca62be89 100644 --- a/package/openssl/openssl.mk +++ b/package/openssl/openssl.mk @@ -77,8 +77,8 @@ $(TARGET_DIR)/usr/lib/libcrypto.so.0.9.7: $(STAGING_DIR)/usr/lib/libcrypto.a cp -fa $(STAGING_DIR)/usr/lib/libcrypto.so* $(TARGET_DIR)/usr/lib/ cp -fa $(STAGING_DIR)/usr/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) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libssl.so.0.9.7 + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libcrypto.so.0.9.7 $(TARGET_DIR)/usr/lib/libssl.a: $(STAGING_DIR)/usr/lib/libcrypto.a mkdir -p $(TARGET_DIR)/usr/include diff --git a/package/pango/pango.mk b/package/pango/pango.mk index f65a6f71e..04c28e6fc 100644 --- a/package/pango/pango.mk +++ b/package/pango/pango.mk @@ -137,11 +137,11 @@ $(TARGET_DIR)/lib/libpango-1.0.so.0: $(STAGING_DIR)/lib/$(PANGO_BINARY) cp -a $(STAGING_DIR)/lib/libpangoxft-1.0.so.0* $(TARGET_DIR)/lib/ cp -a $(STAGING_DIR)/lib/libpangocairo-1.0.so $(TARGET_DIR)/lib/ cp -a $(STAGING_DIR)/lib/libpangocairo-1.0.so.0* $(TARGET_DIR)/lib/ - $(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libpango-1.0.so.0.* - $(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libpangox-1.0.so.0.* - $(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libpangoft2-1.0.so.0.* - $(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libpangoxft-1.0.so.0.* - $(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libpangocairo-1.0.so.0.* + $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libpango-1.0.so.0.* + $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libpangox-1.0.so.0.* + $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libpangoft2-1.0.so.0.* + $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libpangoxft-1.0.so.0.* + $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libpangocairo-1.0.so.0.* mkdir -p $(TARGET_DIR)/lib/pango/1.5.0/modules cp -a $(STAGING_DIR)/lib/pango/1.5.0/modules/*.so $(TARGET_DIR)/lib/pango/1.5.0/modules/ mkdir -p $(TARGET_DIR)/etc/pango diff --git a/package/php/php.mk b/package/php/php.mk index f9550d932..3a1573779 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -105,12 +105,12 @@ $(PHP_DIR)/.staged: $(PHP_DIR)/.built $(TARGET_DIR)/usr/bin/php: $(PHP_DIR)/.staged cp -dpf $(STAGING_DIR)/usr/bin/php $(TARGET_DIR)/usr/bin/php chmod 755 $(TARGET_DIR)/usr/bin/php - $(STRIP) --strip-unneeded $(TARGET_DIR)/usr/bin/php + $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/php $(TARGET_DIR)/usr/bin/php-cgi: $(PHP_DIR)/.staged cp -dpf $(STAGING_DIR)/usr/bin/php-cgi $(TARGET_DIR)/usr/bin/php-cgi chmod 755 $(TARGET_DIR)/usr/bin/php-cgi - $(STRIP) --strip-unneeded $(TARGET_DIR)/usr/bin/php-cgi + $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/php-cgi $(TARGET_DIR)/etc/php.ini: $(PHP_DIR)/.staged cp $(PHP_DIR)/php.ini-dist $(TARGET_DIR)/etc/php.ini diff --git a/package/qtopia4/qtopia4.mk b/package/qtopia4/qtopia4.mk index ea2499ee3..13f9876e3 100644 --- a/package/qtopia4/qtopia4.mk +++ b/package/qtopia4/qtopia4.mk @@ -193,7 +193,7 @@ $(TARGET_DIR)/usr/lib/libQtCore.so.$(QTOPIA4_VERSION): $(STAGING_DIR)/usr/lib/li -rm $(TARGET_DIR)/usr/lib/*Sql* # Nor Svg -rm $(TARGET_DIR)/usr/lib/*Svg* - -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/*.so.$(QTOPIA4_VERSION) + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/*.so.$(QTOPIA4_VERSION) ################################# # diff --git a/package/rxvt/rxvt.mk b/package/rxvt/rxvt.mk index e4932a63d..2b16c61f8 100644 --- a/package/rxvt/rxvt.mk +++ b/package/rxvt/rxvt.mk @@ -58,7 +58,7 @@ $(RXVT_DIR)/.configured: $(RXVT_DIR)/.unpacked $(RXVT_BINARY): $(RXVT_DIR)/.configured $(MAKE) CC=$(TARGET_CC) -C $(RXVT_DIR) - $(STRIP) -x $(RXVT_BINARY) + $(STRIP) $(STRIP_DISCARD_ALL) $(RXVT_BINARY) $(TARGET_DIR)/usr/X11R6/bin/rxvt: $(RXVT_BINARY) cp -f $(RXVT_BINARY) $(TARGET_DIR)/usr/X11R6/bin diff --git a/package/samba/samba.mk b/package/samba/samba.mk index c69794ced..931c35ce7 100644 --- a/package/samba/samba.mk +++ b/package/samba/samba.mk @@ -94,9 +94,9 @@ $(TARGET_DIR)/$(SAMBA_TARGET_BINARY): $(SAMBA_DIR)/$(SAMBA_BINARY) for file in $(SAMBA_TARGETS_) ; do \ rm -f $(TARGET_DIR)/$$file; \ done - $(STRIP) --strip-unneeded $(TARGET_DIR)/$(SAMBA_TARGET_BINARY) + $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(SAMBA_TARGET_BINARY) for file in $(SAMBA_TARGETS_y) ; do \ - $(STRIP) --strip-unneeded $(TARGET_DIR)/$$file; \ + $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$$file; \ done $(INSTALL) -m 0755 package/samba/S91smb $(TARGET_DIR)/etc/init.d @if [ ! -f $(TARGET_DIR)/etc/samba/smb.conf ] ; then \ diff --git a/package/sdl/sdl.mk b/package/sdl/sdl.mk index be4c16dc5..5eaa3f508 100644 --- a/package/sdl/sdl.mk +++ b/package/sdl/sdl.mk @@ -65,7 +65,7 @@ $(STAGING_DIR)/usr/lib/libSDL.so: $(SDL_DIR)/.compiled $(TARGET_DIR)/usr/lib/libSDL.so: $(STAGING_DIR)/usr/lib/libSDL.so cp -dpf $(STAGING_DIR)/usr/lib/libSDL*.so* $(TARGET_DIR)/usr/lib/ - -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libSDL.so + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libSDL.so SDL sdl: uclibc $(TARGET_DIR)/usr/lib/libSDL.so diff --git a/package/setserial/setserial.mk b/package/setserial/setserial.mk index 6809254b0..8489c126f 100644 --- a/package/setserial/setserial.mk +++ b/package/setserial/setserial.mk @@ -59,7 +59,7 @@ $(SETSERIAL_DIR)/$(SETSERIAL_BINARY): $(SETSERIAL_DIR)/.configured $(TARGET_DIR)/$(SETSERIAL_TARGET_BINARY): $(SETSERIAL_DIR)/$(SETSERIAL_BINARY) install -c $(SETSERIAL_DIR)/$(SETSERIAL_BINARY) $(TARGET_DIR)/$(SETSERIAL_TARGET_BINARY) - $(STRIP) -s $(TARGET_DIR)/$(SETSERIAL_TARGET_BINARY) + $(STRIP) $(STRIP_STRIP_ALL) $(TARGET_DIR)/$(SETSERIAL_TARGET_BINARY) setserial: uclibc $(TARGET_DIR)/$(SETSERIAL_TARGET_BINARY) diff --git a/package/slang/slang.mk b/package/slang/slang.mk index 735a86724..13df0ee36 100644 --- a/package/slang/slang.mk +++ b/package/slang/slang.mk @@ -32,7 +32,7 @@ $(STAGING_DIR)/lib/libslang.so.1: $(SLANG_DIR)/libslang.so $(TARGET_DIR)/lib/libslang.so.1: $(STAGING_DIR)/lib/libslang.so.1 cp -dpf $(STAGING_DIR)/lib/libslang.so* $(TARGET_DIR)/lib/ - -$(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libslang.so* + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libslang.so* slang: uclibc $(STAGING_DIR)/lib/libslang.so.1 $(TARGET_DIR)/lib/libslang.so.1 diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index c9b831fe9..a232f89a4 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -60,7 +60,7 @@ $(STAGING_DIR)/usr/bin/sqlite3: $(SQLITE_DIR)/sqlite3 $(TARGET_DIR)/usr/bin/sqlite3: $(STAGING_DIR)/usr/bin/sqlite3 cp -a $(STAGING_DIR)/usr/bin/sqlite3 $(TARGET_DIR)/usr/bin cp -a $(STAGING_DIR)/lib/libsqlite3*.so* $(TARGET_DIR)/lib/ - $(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libsqlite3.so* + $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libsqlite3.so* sqlite: uclibc readline-target ncurses $(TARGET_DIR)/usr/bin/sqlite3 diff --git a/package/tcl/tcl.mk b/package/tcl/tcl.mk index 143a158fd..22a476970 100644 --- a/package/tcl/tcl.mk +++ b/package/tcl/tcl.mk @@ -38,7 +38,7 @@ $(TCL_DIR)/unix/libtcl8.4.so: $(TCL_DIR)/.configured $(TARGET_DIR)/usr/lib/libtcl8.4.so: $(TCL_DIR)/unix/libtcl8.4.so $(MAKE) INSTALL_ROOT=$(TARGET_DIR) -C $(TCL_DIR)/unix install - -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libtcl8.4.so + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libtcl8.4.so rm -Rf $(TARGET_DIR)/usr/man -if [ "$(strip $(BR2_PACKAGE_TCL_DEL_ENCODINGS))" == "y" ]; then \ rm -Rf $(TARGET_DIR)/usr/lib/tcl8.4/encoding/*; \ diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index d84c241f2..17b86820e 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -65,7 +65,7 @@ $(STAGING_DIR)/lib/libtiff.so.$(TIFF_VERSION): $(TIFF_DIR)/libtiff/.libs/libtiff $(TARGET_DIR)/lib/libtiff.so.$(TIFF_VERSION): $(STAGING_DIR)/lib/libtiff.so.$(TIFF_VERSION) cp -dpf $(STAGING_DIR)/lib/libtiff.so* $(TARGET_DIR)/lib/ - -$(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libtiff.so.$(TIFF_VERSION) + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libtiff.so.$(TIFF_VERSION) tiff: uclibc zlib jpeg $(TARGET_DIR)/lib/libtiff.so.$(TIFF_VERSION) diff --git a/package/tinyhttpd/tinyhttpd.mk b/package/tinyhttpd/tinyhttpd.mk index af13d7d18..0fd183a23 100644 --- a/package/tinyhttpd/tinyhttpd.mk +++ b/package/tinyhttpd/tinyhttpd.mk @@ -31,7 +31,7 @@ $(TINYHTTPD_DIR)/$(TINYHTTPD_BINARY): $(TINYHTTPD_DIR)/.unpacked $(TARGET_DIR)/$(TINYHTTPD_TARGET_BINARY): $(TINYHTTPD_DIR)/$(TINYHTTPD_BINARY) $(INSTALL) -m 0755 $(TINYHTTPD_DIR)/$(TINYHTTPD_BINARY) $(TARGET_DIR)/$(TINYHTTPD_TARGET_BINARY) - $(STRIP) --strip-unneeded $(TARGET_DIR)/$(TINYHTTPD_TARGET_BINARY) + $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(TINYHTTPD_TARGET_BINARY) $(INSTALL) -m 0755 package/tinyhttpd/S85tinyhttpd $(TARGET_DIR)/etc/init.d mkdir -p $(TARGET_DIR)/var/www diff --git a/package/tslib/tslib.mk b/package/tslib/tslib.mk index 7126577fa..c6794c541 100644 --- a/package/tslib/tslib.mk +++ b/package/tslib/tslib.mk @@ -70,15 +70,15 @@ $(STAGING_DIR)/usr/lib/libts.so: $(TSLIB_DIR)/.compiled $(TARGET_DIR)/usr/lib/libts.so: $(STAGING_DIR)/usr/lib/libts.so cp -dpf $(STAGING_DIR)/usr/lib/libts*.so* $(TARGET_DIR)/usr/lib/ - -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libts.so* - -$(STRIP) --strip-unneeded $(STAGING_DIR)/usr/lib/ts/*.so + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libts.so* + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(STAGING_DIR)/usr/lib/ts/*.so cp -dpf $(STAGING_DIR)/usr/lib/ts/*.so $(TARGET_DIR)/usr/lib/ cp -dpf $(STAGING_DIR)/usr/bin/ts_calibrate $(TARGET_DIR)/usr/bin/ - -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/bin/ts_calibrate + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/ts_calibrate cp -dpf $(STAGING_DIR)/usr/bin/ts_finddev $(TARGET_DIR)/usr/bin/ - -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/bin/ts_finddev + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/ts_finddev cp -dpf $(STAGING_DIR)/usr/bin/inputattach $(TARGET_DIR)/usr/bin/ - -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/bin/inputattach + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/inputattach cp -dpf package/tslib/ts.conf $(TARGET_DIR)/etc/ tslib: uclibc $(TARGET_DIR)/usr/lib/libts.so diff --git a/package/udev/udev.mk b/package/udev/udev.mk index 516c8df22..718169a9a 100644 --- a/package/udev/udev.mk +++ b/package/udev/udev.mk @@ -102,7 +102,7 @@ $(TARGET_DIR)/lib/udev/vol_id: $(STAGING_DIR)/usr/lib/libvolume_id.la $(INSTALL) -m 0755 -D $(UDEV_DIR)/extras/volume_id/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION) $(TARGET_DIR)/usr/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION) -ln -sf libvolume_id.so.$(UDEV_VOLUME_ID_VERSION) $(TARGET_DIR)/usr/lib/libvolume_id.so.0 -ln -sf libvolume_id.so.$(UDEV_VOLUME_ID_VERSION) $(TARGET_DIR)/usr/lib/libvolume_id.so - $(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION) + $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION) $(INSTALL) -m 0755 -D $(UDEV_DIR)/extras/volume_id/vol_id $(TARGET_DIR)/lib/udev/vol_id udev-volume_id: udev $(TARGET_DIR)/lib/udev/vol_id @@ -131,14 +131,14 @@ $(TARGET_DIR)/lib/udev/scsi_id: $(STAGING_DIR)/usr/lib/libvolume_id.so.$(UDEV_VO USE_LOG=false USE_SELINUX=false \ udevdir=$(UDEV_ROOT) EXTRAS="extras/scsi_id" -C $(UDEV_DIR) $(INSTALL) -m 0755 -D $(UDEV_DIR)/extras/scsi_id/scsi_id $(TARGET_DIR)/lib/udev/scsi_id - $(STRIP) --strip-unneeded $(TARGET_DIR)/lib/udev/scsi_id + $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/udev/scsi_id $(TARGET_DIR)/lib/udev/usb_id: $(STAGING_DIR)/usr/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION) $(MAKE) CROSS_COMPILE=$(TARGET_CROSS) \ USE_LOG=false USE_SELINUX=false \ udevdir=$(UDEV_ROOT) EXTRAS="extras/usb_id" -C $(UDEV_DIR) $(INSTALL) -m 0755 -D $(UDEV_DIR)/extras/usb_id/usb_id $(TARGET_DIR)/lib/udev/usb_id - $(STRIP) --strip-unneeded $(TARGET_DIR)/lib/udev/usb_id + $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/udev/usb_id udev-scsi_id: udev $(TARGET_DIR)/lib/udev/scsi_id $(TARGET_DIR)/lib/udev/usb_id diff --git a/package/valgrind/valgrind.mk b/package/valgrind/valgrind.mk index 2147a736b..e1ef96be4 100644 --- a/package/valgrind/valgrind.mk +++ b/package/valgrind/valgrind.mk @@ -40,7 +40,7 @@ $(VALGRIND_DIR)/.configured: $(VALGRIND_DIR)/.patched $(VALGRIND_DIR)/none/vgskin_none.so: $(VALGRIND_DIR)/.configured $(MAKE) -C $(VALGRIND_DIR) - -$(STRIP) --strip-unneeded $(VALGRIND_DIR)/*.so* + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(VALGRIND_DIR)/*.so* touch -c $(VALGRIND_DIR)/none/vgskin_none.so $(TARGET_DIR)/usr/bin/valgrind: $(VALGRIND_DIR)/none/vgskin_none.so diff --git a/package/vpnc/vpnc.mk b/package/vpnc/vpnc.mk index 5868f4699..92699f7d4 100644 --- a/package/vpnc/vpnc.mk +++ b/package/vpnc/vpnc.mk @@ -41,7 +41,7 @@ $(VPNC_TARGET_BINARY): $(VPNC_BINARY) INCLUDE=$(STAGING_DIR)/usr/include \ LDFLAGS="-g -lgcrypt -lgpg-error" \ -C $(VPNC_DIR) install - $(STRIP) --strip-unneeded $(VPNC_TARGET_BINARY) + $(STRIP) $(STRIP_STRIP_UNNEEDED) $(VPNC_TARGET_BINARY) # CFLAGS+="-W -Wall -O3 -Wmissing-declarations -Wwrite-strings -g -DVERSION=\"$(VPNC_VERSION)\" -c" \ diff --git a/package/xerces/xerces.mk b/package/xerces/xerces.mk index a33e4bc9e..c9f8d16b0 100644 --- a/package/xerces/xerces.mk +++ b/package/xerces/xerces.mk @@ -40,8 +40,8 @@ $(STAGING_DIR)/$(XERCES_BINARY): $(XERCES_DIR)/$(XERCES_BINARY) $(TARGET_DIR)/usr/$(XERCES_BINARY): $(STAGING_DIR)/$(XERCES_BINARY) cp -a $(STAGING_DIR)/lib/libxerces-c.so* $(TARGET_DIR)/usr/lib cp -a $(STAGING_DIR)/lib/libxerces-depdom.so* $(TARGET_DIR)/usr/lib - $(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libxerces-c.so.27.0 - $(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libxerces-depdom.so.27.0 + $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libxerces-c.so.27.0 + $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libxerces-depdom.so.27.0 xerces: uclibc $(TARGET_DIR)/usr/$(XERCES_BINARY) diff --git a/package/xorg/xorg.mk b/package/xorg/xorg.mk index f12fe0b80..c7673d4ef 100644 --- a/package/xorg/xorg.mk +++ b/package/xorg/xorg.mk @@ -190,7 +190,7 @@ $(XORG_LIBX)/libX11.so.6.2: $(TARGET_XSERVER) $(XORG_LIBX)/X11/fonts/ttf-dejavu/ -mkdir -p $(XORG_LIBX) set -e; for dirs in $(XORG_LIBS) ; do \ file=`find $(XORG_LDIR)/$$dirs -type f -iname "*$$dirs.so*"` ; \ - $(STRIP) --strip-unneeded $$file ; \ + $(STRIP) $(STRIP_STRIP_UNNEEDED) $$file ; \ cp -f $$file $(XORG_LIBX) ; \ file=`find $(XORG_LDIR)/$$dirs -type l -iname "*$$dirs.so*"` ; \ cp -pRf $$file $(XORG_LIBX) ; \ diff --git a/package/zlib/zlib.mk b/package/zlib/zlib.mk index a94de2733..f2c46d03c 100644 --- a/package/zlib/zlib.mk +++ b/package/zlib/zlib.mk @@ -52,7 +52,7 @@ $(STAGING_DIR)/usr/lib/libz.so.$(ZLIB_VERSION): $(ZLIB_DIR)/libz.so.$(ZLIB_VERSI $(TARGET_DIR)/usr/lib/libz.so.$(ZLIB_VERSION): $(STAGING_DIR)/usr/lib/libz.so.$(ZLIB_VERSION) mkdir -p $(TARGET_DIR)/usr/lib cp -dpf $(STAGING_DIR)/usr/lib/libz.so* $(TARGET_DIR)/usr/lib - -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libz.so* + -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libz.so* touch -c $@ $(TARGET_DIR)/usr/lib/libz.a: $(STAGING_DIR)/usr/lib/libz.so.$(ZLIB_VERSION) -- cgit v1.2.3