From 14a71561a388196edbcddfa72d281e911c06266f Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Mon, 1 Oct 2007 16:15:31 +0000 Subject: - just use the strip binary to avoid confusing libtool (quotes) - use $(STRIPCMD) in packages to avoid clashes with $(STRIP) --- package/Makefile.in | 8 ++++---- package/acpid/acpid.mk | 4 ++-- package/alsa-lib/alsa-lib.mk | 4 ++-- package/argus/argus.mk | 2 +- package/asterisk/asterisk.mk | 8 ++++---- package/atk/atk.mk | 2 +- package/avahi/avahi.mk | 6 +++--- package/berkeleydb/berkeleydb.mk | 2 +- package/boa/boa.mk | 2 +- package/bridge/bridge.mk | 4 ++-- package/busybox/busybox.mk | 2 +- package/busybox/initramfs.mk | 6 +++--- package/bzip2/bzip2.mk | 2 +- package/cairo/cairo.mk | 2 +- package/coreutils/coreutils.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/dhcp/dhcp.mk | 2 +- package/directfb/directfb.mk | 2 +- package/dm/dm.mk | 4 ++-- package/dmalloc/dmalloc.mk | 2 +- package/dmraid/dmraid.mk | 2 +- package/dnsmasq/dnsmasq.mk | 2 +- package/dropbear/dropbear.mk | 2 +- package/e2fsprogs/e2fsprogs.mk | 4 ++-- package/expat/expat.mk | 2 +- package/fbset/fbset.mk | 2 +- package/file/file.mk | 2 +- package/findutils/findutils.mk | 2 +- package/fontconfig/fontconfig.mk | 6 +++--- package/freetype/freetype.mk | 2 +- package/gawk/gawk.mk | 2 +- package/gmp/gmp.mk | 2 +- package/hal/hal.mk | 2 +- package/hdparm/hdparm.mk | 2 +- package/hotplug/hotplug.mk | 2 +- package/imagemagick/imagemagick.mk | 22 ++++++++++---------- package/iostat/iostat.mk | 2 +- package/iperf/iperf.mk | 2 +- package/ipsec-tools/ipsec-tools.mk | 2 +- package/iptables/iptables.mk | 4 ++-- package/jpeg/jpeg.mk | 2 +- package/kexec/kexec.mk | 2 +- package/l2tp/l2tp.mk | 2 +- package/libaio/libaio.mk | 2 +- package/libdaemon/libdaemon.mk | 2 +- package/libdrm/libdrm.mk | 2 +- package/libelf/libelf.mk | 2 +- package/libfloat/libfloat.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/libtool/libtool.mk | 2 +- package/libungif/libungif.mk | 2 +- package/libusb/libusb.mk | 2 +- package/libxml2/libxml2.mk | 2 +- package/lighttpd/lighttpd.mk | 4 ++-- package/links/links.mk | 2 +- package/lm-sensors/lm-sensors.mk | 4 ++-- package/lockfile-progs/lockfile-progs.mk | 2 +- package/lrzsz/lrzsz.mk | 2 +- package/lsof/lsof.mk | 2 +- package/ltrace/ltrace.mk | 2 +- package/ltt/ltt.mk | 2 +- package/lzma/lzma.mk | 2 +- package/m4/m4.mk | 2 +- package/madplay/madplay.mk | 2 +- package/matchbox/matchbox.mk | 28 +++++++++++++------------- package/mdadm/mdadm.mk | 2 +- package/memtester/memtester.mk | 2 +- package/metacity/metacity.mk | 2 +- package/microcom/microcom.mk | 2 +- package/mkdosfs/mkdosfs.mk | 2 +- package/module-init-tools/module-init-tools.mk | 2 +- package/modutils/modutils.mk | 2 +- package/mpfr/mpfr.mk | 2 +- package/mpg123/mpg123.mk | 2 +- package/mplayer/mplayer.mk | 2 +- package/mtd/20050122/mtd.mk | 2 +- package/mtd/20061007/mtd.mk | 2 +- package/mtd/mtd-utils/mtd.mk | 2 +- package/mutt/mutt.mk | 2 +- package/nbd/nbd.mk | 2 +- package/ncftp/ncftp.mk | 2 +- package/ncurses/ncurses.mk | 4 ++-- package/netcat/netcat.mk | 2 +- package/netkitbase/netkitbase.mk | 2 +- package/netkittelnet/netkittelnet.mk | 2 +- package/netplug/netplug.mk | 2 +- package/newt/newt.mk | 2 +- package/olsr/olsr.mk | 4 ++-- package/openntpd/openntpd.mk | 4 ++-- package/openssh/openssh.mk | 22 ++++++++++---------- package/openssl/openssl.mk | 4 ++-- package/pango/pango.mk | 10 ++++----- package/pcmcia/pcmcia.mk | 2 +- package/php/php.mk | 4 ++-- package/pptp-linux/pptp-linux.mk | 2 +- package/qtopia4/qtopia4.mk | 4 ++-- package/rp-pppoe/rp-pppoe.mk | 2 +- package/rxvt/rxvt.mk | 2 +- package/samba/samba.mk | 4 ++-- package/sdl/sdl.mk | 2 +- package/setserial/setserial.mk | 2 +- package/sfdisk/sfdisk.mk | 2 +- package/slang/slang.mk | 2 +- package/smartmontools/smartmontools.mk | 4 ++-- package/sqlite/sqlite.mk | 2 +- package/strace/strace.mk | 2 +- package/stunnel/stunnel.mk | 2 +- package/sudo/sudo.mk | 2 +- package/sysklogd/sysklogd.mk | 4 ++-- package/tcl/tcl.mk | 2 +- package/tcpdump/tcpdump.mk | 2 +- package/tiff/tiff.mk | 2 +- package/tinyhttpd/tinyhttpd.mk | 2 +- package/tinyx-old/tinyx.mk | 6 +++--- package/tinyx/tinyx.mk | 6 +++--- package/tslib/tslib.mk | 10 ++++----- package/udev/udev.mk | 6 +++--- package/uemacs/uemacs.mk | 2 +- package/valgrind/valgrind.mk | 2 +- package/vpnc/vpnc.mk | 2 +- package/wireless-tools/wireless-tools.mk | 2 +- package/xerces/xerces.mk | 4 ++-- package/xfsprogs/xfsprogs.mk | 10 ++++----- package/xorg/xorg.mk | 6 +++--- package/zlib/zlib.mk | 2 +- target/cloop/cloop.mk | 2 +- target/cpio/cpioroot.mk | 2 +- target/cramfs/cramfs.mk | 4 ++-- target/device/Atmel/u-boot/u-boot.mk | 2 +- target/ext2/ext2root.mk | 2 +- target/initramfs/initramfs.mk | 2 +- target/jffs2/jffs2root.mk | 2 +- target/squashfs/squashfsroot.mk | 2 +- target/tar/tarroot.mk | 2 +- toolchain/binutils/binutils.mk | 4 ++-- toolchain/gcc/gcc-uclibc-3.x.mk | 10 ++++----- toolchain/gcc/gcc-uclibc-4.x.mk | 10 ++++----- toolchain/gdb/gdb.mk | 4 ++-- 149 files changed, 250 insertions(+), 250 deletions(-) diff --git a/package/Makefile.in b/package/Makefile.in index 3763cfcaf..0c2abcb1d 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -109,8 +109,8 @@ STRIP_STRIP_UNNEEDED:=--strip-unneeded STRIP_STRIP_ALL:=--strip-all REMOVE_SECTION_COMMENT:=--remove-section=.comment REMOVE_SECTION_NOTE:=--remove-section=.note -TARGET_STRIP=$(TARGET_CROSS)strip $(REMOVE_SECTION_COMMENT) $(REMOVE_SECTION_NOTE) -STRIP=$(TARGET_STRIP) +TARGET_STRIP=$(TARGET_CROSS)strip +STRIPCMD=$(TARGET_CROSS)strip $(REMOVE_SECTION_COMMENT) $(REMOVE_SECTION_NOTE) endif ifeq ($(BR2_STRIP_sstrip),y) STRIP_DISCARD_ALL:= @@ -119,11 +119,11 @@ STRIP_STRIP_ALL:= REMOVE_SECTION_COMMENT:= REMOVE_SECTION_NOTE:= TARGET_STRIP=$(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-sstrip -STRIP=$(TARGET_STRIP) +STRIPCMD=$(TARGET_STRIP) endif ifeq ($(BR2_STRIP_none),y) TARGET_STRIP=true -Not_stripping -STRIP=$(TARGET_STRIP) +STRIPCMD=$(TARGET_STRIP) endif INSTALL=/usr/bin/install diff --git a/package/acpid/acpid.mk b/package/acpid/acpid.mk index 731217ddf..c153538a3 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) $(STRIP_STRIP_ALL) $(ACPID_DIR)/acpid - $(STRIP) $(STRIP_STRIP_ALL) $(ACPID_DIR)/acpi_listen + $(STRIPCMD) $(STRIP_STRIP_ALL) $(ACPID_DIR)/acpid + $(STRIPCMD) $(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 d4d12dcb8..aeef73470 100644 --- a/package/alsa-lib/alsa-lib.mk +++ b/package/alsa-lib/alsa-lib.mk @@ -52,8 +52,8 @@ $(TARGET_DIR)/$(ALSA_LIB_TARGET_BINARY): $(STAGING_DIR)/$(ALSA_LIB_TARGET_BINARY cp -dpf $(STAGING_DIR)/usr/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_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libasound.so* - -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/alsa-lib/smixer/*.so + -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libasound.so* + -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/alsa-lib/smixer/*.so touch -c $@ alsa-lib: uclibc $(TARGET_DIR)/$(ALSA_LIB_TARGET_BINARY) diff --git a/package/argus/argus.mk b/package/argus/argus.mk index 5c283317f..9d787b92a 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) $(STRIP_STRIP_ALL) $@ + $(STRIPCMD) $(STRIP_STRIP_ALL) $@ argus: uclibc libpcap $(TARGET_DIR)/$(ARGUS_TARGET_BINARY) diff --git a/package/asterisk/asterisk.mk b/package/asterisk/asterisk.mk index d6c83ec61..eb83318d5 100644 --- a/package/asterisk/asterisk.mk +++ b/package/asterisk/asterisk.mk @@ -45,10 +45,10 @@ $(TARGET_DIR)/$(ASTERISK_TARGET_BINARY): $(ASTERISK_DIR)/$(ASTERISK_BINARY) DEBUG= \ $(TARGET_CONFIGURE_OPTS) \ DESTDIR=$(TARGET_DIR) install - $(STRIP) $(TARGET_DIR)/usr/sbin/asterisk - $(STRIP) $(TARGET_DIR)/usr/sbin/stereorize - $(STRIP) $(TARGET_DIR)/usr/sbin/streamplayer - $(STRIP) $(STRIP_STRIP_UNNEEDED) \ + $(STRIPCMD) $(TARGET_DIR)/usr/sbin/asterisk + $(STRIPCMD) $(TARGET_DIR)/usr/sbin/stereorize + $(STRIPCMD) $(TARGET_DIR)/usr/sbin/streamplayer + $(STRIPCMD) $(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 diff --git a/package/atk/atk.mk b/package/atk/atk.mk index 021730d37..d244d375b 100644 --- a/package/atk/atk.mk +++ b/package/atk/atk.mk @@ -123,7 +123,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_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libatk-1.0.so.0.* + $(STRIPCMD) $(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 d88f23bcf..2a441d0fa 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_STRIP_UNNEEDED) $@ + $(STRIPCMD) $(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_STRIP_UNNEEDED) $@ - $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libavahi-*.so* + $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@ + $(STRIPCMD) $(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 f8620124b..84d7c1d34 100644 --- a/package/berkeleydb/berkeleydb.mk +++ b/package/berkeleydb/berkeleydb.mk @@ -73,7 +73,7 @@ $(TARGET_DIR)/lib/$(DB_SHARLIB): $(STAGING_DIR)/lib/$(DB_SHARLIB) cp -a $(STAGING_DIR)/lib/libdb*so* $(TARGET_DIR)/lib/ rm -f $(addprefix $(TARGET_DIR)/lib/,libdb.so libdb.la libdb.a) (cd $(TARGET_DIR)/usr/lib; ln -fs /lib/$(DB_SHARLIB) libdb.so) - -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libdb*so* + -$(STRIPCMD) $(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 5028a15a9..a429cd2f5 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_STRIP_ALL) $(TARGET_DIR)/usr/sbin/boa $(TARGET_DIR)/usr/lib/boa/boa_indexer + $(STRIPCMD) $(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/bridge/bridge.mk b/package/bridge/bridge.mk index ca86343d6..0869f1bfc 100644 --- a/package/bridge/bridge.mk +++ b/package/bridge/bridge.mk @@ -47,9 +47,9 @@ $(BRIDGE_BUILD_DIR)/brctl/brctl: $(BRIDGE_BUILD_DIR)/.configured $(TARGET_DIR)/$(BRIDGE_TARGET_BINARY): $(BRIDGE_BUILD_DIR)/brctl/brctl cp -af $(BRIDGE_BUILD_DIR)/brctl/brctl $(TARGET_DIR)/$(BRIDGE_TARGET_BINARY) - $(STRIP) $(TARGET_DIR)/$(BRIDGE_TARGET_BINARY) + $(STRIPCMD) $(TARGET_DIR)/$(BRIDGE_TARGET_BINARY) #cp -af $(BRIDGE_BUILD_DIR)/brctl/brctld $(TARGET_DIR)/usr/sbin/ - #$(STRIP) $(TARGET_DIR)/usr/sbin/brctld + #$(STRIPCMD) $(TARGET_DIR)/usr/sbin/brctld bridge: $(TARGET_DIR)/$(BRIDGE_TARGET_BINARY) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 42fdb8403..6d86f170e 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -106,7 +106,7 @@ ifeq ($(BR2_PREFER_IMA)$(BR2_PACKAGE_BUSYBOX_SNAPSHOT),yy) rm -f $@ $(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \ CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \ - ARCH=$(KERNEL_ARCH) STRIP="$(STRIP)" \ + ARCH=$(KERNEL_ARCH) STRIP="$(STRIPCMD)" \ EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(BUSYBOX_DIR) \ -f scripts/Makefile.IMA endif diff --git a/package/busybox/initramfs.mk b/package/busybox/initramfs.mk index 99caf95e5..47de1e7b5 100644 --- a/package/busybox/initramfs.mk +++ b/package/busybox/initramfs.mk @@ -90,7 +90,7 @@ ifeq ($(BR2_PREFER_IMA)$(BR2_PACKAGE_BUSYBOX_SNAPSHOT),yy) rm -f $@ $(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \ CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \ - ARCH=$(KERNEL_ARCH) STRIP="$(STRIP)" \ + ARCH=$(KERNEL_ARCH) STRIP="$(STRIPCMD)" \ EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(BUSYBOX_INITRAMFS_DIR) \ -f scripts/Makefile.IMA endif @@ -98,10 +98,10 @@ endif $(BR2_INITRAMFS_DIR)/bin/busybox: $(BUSYBOX_INITRAMFS_DIR)/busybox $(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \ CROSS="$(TARGET_CROSS)" \ - ARCH=$(KERNEL_ARCH) STRIP="$(STRIP)" \ + ARCH=$(KERNEL_ARCH) STRIP="$(STRIPCMD)" \ EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(BUSYBOX_INITRAMFS_DIR) \ install - $(STRIP) $(STRIP_STRIP_ALL) $@ + $(STRIPCMD) $(STRIP_STRIP_ALL) $@ $(BB_INITRAMFS_TARGET): host-fakeroot $(BR2_INITRAMFS_DIR)/bin/busybox diff --git a/package/bzip2/bzip2.mk b/package/bzip2/bzip2.mk index 0454d3126..96d86f2e0 100644 --- a/package/bzip2/bzip2.mk +++ b/package/bzip2/bzip2.mk @@ -91,7 +91,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_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libbz2.so.1.0 + -$(STRIPCMD) $(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 ac5ebd6f6..e60f4b7f2 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_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libcairo.so.2.* + $(STRIPCMD) $(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 zlib png fontconfig $(XSERVER) $(TARGET_DIR)/lib/libcairo.so.2.9.3 diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk index 468a54a34..bec70a624 100644 --- a/package/coreutils/coreutils.mk +++ b/package/coreutils/coreutils.mk @@ -118,7 +118,7 @@ $(TARGET_DIR)/$(COREUTILS_TARGET_BINARY): $(COREUTILS_DIR)/$(COREUTILS_BINARY) ln -fs test $(TARGET_DIR)/usr/bin/[ # gnu thinks chroot is in bin, debian thinks it's in sbin mv $(TARGET_DIR)/usr/bin/chroot $(TARGET_DIR)/usr/sbin/chroot - $(STRIP) $(TARGET_DIR)/usr/sbin/chroot > /dev/null 2>&1 + $(STRIPCMD) $(TARGET_DIR)/usr/sbin/chroot > /dev/null 2>&1 ifneq ($(BR2_HAVE_INFOPAGES),y) rm -rf $(TARGET_DIR)/usr/share/info endif diff --git a/package/curl/curl.mk b/package/curl/curl.mk index 42325ecbb..d2ffe6225 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_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libcurl.so.3.0.0 + $(STRIPCMD) $(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_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/$(CURL_BINARY) + $(STRIPCMD) $(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 ef3290e1f..5f28f3ec5 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) $(STRIP_STRIP_ALL) $(TARGET_DIR)/$(CVS_TARGET_BINARY) + $(STRIPCMD) $(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 65a3b31fb..78d9cbda0 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_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libdbus-glib-1.so.2.0.0 + -$(STRIPCMD) $(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 539776461..edccb1d68 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_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libdbus-1.so.3.2.0 + -$(STRIPCMD) $(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 package/dbus/S97messagebus $(TARGET_DIR)/etc/init.d rm -f $(TARGET_DIR)/etc/init.d/messagebus diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk index 7cf3580cd..7eaa055c8 100644 --- a/package/dhcp/dhcp.mk +++ b/package/dhcp/dhcp.mk @@ -42,7 +42,7 @@ $(DHCP_DIR)/.configured: $(DHCP_DIR)/.unpacked $(DHCP_DIR)/$(DHCP_RELAY_BINARY): $(DHCP_DIR)/.configured $(MAKE) $(TARGET_CONFIGURE_OPTS) $(BVARS) -C $(DHCP_DIR) - $(STRIP) $(DHCP_DIR)/$(DHCP_RELAY_BINARY) + $(STRIPCMD) $(DHCP_DIR)/$(DHCP_RELAY_BINARY) $(TARGET_DIR)/$(DHCP_SERVER_TARGET_BINARY): $(DHCP_DIR)/$(DHCP_RELAY_BINARY) mkdir -p $(TARGET_DIR)/var/lib diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk index d103e8b37..5f8ff6808 100644 --- a/package/directfb/directfb.mk +++ b/package/directfb/directfb.mk @@ -98,7 +98,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_STRIP_UNNEEDED) \ + -$(STRIPCMD) $(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/dm/dm.mk b/package/dm/dm.mk index a43e66772..e407f8935 100644 --- a/package/dm/dm.mk +++ b/package/dm/dm.mk @@ -90,13 +90,13 @@ $(DM_STAGING_BINARY) $(DM_STAGING_LIBRARY): $(DM_DIR)/.configured # Install dmsetup from staging to target $(DM_TARGET_BINARY): $(DM_STAGING_BINARY) $(INSTALL) -m 0755 $? $@ - -$(STRIP) $(DM_TARGET_BINARY) + -$(STRIPCMD) $(DM_TARGET_BINARY) touch -c $@ # Install libdevmapper.so.1.00 from staging to target $(DM_TARGET_LIBRARY).$(DM_BASEVER): $(DM_STAGING_LIBRARY) $(INSTALL) -m 0644 $? $@ - -$(STRIP) $@ + -$(STRIPCMD) $@ touch -c $@ # Makes libdevmapper.so a symlink to libdevmapper.so.1.00 diff --git a/package/dmalloc/dmalloc.mk b/package/dmalloc/dmalloc.mk index d9b057287..0ff3fc42d 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) $(STRIP_STRIP_ALL) $(TARGET_DIR)/$(DMALLOC_TARGET_BINARY) + $(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/$(DMALLOC_TARGET_BINARY) dmalloc: uclibc $(TARGET_DIR)/$(DMALLOC_TARGET_BINARY) diff --git a/package/dmraid/dmraid.mk b/package/dmraid/dmraid.mk index 402e3bed7..f790ca5cb 100644 --- a/package/dmraid/dmraid.mk +++ b/package/dmraid/dmraid.mk @@ -40,7 +40,7 @@ $(DMRAID_DIR)/.configured: $(DMRAID_DIR)/.unpacked $(DMRAID_DIR)/tools/$(DMRAID_BINARY): $(DMRAID_DIR)/.configured $(MAKE1) -C $(DMRAID_DIR) - -$(STRIP) $(DMRAID_DIR)/tools/$(DMRAID_BINARY) + -$(STRIPCMD) $(DMRAID_DIR)/tools/$(DMRAID_BINARY) -$(UPX) --best $(DMRAID_DIR)/tools/$(DMRAID_BINARY) touch -c $(DMRAID_DIR)/tools/$(DMRAID_BINARY) diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk index 05a091313..bedfd33fa 100644 --- a/package/dnsmasq/dnsmasq.mk +++ b/package/dnsmasq/dnsmasq.mk @@ -38,7 +38,7 @@ $(DNSMASQ_DIR)/src/$(DNSMASQ_BINARY): $(DNSMASQ_DIR)/.source $(TARGET_DIR)/$(DNSMASQ_TARGET_BINARY): $(DNSMASQ_DIR)/src/$(DNSMASQ_BINARY) $(MAKE) DESTDIR=$(TARGET_DIR) PREFIX=/usr -C $(DNSMASQ_DIR) install - $(STRIP) $(TARGET_DIR)/$(DNSMASQ_TARGET_BINARY) + $(STRIPCMD) $(TARGET_DIR)/$(DNSMASQ_TARGET_BINARY) mkdir -p $(TARGET_DIR)/var/lib/misc # Isn't this vulverable to symlink attacks? ln -sf /tmp/dnsmasq.leases $(TARGET_DIR)/var/lib/misc/dnsmasq.leases diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk index fc9152721..bed75537a 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_STRIP_UNNEEDED) $(TARGET_DIR)/$(DROPBEAR_TARGET_BINARY) + $(STRIPCMD) $(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/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk index 685a39194..0fd2d5de5 100644 --- a/package/e2fsprogs/e2fsprogs.mk +++ b/package/e2fsprogs/e2fsprogs.mk @@ -63,9 +63,9 @@ $(E2FSPROGS_DIR)/.configured: $(E2FSPROGS_DIR)/.unpacked $(E2FSPROGS_DIR)/$(E2FSPROGS_BINARY): $(E2FSPROGS_DIR)/.configured $(MAKE1) -C $(E2FSPROGS_DIR) (cd $(E2FSPROGS_DIR)/misc; \ - $(STRIP) $(E2FSPROGS_MISC_STRIP); \ + $(STRIPCMD) $(E2FSPROGS_MISC_STRIP); \ ) - #$(STRIP) $(E2FSPROGS_DIR)/lib/lib*.so.*.* + #$(STRIPCMD) $(E2FSPROGS_DIR)/lib/lib*.so.*.* touch -c $@ $(TARGET_DIR)/$(E2FSPROGS_TARGET_BINARY): $(E2FSPROGS_DIR)/$(E2FSPROGS_BINARY) diff --git a/package/expat/expat.mk b/package/expat/expat.mk index 434010640..c8a70b455 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_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libexpat.so* + -$(STRIPCMD) $(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 7acdbc66a..c53e1ebee 100644 --- a/package/fbset/fbset.mk +++ b/package/fbset/fbset.mk @@ -25,7 +25,7 @@ $(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_STRIP_UNNEEDED) $(TARGET_DIR)/$(FBSET_TARGET_BINARY) + -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(FBSET_TARGET_BINARY) touch -c $@ fbset: uclibc $(TARGET_DIR)/$(FBSET_TARGET_BINARY) diff --git a/package/file/file.mk b/package/file/file.mk index 2b860c7ef..aee7f57c6 100644 --- a/package/file/file.mk +++ b/package/file/file.mk @@ -89,7 +89,7 @@ $(FILE_DIR2)/$(FILE_BINARY): $(FILE_DIR2)/.configured $(TOOL_BUILD_DIR)/bin/file $(TARGET_DIR)/$(FILE_TARGET_BINARY): $(FILE_DIR2)/$(FILE_BINARY) $(MAKE) $(TARGET_CONFIGURE_OPTS) DESTDIR=$(TARGET_DIR) -C $(FILE_DIR2) install - -($(STRIP) $(TARGET_DIR)/usr/lib/libmagic.so.*.* > /dev/null 2>&1) + -($(STRIPCMD) $(TARGET_DIR)/usr/lib/libmagic.so.*.* > /dev/null 2>&1) ifneq ($(BR2_HAVE_INFOPAGES),y) rm -rf $(TARGET_DIR)/usr/share/info endif diff --git a/package/findutils/findutils.mk b/package/findutils/findutils.mk index 9b1b173a9..7ac093a1a 100644 --- a/package/findutils/findutils.mk +++ b/package/findutils/findutils.mk @@ -60,7 +60,7 @@ findutils-target_binary: $(FINDUTILS_DIR)/$(FINDUTILS_BINARY) -ot $(FINDUTILS_DIR)/$(FINDUTILS_BINARY) ]; then \ set -x; \ $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(FINDUTILS_DIR) install; \ - $(STRIP) $(TARGET_DIR)/usr/lib/locate/* > /dev/null 2>&1; \ + $(STRIPCMD) $(TARGET_DIR)/usr/lib/locate/* > /dev/null 2>&1; \ fi ifneq ($(BR2_HAVE_INFOPAGES),y) rm -rf $(TARGET_DIR)/usr/share/info diff --git a/package/fontconfig/fontconfig.mk b/package/fontconfig/fontconfig.mk index 23adfc9dd..9798849ae 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_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libfontconfig.so + -$(STRIPCMD) $(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_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/fc-cache + -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/fc-cache cp -a $(STAGING_DIR)/usr/bin/fc-list $(TARGET_DIR)/usr/bin/ - -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/fc-list + -$(STRIPCMD) $(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 b26e5abc4..1c98fd199 100644 --- a/package/freetype/freetype.mk +++ b/package/freetype/freetype.mk @@ -66,7 +66,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_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libfreetype.so + -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libfreetype.so # freetype for the host, needed for build-tools of fontconfig diff --git a/package/gawk/gawk.mk b/package/gawk/gawk.mk index 4bd52a6b2..5ca3bcdd4 100644 --- a/package/gawk/gawk.mk +++ b/package/gawk/gawk.mk @@ -55,7 +55,7 @@ $(TARGET_DIR)/$(GAWK_TARGET_BINARY): $(GAWK_DIR)/$(GAWK_BINARY) $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(GAWK_DIR) install rm -f $(TARGET_DIR)/usr/bin/gawk-* (cd $(TARGET_DIR)/usr/bin; ln -snf gawk awk) - $(STRIP) $(TARGET_DIR)/usr/lib/awk/* > /dev/null 2>&1 + $(STRIPCMD) $(TARGET_DIR)/usr/lib/awk/* > /dev/null 2>&1 ifneq ($(BR2_HAVE_INFOPAGES),y) rm -rf $(TARGET_DIR)/usr/share/info endif diff --git a/package/gmp/gmp.mk b/package/gmp/gmp.mk index 48f489450..6e091d043 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_STRIP_UNNEEDED) $(STAGING_DIR)/usr/lib/libgmp$(LIBTGTEXT)* + $(STRIPCMD) $(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 9a6e1dc9b..f7f5d114d 100644 --- a/package/hal/hal.mk +++ b/package/hal/hal.mk @@ -87,7 +87,7 @@ $(TARGET_DIR)/$(HAL_TARGET_BINARY): $(HAL_DIR)/hald/hald do \ rm -f $(TARGET_DIR)/usr/libexec/$$file; \ done - -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libhal* + -$(STRIPCMD) $(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/hdparm/hdparm.mk b/package/hdparm/hdparm.mk index 343ae1dc3..2ccb0ade4 100644 --- a/package/hdparm/hdparm.mk +++ b/package/hdparm/hdparm.mk @@ -32,7 +32,7 @@ $(TARGET_DIR)/$(HDPARM_TARGET_BINARY): $(HDPARM_DIR)/$(HDPARM_BINARY) ifeq ($(BR2_HAVE_MANPAGES),y) $(INSTALL) -D $(HDPARM_DIR)/hdparm.8 $(TARGET_DIR)/usr/share/man/man8/hdparm.8 endif - $(STRIP) $(STRIP_STRIP_ALL) $@ + $(STRIPCMD) $(STRIP_STRIP_ALL) $@ hdparm: uclibc $(TARGET_DIR)/$(HDPARM_TARGET_BINARY) diff --git a/package/hotplug/hotplug.mk b/package/hotplug/hotplug.mk index 5bf2b317d..3b702ee6a 100644 --- a/package/hotplug/hotplug.mk +++ b/package/hotplug/hotplug.mk @@ -17,7 +17,7 @@ $(HOTPLUG_DIR)/hotplug: $(HOTPLUG_DIR) $(MAKE) CROSS=$(TARGET_CROSS) DEBUG=false KLIBC=false \ KERNEL_INCLUDE_DIR=$(STAGING_DIR)/usr/include \ TARGET_DIR=$(TARGET_DIR) -C $(HOTPLUG_DIR) - $(STRIP) $(HOTPLUG_DIR)/hotplug + $(STRIPCMD) $(HOTPLUG_DIR)/hotplug touch -c $(HOTPLUG_DIR)/hotplug $(TARGET_DIR)/sbin/hotplug: $(HOTPLUG_DIR)/hotplug diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index 34a5bff1a..56c681443 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_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libWand.so* + -$(STRIPCMD) $(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_STRIP_UNNEEDED) $(IMAGEMAGICK_LIB)* + -$(STRIPCMD) $(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_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/animate + -$(STRIPCMD) $(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_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/compare + -$(STRIPCMD) $(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_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/composite + -$(STRIPCMD) $(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_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/conjure + -$(STRIPCMD) $(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_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/display + -$(STRIPCMD) $(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_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/import + -$(STRIPCMD) $(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_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/mogrify + -$(STRIPCMD) $(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_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/montage + -$(STRIPCMD) $(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_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/convert + -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/convert touch $@ imagemagick: uclibc jpeg tiff $(IMAGEMAGICK_LIB) \ diff --git a/package/iostat/iostat.mk b/package/iostat/iostat.mk index 104fb4601..75a03194c 100644 --- a/package/iostat/iostat.mk +++ b/package/iostat/iostat.mk @@ -22,7 +22,7 @@ $(IOSTAT_DIR)/.unpacked: $(DL_DIR)/$(IOSTAT_SOURCE) $(IOSTAT_DIR)/$(IOSTAT_BINARY): $(IOSTAT_DIR)/.unpacked $(MAKE) CC=$(TARGET_CC) -C $(IOSTAT_DIR) - $(STRIP) $(IOSTAT_DIR)/$(IOSTAT_BINARY) + $(STRIPCMD) $(IOSTAT_DIR)/$(IOSTAT_BINARY) $(TARGET_DIR)/$(IOSTAT_TARGET_BINARY): $(IOSTAT_DIR)/$(IOSTAT_BINARY) $(INSTALL) -m 0755 -D $(IOSTAT_DIR)/$(IOSTAT_BINARY) $(TARGET_DIR)/$(IOSTAT_TARGET_BINARY) diff --git a/package/iperf/iperf.mk b/package/iperf/iperf.mk index 562b39b97..87f40a61e 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_STRIP_UNNEEDED) $(IPERF_DIR)/src/iperf + -$(STRIPCMD) $(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 0bd95a3be..be22753c0 100644 --- a/package/ipsec-tools/ipsec-tools.mk +++ b/package/ipsec-tools/ipsec-tools.mk @@ -106,7 +106,7 @@ $(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_STRIP_UNNEEDED) $(REMOVE_SECTION_COMMENT) \ + $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(REMOVE_SECTION_COMMENT) \ $(REMOVE_SECTION_NOTE) \ $(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_SETKEY) \ $(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_RACOON) \ diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk index 4702bee7f..9d2567097 100644 --- a/package/iptables/iptables.mk +++ b/package/iptables/iptables.mk @@ -40,8 +40,8 @@ $(TARGET_DIR)/usr/sbin/iptables: $(IPTABLES_BUILD_DIR)/iptables INCDIR="\$$(PREFIX)/include" \ MANDIR="\$$(PREFIX)/share/man" \ DESTDIR=$(TARGET_DIR) install - $(STRIP) $(TARGET_DIR)/usr/sbin/iptables* - $(STRIP) $(TARGET_DIR)/usr/lib/iptables/*.so + $(STRIPCMD) $(TARGET_DIR)/usr/sbin/iptables* + $(STRIPCMD) $(TARGET_DIR)/usr/lib/iptables/*.so ifneq ($(BR2_HAVE_MANPAGES),y) rm -rf $(TARGET_DIR)/usr/share/man endif diff --git a/package/jpeg/jpeg.mk b/package/jpeg/jpeg.mk index fe2634a2e..525838594 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_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libjpeg.so* + -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libjpeg.so* touch -c $@ jpeg: uclibc $(TARGET_DIR)/usr/lib/libjpeg.so diff --git a/package/kexec/kexec.mk b/package/kexec/kexec.mk index a22bf7241..d32eef089 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) $(STRIP_STRIP_ALL) $(TARGET_DIR)/sbin/k{exec,dump} + $(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/sbin/k{exec,dump} kexec: uclibc $(TARGET_DIR)/$(KEXEC_TARGET_BINARY) diff --git a/package/l2tp/l2tp.mk b/package/l2tp/l2tp.mk index ab90ab94a..b837b0a91 100644 --- a/package/l2tp/l2tp.mk +++ b/package/l2tp/l2tp.mk @@ -40,7 +40,7 @@ $(L2TP_DIR)/$(L2TP_BINARY): $(L2TP_DIR)/.unpacked $(TARGET_DIR)/$(L2TP_TARGET_BINARY): $(L2TP_DIR)/$(L2TP_BINARY) cp -dpf $(L2TP_DIR)/$(L2TP_BINARY) $@ cp -dpf package/l2tp/l2tpd $(TARGET_DIR)/etc/init.d/ - $(STRIP) $@ + $(STRIPCMD) $@ l2tp: uclibc $(TARGET_DIR)/$(L2TP_TARGET_BINARY) diff --git a/package/libaio/libaio.mk b/package/libaio/libaio.mk index ffdc5fb39..5add68fa7 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_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libaio.so + -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libaio.so libaio: uclibc $(TARGET_DIR)/usr/lib/libaio.so diff --git a/package/libdaemon/libdaemon.mk b/package/libdaemon/libdaemon.mk index 0ec61ae74..7f77b1b38 100644 --- a/package/libdaemon/libdaemon.mk +++ b/package/libdaemon/libdaemon.mk @@ -66,7 +66,7 @@ $(STAGING_DIR)/lib/libdaemon.a: $(LIBDAEMON_DIR)/.compiled touch -c $@ #$(TARGET_DIR)/usr/lib/libdaemon.a: $(STAGING_DIR)/lib/libdaemon.a -# -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libdaemon.a +# -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libdaemon.a libdaemon: uclibc pkgconfig $(STAGING_DIR)/lib/libdaemon.a diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk index fa4b79378..9857f5b33 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_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libdrm.so + -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libdrm.so libdrm: uclibc pkgconfig $(TARGET_DIR)/lib/libdrm.so diff --git a/package/libelf/libelf.mk b/package/libelf/libelf.mk index d1443d9bb..af06ba8b1 100644 --- a/package/libelf/libelf.mk +++ b/package/libelf/libelf.mk @@ -59,7 +59,7 @@ ifeq ($(BR2_PACKAGE_LIBELF_HEADERS),y) $(TARGET_DIR)/usr/lib/libelf.so.$(LIBELF_VERSION): $(STAGING_DIR)/usr/lib/libelf.a $(INSTALL) $(STAGING_DIR)/usr/lib/libelf* $(@D) cp -dpR $(STAGING_DIR)/usr/include/{gelf.h,libelf*} $(TARGET_DIR)/usr/include/ - $(STRIP) $(STRIP_STRIP_UNNEEDED) $@ + $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@ libelf: uclibc $(TARGET_DIR)/usr/lib/libelf.so.$(LIBELF_VERSION) else diff --git a/package/libfloat/libfloat.mk b/package/libfloat/libfloat.mk index 6fe28cfdb..7fde1b4f5 100644 --- a/package/libfloat/libfloat.mk +++ b/package/libfloat/libfloat.mk @@ -43,7 +43,7 @@ $(STAGING_DIR)/lib/libfloat.so $(STAGING_DIR)/lib/libfloat.a: $(LIBFLOAT_DIR)/li (cd $(STAGING_DIR)/lib; ln -snf libfloat.so.1 libfloat.so) cp -dpf $(LIBFLOAT_DIR)/libfloat.a $(TARGET_DIR)/usr/lib/libfloat.a cp -dpf $(LIBFLOAT_DIR)/libfloat.so.1 $(TARGET_DIR)/lib/libfloat.so.1 - $(STRIP) $(TARGET_DIR)/lib/libfloat.so.1 > /dev/null 2>&1 + $(STRIPCMD) $(TARGET_DIR)/lib/libfloat.so.1 > /dev/null 2>&1 (cd $(TARGET_DIR)/lib; ln -snf libfloat.so.1 libfloat.so) (cd $(TARGET_DIR)/usr/lib; ln -snf /lib/libfloat.so libfloat.so) diff --git a/package/libglib12/libglib12.mk b/package/libglib12/libglib12.mk index 740d57671..e2492f989 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_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 + $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libglib-1.2.so.0.0.10 + $(STRIPCMD) $(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 c6051b6c3..7927d154c 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -127,10 +127,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_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.* + $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libglib-2.0.so.0.* + $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libgmodule-2.0.so.0.* + $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libgobject-2.0.so.0.* + $(STRIPCMD) $(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 13b933173..dd55a71c3 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_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 + $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libgtk-1.2.so.0.9.1 + $(STRIPCMD) $(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 8f716ee24..785088aea 100644 --- a/package/libgtk2/libgtk2.mk +++ b/package/libgtk2/libgtk2.mk @@ -134,8 +134,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_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libgtk-x11-2.0.so.0* - $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libgdk*-2.0.so.0* + $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libgtk-x11-2.0.so.0* + $(STRIPCMD) $(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 7f2fd258a..d299d86ad 100644 --- a/package/libid3tag/libid3tag.mk +++ b/package/libid3tag/libid3tag.mk @@ -44,7 +44,7 @@ $(STAGING_DIR)/$(LIBID3TAG_TARGET_BIN): $(LIBID3TAG_DIR)/.libs/$(LIBID3TAG_BIN) $(TARGET_DIR)/$(LIBID3TAG_TARGET_BIN): $(STAGING_DIR)/$(LIBID3TAG_TARGET_BIN) cp -dpf $(STAGING_DIR)/usr/lib/libid3tag.so* $(TARGET_DIR)/usr/lib/ - -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libid3tag.so* + -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libid3tag.so* libid3tag: uclibc zlib libmad $(TARGET_DIR)/$(LIBID3TAG_TARGET_BIN) diff --git a/package/liblockfile/liblockfile.mk b/package/liblockfile/liblockfile.mk index 7519e62e2..27a66cf51 100644 --- a/package/liblockfile/liblockfile.mk +++ b/package/liblockfile/liblockfile.mk @@ -48,7 +48,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)/usr/lib/liblockfile.so* $(TARGET_DIR)/usr/lib - $(STRIP) $(STRIP_STRIP_UNNEEDED) \ + $(STRIPCMD) $(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 1961cece6..deb7dede0 100644 --- a/package/libmad/libmad.mk +++ b/package/libmad/libmad.mk @@ -45,7 +45,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_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libmad* + $(STRIPCMD) $(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 7a0cac27e..d8478a027 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_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libpng* + -$(STRIPCMD) $(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 ec9a64f46..fcaba3124 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_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libsysfs.so + -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libsysfs.so libsysfs: uclibc $(TARGET_DIR)/usr/lib/libsysfs.so diff --git a/package/libtool/libtool.mk b/package/libtool/libtool.mk index f0d480e39..67300aacf 100644 --- a/package/libtool/libtool.mk +++ b/package/libtool/libtool.mk @@ -71,7 +71,7 @@ $(TARGET_DIR)/$(LIBTOOL_TARGET_BINARY): $(LIBTOOL_DIR)/$(LIBTOOL_BINARY) mandir=$(TARGET_DIR)/usr/share/man \ includedir=$(TARGET_DIR)/usr/include \ -C $(LIBTOOL_DIR) install - $(STRIP) $(TARGET_DIR)//usr/lib/libltdl.so.*.*.* > /dev/null 2>&1 + $(STRIPCMD) $(TARGET_DIR)//usr/lib/libltdl.so.*.*.* > /dev/null 2>&1 $(SED) "s,^CC.*,CC=\"/usr/bin/gcc\"," $(TARGET_DIR)/usr/bin/libtool $(SED) "s,^LD.*,LD=\"/usr/bin/ld\"," $(TARGET_DIR)/usr/bin/libtool rm -rf $(TARGET_DIR)/share/locale diff --git a/package/libungif/libungif.mk b/package/libungif/libungif.mk index 44b680db1..1f90b1c53 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_STRIP_UNNEEDED) $(TARGET_DIR)/$(LIBUNGIF_TARGET_BINARY)* + -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(LIBUNGIF_TARGET_BINARY)* libungif: uclibc $(TARGET_DIR)/$(LIBUNGIF_TARGET_BINARY) diff --git a/package/libusb/libusb.mk b/package/libusb/libusb.mk index a192e2d92..8efda1399 100644 --- a/package/libusb/libusb.mk +++ b/package/libusb/libusb.mk @@ -56,7 +56,7 @@ $(STAGING_DIR)/lib/libusb.so: $(LIBUSB_DIR)/.configured $(TARGET_DIR)/$(LIBUSB_BINARY): $(STAGING_DIR)/lib/libusb.so $(INSTALL) -D $(LIBUSB_DIR)/.libs/libusb*.so* $(STAGING_DIR)/usr/lib/ $(INSTALL) -D $(LIBUSB_DIR)/.libs/libusb*.so* $(TARGET_DIR)/usr/lib/ - $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libusb*.so* + $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libusb*.so* libusb: uclibc $(TARGET_DIR)/$(LIBUSB_BINARY) diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk index 412f2ec7b..4dc020643 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_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libxml2.so* + $(STRIPCMD) $(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 afb57cb7d..b74afa7d0 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -72,8 +72,8 @@ ifneq ($(BR2_HAVE_MANPAGES),y) rm -rf $(TARGET_DIR)/usr/share/man endif @rm -rf $(TARGET_DIR)/usr/lib/lighttpd/*.la - $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/lighttpd/*.so - $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(LIGHTTPD_TARGET_BINARY) + $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/lighttpd/*.so + $(STRIPCMD) $(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; \ diff --git a/package/links/links.mk b/package/links/links.mk index 67c51cf39..1c92fbb25 100644 --- a/package/links/links.mk +++ b/package/links/links.mk @@ -42,7 +42,7 @@ $(LINKS_DIR)/.configured: $(LINKS_DIR)/.unpacked $(LINKS_DIR)/links: $(LINKS_DIR)/.configured $(MAKE) CC=$(TARGET_CC) -C $(LINKS_DIR) - $(STRIP) $(LINKS_DIR)/links + $(STRIPCMD) $(LINKS_DIR)/links $(TARGET_DIR)/usr/bin/links: $(LINKS_DIR)/links install -c $(LINKS_DIR)/links $(TARGET_DIR)/usr/bin/links diff --git a/package/lm-sensors/lm-sensors.mk b/package/lm-sensors/lm-sensors.mk index 89e8f757a..c5217af4b 100644 --- a/package/lm-sensors/lm-sensors.mk +++ b/package/lm-sensors/lm-sensors.mk @@ -52,8 +52,8 @@ $(TARGET_DIR)/$(LM_SENSORS_TARGET_BINARY): $(LM_SENSORS_DIR)/$(LM_SENSORS_BINARY cp -dpf $(LM_SENSORS_DIR)/$(LM_SENSORS_BINARY) $@ cp -dpf $(LM_SENSORS_DIR)/lib/libsensors.so* \ $(LM_SENSORS_DIR)/lib/libsensors.a $(TARGET_DIR)/usr/lib/ - -$(STRIP) $(STRIP_STRIP_ALL) $(TARGET_DIR)/usr/lib/libsensors.so* - $(STRIP) $(STRIP_STRIP_ALL) $@ + -$(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/usr/lib/libsensors.so* + $(STRIPCMD) $(STRIP_STRIP_ALL) $@ lm-sensors: uclibc libsysfs $(TARGET_DIR)/$(LM_SENSORS_TARGET_BINARY) diff --git a/package/lockfile-progs/lockfile-progs.mk b/package/lockfile-progs/lockfile-progs.mk index 50b4a8eb4..42ef96cb6 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_STRIP_UNNEEDED) $(TARGET_DIR)/$(LOCKFILE_PROGS_BINARY) + $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(LOCKFILE_PROGS_BINARY) lockfile-progs: uclibc liblockfile $(TARGET_DIR)/$(LOCKFILE_PROGS_BINARY) diff --git a/package/lrzsz/lrzsz.mk b/package/lrzsz/lrzsz.mk index 30b2c0a89..41ab2af07 100644 --- a/package/lrzsz/lrzsz.mk +++ b/package/lrzsz/lrzsz.mk @@ -62,7 +62,7 @@ $(LRZSZ_DIR)/.configured: $(LRZSZ_DIR)/.unpacked $(LRZSZ_DIR)/src/lrz: $(LRZSZ_DIR)/.configured $(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" prefix="$(TARGET_DIR)" -C $(LRZSZ_DIR) - $(STRIP) $(LRZSZ_DIR)/src/lrz $(LRZSZ_DIR)/src/lsz + $(STRIPCMD) $(LRZSZ_DIR)/src/lrz $(LRZSZ_DIR)/src/lsz $(TARGET_DIR)/usr/bin/rz: $(LRZSZ_DIR)/src/lrz cp $(LRZSZ_DIR)/src/lrz $(TARGET_DIR)/usr/bin/rz diff --git a/package/lsof/lsof.mk b/package/lsof/lsof.mk index fe5148662..f9c85a06d 100644 --- a/package/lsof/lsof.mk +++ b/package/lsof/lsof.mk @@ -48,7 +48,7 @@ endif $(TARGET_DIR)/$(LSOF_TARGET_BINARY): $(LSOF_DIR)/lsof_$(LSOF_VERSION)_src/$(LSOF_BINARY) cp $(LSOF_DIR)/lsof_$(LSOF_VERSION)_src/$(LSOF_BINARY) $@ - $(STRIP) $@ + $(STRIPCMD) $@ lsof: uclibc $(TARGET_DIR)/$(LSOF_TARGET_BINARY) diff --git a/package/ltrace/ltrace.mk b/package/ltrace/ltrace.mk index 2a4a34ab2..c16076fec 100644 --- a/package/ltrace/ltrace.mk +++ b/package/ltrace/ltrace.mk @@ -63,7 +63,7 @@ ifeq ($(BR2_HAVE_MANPAGES),y) $(INSTALL) -D $(LTRACE_DIR)/ltrace.1 \ $(TARGET_DIR)/usr/share/man/man1/ltrace.1 endif - $(STRIP) $(STRIP_STRIP_ALL) $@ + $(STRIPCMD) $(STRIP_STRIP_ALL) $@ ltrace: uclibc libelf $(TARGET_DIR)/$(LTRACE_TARGET_BINARY) diff --git a/package/ltt/ltt.mk b/package/ltt/ltt.mk index 38d8664a5..b8d84ed75 100644 --- a/package/ltt/ltt.mk +++ b/package/ltt/ltt.mk @@ -96,7 +96,7 @@ $(TARGET_DIR)/usr/bin/tracedaemon: $(LTT_DIR2)/$(LTT_TARGET_BINARY) -C $(LTT_DIR2)/LibUserTrace install $(MAKE) $(TARGET_CONFIGURE_OPTS) DESTDIR=$(TARGET_DIR) \ -C $(LTT_DIR2)/Daemon install - $(STRIP) $(TARGET_DIR)/usr/bin/tracedaemon > /dev/null 2>&1 + $(STRIPCMD) $(TARGET_DIR)/usr/bin/tracedaemon > /dev/null 2>&1 $(INSTALL) -D -m 0755 package/ltt/S27tracer $(TARGET_DIR)/etc/init.d ltt-tracedaemon: uclibc $(TARGET_DIR)/usr/bin/tracedaemon diff --git a/package/lzma/lzma.mk b/package/lzma/lzma.mk index 934e49263..b6207c2c3 100644 --- a/package/lzma/lzma.mk +++ b/package/lzma/lzma.mk @@ -114,7 +114,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_STRIP_UNNEEDED) $@ + -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@ touch -c $@ #lzma-headers: $(TARGET_DIR)/$(LZMA_TARGET_BINARY) diff --git a/package/m4/m4.mk b/package/m4/m4.mk index c574ad2ea..5bf1cbdb6 100644 --- a/package/m4/m4.mk +++ b/package/m4/m4.mk @@ -67,7 +67,7 @@ $(TARGET_DIR)/$(M4_TARGET_BINARY): $(M4_DIR)/src/$(M4_BINARY) mandir=$(TARGET_DIR)/usr/share/man \ includedir=$(TARGET_DIR)/usr/include \ -C $(M4_DIR) install - $(STRIP) $(TARGET_DIR)/$(M4_TARGET_BINARY) > /dev/null 2>&1 + $(STRIPCMD) $(TARGET_DIR)/$(M4_TARGET_BINARY) > /dev/null 2>&1 ifneq ($(BR2_HAVE_INFOPAGES),y) rm -rf $(TARGET_DIR)/usr/share/info endif diff --git a/package/madplay/madplay.mk b/package/madplay/madplay.mk index c095e6442..fbba23ef0 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_STRIP_UNNEEDED) $(TARGET_DIR)/$(MADPLAY_TARGET_BIN) + $(STRIPCMD) $(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 6189c0abd..71c3c9b53 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_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libmb.so + -$(STRIPCMD) $(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_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/$(MATCHBOX_SNOTIFY_BIN) + -$(STRIPCMD) $(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_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/$(MATCHBOX_WM_BIN) + -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/$(MATCHBOX_WM_BIN) cp -dpf $(STAGING_DIR)/usr/bin/matchbox-remote $(TARGET_DIR)/usr/bin/ - -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/matchbox-remote + -$(STRIPCMD) $(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_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/$(MATCHBOX_SM_BIN) + -$(STRIPCMD) $(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_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/matchbox-session + -$(STRIPCMD) $(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_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/$(MATCHBOX_PL_BIN) + -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/$(MATCHBOX_PL_BIN) cp -dpf $(STAGING_DIR)/usr/bin/mb-applet-* $(TARGET_DIR)/usr/bin/ - -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/mb-applet-* + -$(STRIPCMD) $(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_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/$(MATCHBOX_DP_BIN) + -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/$(MATCHBOX_DP_BIN) cp -dpf $(STAGING_DIR)/usr/lib/dotdesktop.so $(TARGET_DIR)/usr/lib/ - -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/dotdesktop.so + -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/dotdesktop.so cp -dpf $(STAGING_DIR)/usr/lib/simplefilebrowser.so $(TARGET_DIR)/usr/lib/ - -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/simplefilebrowser.so + -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/simplefilebrowser.so cp -dpf $(STAGING_DIR)/usr/lib/tasks.so $(TARGET_DIR)/usr/lib/ - -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/tasks.so + -$(STRIPCMD) $(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_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/$(MATCHBOX_FK_BIN).so + -$(STRIPCMD) $(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_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/$(MATCHBOX_KB_BIN) + -$(STRIPCMD) $(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 65ba76d32..287187050 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) $(STRIP_STRIP_ALL) $@ + $(STRIPCMD) $(STRIP_STRIP_ALL) $@ mdadm: uclibc $(TARGET_DIR)/$(MDADM_TARGET_BINARY) diff --git a/package/memtester/memtester.mk b/package/memtester/memtester.mk index 6b3b6117a..06e9b10b2 100644 --- a/package/memtester/memtester.mk +++ b/package/memtester/memtester.mk @@ -23,7 +23,7 @@ $(MEMTESTER_DIR)/.unpacked: $(DL_DIR)/$(MEMTESTER_SOURCE) $(MEMTESTER_DIR)/$(MEMTESTER_BINARY): $(MEMTESTER_DIR)/.unpacked $(MAKE) -C $(MEMTESTER_DIR) - $(STRIP) $(MEMTESTER_DIR)/$(MEMTESTER_BINARY) + $(STRIPCMD) $(MEMTESTER_DIR)/$(MEMTESTER_BINARY) $(TARGET_DIR)/$(MEMTESTER_TARGET_BINARY): $(MEMTESTER_DIR)/$(MEMTESTER_BINARY) $(INSTALL) -m 0755 -D $(MEMTESTER_DIR)/$(MEMTESTER_BINARY) $(TARGET_DIR)/$(MEMTESTER_TARGET_BINARY) diff --git a/package/metacity/metacity.mk b/package/metacity/metacity.mk index b6fcb0494..9332f2644 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_STRIP_UNNEEDED) $(TARGET_DIR)/lib/*metacity*.so + -$(STRIPCMD) $(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 c64071190..b19053643 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) $(STRIP_STRIP_ALL) $@ + $(STRIPCMD) $(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/mkdosfs/mkdosfs.mk b/package/mkdosfs/mkdosfs.mk index 0f8e71bd2..399cecae1 100644 --- a/package/mkdosfs/mkdosfs.mk +++ b/package/mkdosfs/mkdosfs.mk @@ -27,7 +27,7 @@ $(MKDOSFS_DIR)/.unpacked: $(DL_DIR)/$(MKDOSFS_SOURCE) $(MKDOSFS_DIR)/$(MKDOSFS_BINARY): $(MKDOSFS_DIR)/.unpacked $(MAKE) CFLAGS="$(MKDOSFS_CFLAGS)" CC="$(TARGET_CC)" -C $(MKDOSFS_DIR) - $(STRIP) $(MKDOSFS_DIR)/mkdosfs/mkdosfs + $(STRIPCMD) $(MKDOSFS_DIR)/mkdosfs/mkdosfs touch -c $(MKDOSFS_DIR)/mkdosfs/mkdosfs $(TARGET_DIR)/$(MKDOSFS_TARGET_BINARY): $(MKDOSFS_DIR)/$(MKDOSFS_BINARY) diff --git a/package/module-init-tools/module-init-tools.mk b/package/module-init-tools/module-init-tools.mk index 501414a4c..5a0cdff8d 100644 --- a/package/module-init-tools/module-init-tools.mk +++ b/package/module-init-tools/module-init-tools.mk @@ -12,7 +12,7 @@ MODULE_INIT_TOOLS_DIR2=$(TOOL_BUILD_DIR)/module-init-tools-$(MODULE_INIT_TOOLS_V MODULE_INIT_TOOLS_BINARY=depmod MODULE_INIT_TOOLS_TARGET_BINARY=$(TARGET_DIR)/sbin/$(MODULE_INIT_TOOLS_BINARY) -STRIPPROG=$(STRIP) +STRIPPROG=$(STRIPCMD) $(DL_DIR)/$(MODULE_INIT_TOOLS_SOURCE): $(WGET) -P $(DL_DIR) $(MODULE_INIT_TOOLS_SITE)/$(MODULE_INIT_TOOLS_SOURCE) diff --git a/package/modutils/modutils.mk b/package/modutils/modutils.mk index 69af990a7..53255c19e 100644 --- a/package/modutils/modutils.mk +++ b/package/modutils/modutils.mk @@ -12,7 +12,7 @@ MODUTILS_DIR2=$(TOOL_BUILD_DIR)/modutils-$(MODUTILS_VERSION) MODUTILS_BINARY=depmod MODUTILS_TARGET_BINARY=sbin/$(MODUTILS_BINARY) -STRIPPROG=$(STRIP) +STRIPPROG=$(STRIPCMD) $(DL_DIR)/$(MODUTILS_SOURCE): $(WGET) -P $(DL_DIR) $(MODUTILS_SITE)/$(MODUTILS_SOURCE) diff --git a/package/mpfr/mpfr.mk b/package/mpfr/mpfr.mk index 10b78515b..94d6ef499 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_STRIP_UNNEEDED) $(STAGING_DIR)/usr/lib/libmpfr$(LIBTGTEXT)* + $(STRIPCMD) $(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 2660b706c..76977e280 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)/$(MPG123_BIN) $(TARGET_DIR)/$(MPG123_TARGET_BIN) - $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(MPG123_TARGET_BIN) + $(STRIPCMD) $(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 f9bd38b4b..8adb44051 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_STRIP_UNNEEDED) $(TARGET_DIR)/$(MPLAYER_TARGET_BINARY) + -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(MPLAYER_TARGET_BINARY) touch -c $@ mplayer: uclibc libmad $(TARGET_DIR)/$(MPLAYER_TARGET_BINARY) diff --git a/package/mtd/20050122/mtd.mk b/package/mtd/20050122/mtd.mk index a7b358dff..636ad6dbb 100644 --- a/package/mtd/20050122/mtd.mk +++ b/package/mtd/20050122/mtd.mk @@ -126,7 +126,7 @@ MTD_TARGETS := $(addprefix $(TARGET_DIR)/usr/sbin/, $(MTD_TARGETS_y)) $(MTD_TARGETS): $(TARGET_DIR)/usr/sbin/% : $(MTD_DIR)/util/% mkdir -p $(TARGET_DIR)/usr/sbin cp -f $< $@ - $(STRIP) $@ + $(STRIPCMD) $@ ifneq ($(BR2_PACKAGE_MTD_FLASHCP),) -ln -sf flashcp $(TARGET_DIR)/usr/sbin/fcp endif diff --git a/package/mtd/20061007/mtd.mk b/package/mtd/20061007/mtd.mk index e4645d605..db136ec03 100644 --- a/package/mtd/20061007/mtd.mk +++ b/package/mtd/20061007/mtd.mk @@ -91,7 +91,7 @@ MTD_TARGETS := $(addprefix $(TARGET_DIR)/usr/sbin/, $(MTD_TARGETS_y)) $(MTD_TARGETS): $(TARGET_DIR)/usr/sbin/% : $(MTD_DIR)/% cp -f $< $@ - $(STRIP) $@ + $(STRIPCMD) $@ mtd: zlib $(MTD_TARGETS) diff --git a/package/mtd/mtd-utils/mtd.mk b/package/mtd/mtd-utils/mtd.mk index 25864c48a..2274de923 100644 --- a/package/mtd/mtd-utils/mtd.mk +++ b/package/mtd/mtd-utils/mtd.mk @@ -97,7 +97,7 @@ MTD_TARGETS := $(addprefix $(TARGET_DIR)/usr/sbin/, $(MTD_TARGETS_y)) $(MTD_TARGETS): $(TARGET_DIR)/usr/sbin/% : $(MTD_DIR)/% cp -f $< $@ - $(STRIP) $@ + $(STRIPCMD) $@ mtd: zlib $(MTD_TARGETS) diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk index db7a1af62..971df9334 100644 --- a/package/mutt/mutt.mk +++ b/package/mutt/mutt.mk @@ -54,7 +54,7 @@ $(MUTT_DIR)/$(MUTT_BINARY): $(MUTT_DIR)/.configured $(TARGET_DIR)/$(MUTT_TARGET_BINARY): $(MUTT_DIR)/$(MUTT_BINARY) cp -dpf $(MUTT_DIR)/$(MUTT_BINARY) $@ - $(STRIP) $(STRIP_STRIP_ALL) $@ + $(STRIPCMD) $(STRIP_STRIP_ALL) $@ mutt: uclibc ncurses $(TARGET_DIR)/$(MUTT_TARGET_BINARY) diff --git a/package/nbd/nbd.mk b/package/nbd/nbd.mk index 3e1f32b73..65432bf2f 100644 --- a/package/nbd/nbd.mk +++ b/package/nbd/nbd.mk @@ -35,7 +35,7 @@ $(NBD_DIR)/nbd-client: $(NBD_DIR)/.configured $(TARGET_DIR)/sbin/nbd-client: $(NBD_DIR)/nbd-client cp $< $@ - $(STRIP) $@ + $(STRIPCMD) $@ nbd: uclibc $(TARGET_DIR)/sbin/nbd-client diff --git a/package/ncftp/ncftp.mk b/package/ncftp/ncftp.mk index 4169f80a7..82e371755 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) $(STRIP_STRIP_ALL) $@ + $(STRIPCMD) $(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 47b65d00b..f1a425a9f 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_STRIP_UNNEEDED) $@ + -$(STRIPCMD) $(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_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libncurses.so.$(NCURSES_VERSION) + -$(STRIPCMD) $(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 22eac03d2..37e66ce64 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) $(STRIP_STRIP_ALL) $@ + $(STRIPCMD) $(STRIP_STRIP_ALL) $@ netcat: uclibc $(TARGET_DIR)/$(NETCAT_TARGET_BINARY) diff --git a/package/netkitbase/netkitbase.mk b/package/netkitbase/netkitbase.mk index 3f781152c..afa58624b 100644 --- a/package/netkitbase/netkitbase.mk +++ b/package/netkitbase/netkitbase.mk @@ -34,7 +34,7 @@ $(NETKITBASE_DIR)/.configured: $(NETKITBASE_DIR)/.unpacked $(NETKITBASE_DIR)/$(NETKITBASE_BINARY): $(NETKITBASE_DIR)/.configured $(MAKE) CC=$(TARGET_CC) -C $(NETKITBASE_DIR) - $(STRIP) $(NETKITBASE_DIR)/$(NETKITBASE_BINARY) + $(STRIPCMD) $(NETKITBASE_DIR)/$(NETKITBASE_BINARY) $(TARGET_DIR)/$(NETKITBASE_TARGET_BINARY): $(NETKITBASE_DIR)/$(NETKITBASE_BINARY) # Only install a few selected items... diff --git a/package/netkittelnet/netkittelnet.mk b/package/netkittelnet/netkittelnet.mk index 58bdbac2e..2a053fbac 100644 --- a/package/netkittelnet/netkittelnet.mk +++ b/package/netkittelnet/netkittelnet.mk @@ -35,7 +35,7 @@ $(NETKITTELNET_DIR)/.configured: $(NETKITTELNET_DIR)/.unpacked $(NETKITTELNET_DIR)/$(NETKITTELNET_BINARY): $(NETKITTELNET_DIR)/.configured $(MAKE) SUB=telnetd CC=$(TARGET_CC) -C $(NETKITTELNET_DIR) - $(STRIP) $(NETKITTELNET_DIR)/$(NETKITTELNET_BINARY) + $(STRIPCMD) $(NETKITTELNET_DIR)/$(NETKITTELNET_BINARY) $(TARGET_DIR)/$(NETKITTELNET_TARGET_BINARY): $(NETKITTELNET_DIR)/$(NETKITTELNET_BINARY) # Only install a few selected items... diff --git a/package/netplug/netplug.mk b/package/netplug/netplug.mk index 501fe7f70..6bdee69e7 100644 --- a/package/netplug/netplug.mk +++ b/package/netplug/netplug.mk @@ -23,7 +23,7 @@ $(NETPLUG_DIR)/.unpacked: $(DL_DIR)/$(NETPLUG_SOURCE) $(NETPLUG_DIR)/$(NETPLUG_BINARY): $(NETPLUG_DIR)/.unpacked $(MAKE) CC=$(TARGET_CC) -C $(NETPLUG_DIR) - $(STRIP) $(NETPLUG_DIR)/$(NETPLUG_BINARY) + $(STRIPCMD) $(NETPLUG_DIR)/$(NETPLUG_BINARY) $(TARGET_DIR)/$(NETPLUG_TARGET_BINARY): $(NETPLUG_DIR)/$(NETPLUG_BINARY) $(INSTALL) -m 644 -D $(NETPLUG_DIR)/etc/netplugd.conf $(TARGET_DIR)/etc/netplug/netplugd.conf diff --git a/package/newt/newt.mk b/package/newt/newt.mk index cf04b32f4..b88a32dcc 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_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libnewt.so* + -$(STRIPCMD) $(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/olsr/olsr.mk b/package/olsr/olsr.mk index a68da10e9..35c88fbc6 100644 --- a/package/olsr/olsr.mk +++ b/package/olsr/olsr.mk @@ -38,8 +38,8 @@ $(TARGET_DIR)/$(OLSR_TARGET_BINARY): $(OLSR_DIR)/$(OLSR_BINARY) cp -dpf package/olsr/S50olsr $(TARGET_DIR)/etc/init.d/ test -r $(TARGET_DIR)/etc/olsrd.conf || \ cp -dpf $(OLSR_DIR)/files/olsrd.conf.default.lq $(TARGET_DIR)/etc/olsrd.conf - -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(OLSR_TARGET_PLUGIN)/olsrd_*.so* - $(STRIP) $(STRIP_STRIP_ALL) $@ + -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(OLSR_TARGET_PLUGIN)/olsrd_*.so* + $(STRIPCMD) $(STRIP_STRIP_ALL) $@ olsr: uclibc $(TARGET_DIR)/$(OLSR_TARGET_BINARY) diff --git a/package/openntpd/openntpd.mk b/package/openntpd/openntpd.mk index e8e1231bc..8c6bfda83 100644 --- a/package/openntpd/openntpd.mk +++ b/package/openntpd/openntpd.mk @@ -47,12 +47,12 @@ $(OPENNTPD_DIR)/$(OPENNTPD_BINARY): $(OPENNTPD_DIR)/.configured # ntpd.c buffer.c log.c imsg.c ntp.c ntp_msg.c y.tab.c config.c \ # server.c client.c sensors.c util.c; \ #) - $(STRIP) $@ + $(STRIPCMD) $@ $(TARGET_DIR)/$(OPENNTPD_TARGET_BINARY): $(OPENNTPD_DIR)/$(OPENNTPD_BINARY) rm -f $(TARGET_DIR)/etc/ntpd.conf $(MAKE) DESTDIR=$(TARGET_DIR) STRIP_OPT="" -C $(OPENNTPD_DIR) install - -$(STRIP) $(TARGET_DIR)/$(OPENNTPD_TARGET_BINARY) + -$(STRIPCMD) $(TARGET_DIR)/$(OPENNTPD_TARGET_BINARY) cp -af $(OPENNTPD_DIR)/ntpd.conf $(TARGET_DIR)/etc/ntpd.conf ifneq ($(BR2_HAVE_MANPAGES),y) rm -Rf $(TARGET_DIR)/usr/share/man diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index afe8699a2..6881bc421 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -49,17 +49,17 @@ $(OPENSSH_DIR)/.configured: $(OPENSSH_DIR)/.unpacked $(OPENSSH_DIR)/ssh: $(OPENSSH_DIR)/.configured $(MAKE) -C $(OPENSSH_DIR) - -$(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 + -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(OPENSSH_DIR)/scp + -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(OPENSSH_DIR)/sftp + -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(OPENSSH_DIR)/sftp-server + -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(OPENSSH_DIR)/ssh + -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(OPENSSH_DIR)/ssh-add + -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(OPENSSH_DIR)/ssh-agent + -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(OPENSSH_DIR)/ssh-keygen + -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(OPENSSH_DIR)/ssh-keyscan + -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(OPENSSH_DIR)/ssh-keysign + -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(OPENSSH_DIR)/ssh-rand-helper + -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(OPENSSH_DIR)/sshd $(TARGET_DIR)/usr/bin/ssh: $(OPENSSH_DIR)/ssh $(MAKE) DESTDIR=$(TARGET_DIR) -C $(OPENSSH_DIR) install diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk index eabaf2ad3..259b5f159 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_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libssl.so.0.9.7 - -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libcrypto.so.0.9.7 + -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libssl.so.0.9.7 + -$(STRIPCMD) $(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 85fd61619..09cde5f5e 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_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.* + $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libpango-1.0.so.0.* + $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libpangox-1.0.so.0.* + $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libpangoft2-1.0.so.0.* + $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libpangoxft-1.0.so.0.* + $(STRIPCMD) $(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/pcmcia/pcmcia.mk b/package/pcmcia/pcmcia.mk index 2304463c3..85ebee724 100644 --- a/package/pcmcia/pcmcia.mk +++ b/package/pcmcia/pcmcia.mk @@ -55,7 +55,7 @@ $(PCMCIA_DIR)/cardmgr/cardmgr: $(PCMCIA_DIR)/.configured for fo in $$A; do \ file $$fo | grep "ELF" | grep "executable" > /dev/null 2>&1; \ if [ $$? = 0 ]; then \ - $(STRIP) $$fo; \ + $(STRIPCMD) $$fo; \ fi; \ done touch -c $(PCMCIA_DIR)/cardmgr/cardmgr diff --git a/package/php/php.mk b/package/php/php.mk index 2912fcbcf..e16085095 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_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/php + $(STRIPCMD) $(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_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/php-cgi + $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/php-cgi $(TARGET_DIR)/etc/php.ini: $(PHP_DIR)/.staged cp -f $(PHP_DIR)/php.ini-dist $(TARGET_DIR)/etc/php.ini diff --git a/package/pptp-linux/pptp-linux.mk b/package/pptp-linux/pptp-linux.mk index e4e7cc731..9cdd093c4 100644 --- a/package/pptp-linux/pptp-linux.mk +++ b/package/pptp-linux/pptp-linux.mk @@ -55,7 +55,7 @@ ifeq ($(BR2_HAVE_MANPAGES),y) mkdir -p $(TARGET_DIR)/usr/share/man/man8 $(INSTALL) -m 644 $(PPTP_LINUX_DIR)/pptp.8 $(TARGET_DIR)/usr/share/man/man8/pptp.8 endif - $(STRIP) $(STRIP_STRIP_ALL) $@ + $(STRIPCMD) $(STRIP_STRIP_ALL) $@ pptp-linux: uclibc $(TARGET_DIR)/$(PPTP_LINUX_TARGET_BINARY) diff --git a/package/qtopia4/qtopia4.mk b/package/qtopia4/qtopia4.mk index 2f849d82f..bc07cf45c 100644 --- a/package/qtopia4/qtopia4.mk +++ b/package/qtopia4/qtopia4.mk @@ -235,13 +235,13 @@ $(TARGET_DIR)/usr/lib/libQtCore.so.$(QTOPIA4_VERSION): $(QTOPIA4_TARGET_DIR)/lib if [ -d $(QTOPIA4_TARGET_DIR)/plugins/imageformats ]; then \ mkdir -p $(TARGET_DIR)/usr/lib/qt4/plugins; \ cp -dpfr $(QTOPIA4_TARGET_DIR)/plugins/imageformats $(TARGET_DIR)/usr/lib/qt4/plugins; \ - $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/qt4/plugins/imageformats/*; \ + $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/qt4/plugins/imageformats/*; \ fi # Remove Sql libraries, not needed -rm $(TARGET_DIR)/usr/lib/libQtSql* # Remove Svg libraries, not needed -rm $(TARGET_DIR)/usr/lib/libQtSvg* - -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libQt*.so.$(QTOPIA4_VERSION) + -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libQt*.so.$(QTOPIA4_VERSION) ################################# # diff --git a/package/rp-pppoe/rp-pppoe.mk b/package/rp-pppoe/rp-pppoe.mk index 27353d3bd..b798c71b4 100644 --- a/package/rp-pppoe/rp-pppoe.mk +++ b/package/rp-pppoe/rp-pppoe.mk @@ -57,7 +57,7 @@ ifeq ($(BR2_HAVE_MANPAGES),y) mkdir -p $(TARGET_DIR)/usr/share/man/man8 $(INSTALL) -m 644 $(RP_PPPOE_TOPDIR)/man/pppoe.8 $(TARGET_DIR)/usr/share/man/man8/pppoe.8 endif - $(STRIP) $(STRIP_STRIP_ALL) $@ + $(STRIPCMD) $(STRIP_STRIP_ALL) $@ rp-pppoe: uclibc $(TARGET_DIR)/$(RP_PPPOE_TARGET_BINARY) diff --git a/package/rxvt/rxvt.mk b/package/rxvt/rxvt.mk index 7cbbe7ad1..af0793cf3 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) $(STRIP_DISCARD_ALL) $(RXVT_BINARY) + $(STRIPCMD) $(STRIP_DISCARD_ALL) $(RXVT_BINARY) $(TARGET_DIR)$(X11_PREFIX)/bin/rxvt: $(RXVT_BINARY) cp -f $(RXVT_BINARY) $(TARGET_DIR)$(X11_PREFIX)/bin diff --git a/package/samba/samba.mk b/package/samba/samba.mk index 84773bc30..73adc8ba7 100644 --- a/package/samba/samba.mk +++ b/package/samba/samba.mk @@ -92,9 +92,9 @@ $(TARGET_DIR)/$(SAMBA_TARGET_BINARY): $(SAMBA_DIR)/$(SAMBA_BINARY) for file in $(SAMBA_TARGETS_); do \ rm -f $(TARGET_DIR)/$$file; \ done - $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(SAMBA_TARGET_BINARY) + $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(SAMBA_TARGET_BINARY) for file in $(SAMBA_TARGETS_y); do \ - $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$$file; \ + $(STRIPCMD) $(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 ad64e90fa..fb1eb8c75 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_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libSDL.so + -$(STRIPCMD) $(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 962ae60b6..9cec03aa0 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) $(STRIP_STRIP_ALL) $(TARGET_DIR)/$(SETSERIAL_TARGET_BINARY) + $(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/$(SETSERIAL_TARGET_BINARY) setserial: uclibc $(TARGET_DIR)/$(SETSERIAL_TARGET_BINARY) diff --git a/package/sfdisk/sfdisk.mk b/package/sfdisk/sfdisk.mk index 6cf05b4ec..798b1d370 100644 --- a/package/sfdisk/sfdisk.mk +++ b/package/sfdisk/sfdisk.mk @@ -22,7 +22,7 @@ $(SFDISK_DIR)/sfdisk: $(SFDISK_DIR)/.patched $(MAKE) \ CROSS=$(TARGET_CROSS) DEBUG=false OPTIMIZATION="$(TARGET_CFLAGS)" \ -C $(SFDISK_DIR) - -$(STRIP) $(SFDISK_DIR)/sfdisk + -$(STRIPCMD) $(SFDISK_DIR)/sfdisk touch -c $(SFDISK_DIR)/sfdisk $(TARGET_DIR)/sbin/sfdisk: $(SFDISK_DIR)/sfdisk diff --git a/package/slang/slang.mk b/package/slang/slang.mk index 13df0ee36..e776b72db 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_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libslang.so* + -$(STRIPCMD) $(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/smartmontools/smartmontools.mk b/package/smartmontools/smartmontools.mk index 064e8decf..962dd9f25 100644 --- a/package/smartmontools/smartmontools.mk +++ b/package/smartmontools/smartmontools.mk @@ -49,8 +49,8 @@ $(SMARTMONTOOLS_DIR)/.configured: $(SMARTMONTOOLS_DIR)/.unpacked $(SMARTMONTOOLS_DIR)/$(SMARTMONTOOLS_BINARY): $(SMARTMONTOOLS_DIR)/.configured $(MAKE) -C $(SMARTMONTOOLS_DIR) - $(STRIP) $(SMARTMONTOOLS_DIR)/$(SMARTMONTOOLS_BINARY) - $(STRIP) $(SMARTMONTOOLS_DIR)/$(SMARTMONTOOLS_BINARY2) + $(STRIPCMD) $(SMARTMONTOOLS_DIR)/$(SMARTMONTOOLS_BINARY) + $(STRIPCMD) $(SMARTMONTOOLS_DIR)/$(SMARTMONTOOLS_BINARY2) touch -c $(SMARTMONTOOLS_DIR)/$(SMARTMONTOOLS_BINARY) $(TARGET_DIR)/$(SMARTMONTOOLS_TARGET_BINARY): $(SMARTMONTOOLS_DIR)/$(SMARTMONTOOLS_BINARY) diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index e4b981fcd..e9bb5f8f5 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_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libsqlite3.so* + $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libsqlite3.so* sqlite: uclibc readline-target ncurses $(TARGET_DIR)/usr/bin/sqlite3 diff --git a/package/strace/strace.mk b/package/strace/strace.mk index 1e9109dac..521849017 100644 --- a/package/strace/strace.mk +++ b/package/strace/strace.mk @@ -57,7 +57,7 @@ $(STRACE_DIR)/strace: $(STRACE_DIR)/.configured $(TARGET_DIR)/usr/bin/strace: $(STRACE_DIR)/strace install -c $(STRACE_DIR)/strace $(TARGET_DIR)/usr/bin/strace - $(STRIP) $(TARGET_DIR)/usr/bin/strace > /dev/null 2>&1 + $(STRIPCMD) $(TARGET_DIR)/usr/bin/strace > /dev/null 2>&1 ifeq ($(strip $(BR2_CROSS_TOOLCHAIN_TARGET_UTILS)),y) mkdir -p $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/target_utils install -c $(TARGET_DIR)/usr/bin/strace \ diff --git a/package/stunnel/stunnel.mk b/package/stunnel/stunnel.mk index 02d15f2a2..08db45719 100644 --- a/package/stunnel/stunnel.mk +++ b/package/stunnel/stunnel.mk @@ -55,7 +55,7 @@ $(STUNNEL_DIR)/src/stunnel: $(STUNNEL_DIR)/.configured $(TARGET_DIR)/usr/bin/stunnel: $(STUNNEL_DIR)/src/stunnel install -c $(STUNNEL_DIR)/src/stunnel $(TARGET_DIR)/usr/bin/stunnel - $(STRIP) $(TARGET_DIR)/usr/bin/stunnel > /dev/null 2>&1 + $(STRIPCMD) $(TARGET_DIR)/usr/bin/stunnel > /dev/null 2>&1 ifeq ($(strip $(BR2_CROSS_TOOLCHAIN_TARGET_UTILS)),y) mkdir -p $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/target_utils install -c $(TARGET_DIR)/usr/bin/stunnel \ diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk index b7e22f712..c684ea7fb 100644 --- a/package/sudo/sudo.mk +++ b/package/sudo/sudo.mk @@ -59,7 +59,7 @@ $(TARGET_DIR)/usr/bin/sudo: $(SUDO_DIR)/sudo $(INSTALL) -m 4555 -D $(SUDO_DIR)/sudo $(TARGET_DIR)/usr/bin/sudo $(INSTALL) -m 0555 -D $(SUDO_DIR)/visudo $(TARGET_DIR)/usr/sbin/visudo $(INSTALL) -m 0440 -D $(SUDO_DIR)/sudoers $(TARGET_DIR)/etc/sudoers - $(STRIP) $(TARGET_DIR)/usr/bin/sudo $(TARGET_DIR)/usr/sbin/visudo + $(STRIPCMD) $(TARGET_DIR)/usr/bin/sudo $(TARGET_DIR)/usr/sbin/visudo touch -c $(TARGET_DIR)/usr/bin/sudo sudo: uclibc $(TARGET_DIR)/usr/bin/sudo diff --git a/package/sysklogd/sysklogd.mk b/package/sysklogd/sysklogd.mk index f34fb3f3d..40d71ee23 100644 --- a/package/sysklogd/sysklogd.mk +++ b/package/sysklogd/sysklogd.mk @@ -26,8 +26,8 @@ $(SYSKLOGD_DIR)/.unpacked: $(DL_DIR)/$(SYSKLOGD_SOURCE) $(SYSKLOGD_DIR)/$(SYSKLOGD_BINARY): $(SYSKLOGD_DIR)/.unpacked $(MAKE) CC=$(TARGET_CC) -C $(SYSKLOGD_DIR) - $(STRIP) $(SYSKLOGD_DIR)/$(SYSKLOGD_SYSLOGD_BINARY) - $(STRIP) $(SYSKLOGD_DIR)/$(SYSKLOGD_KLOGD_BINARY) + $(STRIPCMD) $(SYSKLOGD_DIR)/$(SYSKLOGD_SYSLOGD_BINARY) + $(STRIPCMD) $(SYSKLOGD_DIR)/$(SYSKLOGD_KLOGD_BINARY) $(TARGET_DIR)/$(SYSKLOGD_TARGET_BINARY): $(SYSKLOGD_DIR)/$(SYSKLOGD_BINARY) $(INSTALL) -m 0755 -D $(SYSKLOGD_DIR)/$(SYSKLOGD_SYSLOGD_BINARY) $(TARGET_DIR)/$(SYSKLOGD_SYSLOGD_TARGET_BINARY) diff --git a/package/tcl/tcl.mk b/package/tcl/tcl.mk index f0adb9026..c5f1fc0df 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_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libtcl8.4.so + -$(STRIPCMD) $(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/tcpdump/tcpdump.mk b/package/tcpdump/tcpdump.mk index fb0953c10..34f5c71d9 100644 --- a/package/tcpdump/tcpdump.mk +++ b/package/tcpdump/tcpdump.mk @@ -57,7 +57,7 @@ $(TCPDUMP_DIR)/tcpdump: $(TCPDUMP_DIR)/.configured $(TARGET_DIR)/usr/sbin/tcpdump: $(TCPDUMP_DIR)/tcpdump cp -f $< $@ - $(STRIP) $@ + $(STRIPCMD) $@ tcpdump: uclibc zlib libpcap $(TARGET_DIR)/usr/sbin/tcpdump diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index b8a867ea3..2c3121083 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_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libtiff.so.$(TIFF_VERSION) + -$(STRIPCMD) $(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 f037c7255..812feb220 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_STRIP_UNNEEDED) $(TARGET_DIR)/$(TINYHTTPD_TARGET_BINARY) + $(STRIPCMD) $(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/tinyx-old/tinyx.mk b/package/tinyx-old/tinyx.mk index dcbf5a9f7..87074d200 100644 --- a/package/tinyx-old/tinyx.mk +++ b/package/tinyx-old/tinyx.mk @@ -116,10 +116,10 @@ $(TINYX_BINX)/Xfbdev: $(TINYX_XFBDEV) -mkdir $(TINYX_BINX) for file in $(TINYX_APPS); do \ cp -f $(TINYX_DIR)/programs/$$file $(TINYX_BINX); \ - $(STRIP) $(TINYX_PROGS)/$$file; \ + $(STRIPCMD) $(TINYX_PROGS)/$$file; \ done cp $(TINYX_DIR)/programs/Xserver/Xfbdev $(TINYX_BINX) - $(STRIP) $(TINYX_BINX)/Xfbdev + $(STRIPCMD) $(TINYX_BINX)/Xfbdev cp -f $(TINYX_DIR)/startx $(TARGET_DIR)/bin chmod a+x $(TARGET_DIR)/bin/startx @@ -128,7 +128,7 @@ $(TINYX_BINX)/Xfbdev: $(TINYX_XFBDEV) $(TINYX_LIBX)/libX11.so.6.2: $(TINYX_XFBDEV) for dirs in $(TINYX_LIBS); do \ file=`find $(TINYX_LDIR)/$$dirs -type f -iname "lib$$dirs.so*"`; \ - $(STRIP) --strip-unneeded $$file; \ + $(STRIPCMD) --strip-unneeded $$file; \ cp -f $$file $(TINYX_LIBX); \ file=`find $(TINYX_LDIR)/$$dirs -type l -iname "lib$$dirs.so*"`; \ cp -pRf $$file $(TINYX_LIBX); \ diff --git a/package/tinyx/tinyx.mk b/package/tinyx/tinyx.mk index 2457330b5..1e6f51147 100644 --- a/package/tinyx/tinyx.mk +++ b/package/tinyx/tinyx.mk @@ -116,10 +116,10 @@ $(TINYX_BINX)/Xfbdev: $(TINYX_XFBDEV) -mkdir $(TINYX_BINX) for file in $(TINYX_APPS); do \ cp -f $(TINYX_DIR)/programs/$$file $(TINYX_BINX); \ - $(STRIP) $(TINYX_PROGS)/$$file; \ + $(STRIPCMD) $(TINYX_PROGS)/$$file; \ done cp $(TINYX_DIR)/programs/Xserver/Xfbdev $(TINYX_BINX) - $(STRIP) $(TINYX_BINX)/Xfbdev + $(STRIPCMD) $(TINYX_BINX)/Xfbdev cp -f $(TINYX_DIR)/startx $(TARGET_DIR)/bin chmod a+x $(TARGET_DIR)/bin/startx @@ -128,7 +128,7 @@ $(TINYX_BINX)/Xfbdev: $(TINYX_XFBDEV) $(TINYX_LIBX)/libX11.so.6.2: $(TINYX_XFBDEV) for dirs in $(TINYX_LIBS); do \ file=`find $(TINYX_LDIR)/$$dirs -type f -iname "lib$$dirs.so*"`; \ - $(STRIP) --strip-unneeded $$file; \ + $(STRIPCMD) --strip-unneeded $$file; \ cp -f $$file $(TINYX_LIBX); \ file=`find $(TINYX_LDIR)/$$dirs -type l -iname "lib$$dirs.so*"`; \ cp -pRf $$file $(TINYX_LIBX); \ diff --git a/package/tslib/tslib.mk b/package/tslib/tslib.mk index 60928bad3..5b8dcaed3 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_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libts.so* - -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(STAGING_DIR)/usr/lib/ts/*.so + -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libts.so* + -$(STRIPCMD) $(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_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/ts_calibrate + -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/ts_calibrate cp -dpf $(STAGING_DIR)/usr/bin/ts_finddev $(TARGET_DIR)/usr/bin/ - -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/ts_finddev + -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/ts_finddev cp -dpf $(STAGING_DIR)/usr/bin/inputattach $(TARGET_DIR)/usr/bin/ - -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/inputattach + -$(STRIPCMD) $(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 fd2c8bdc3..1cfa06afb 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_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION) + $(STRIPCMD) $(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_STRIP_UNNEEDED) $(TARGET_DIR)/lib/udev/scsi_id + $(STRIPCMD) $(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_STRIP_UNNEEDED) $(TARGET_DIR)/lib/udev/usb_id + $(STRIPCMD) $(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/uemacs/uemacs.mk b/package/uemacs/uemacs.mk index 9163a4ab9..5abe943ee 100644 --- a/package/uemacs/uemacs.mk +++ b/package/uemacs/uemacs.mk @@ -24,7 +24,7 @@ $(UEMACS_DIR)/.unpacked: $(DL_DIR)/$(UEMACS_SOURCE) $(UEMACS_DIR)/$(UEMACS_BINARY): $(UEMACS_DIR)/.unpacked $(MAKE) -C $(UEMACS_DIR) \ CC="$(TARGET_CC)" DEFINES="-DAUTOCONF -DPOSIX -DUSG" CFLAGS+="$(TARGET_CFLAGS) " LIBS=-lncurses - $(STRIP) $(UEMACS_DIR)/$(UEMACS_BINARY) + $(STRIPCMD) $(UEMACS_DIR)/$(UEMACS_BINARY) $(TARGET_DIR)/$(UEMACS_TARGET_BINARY): $(UEMACS_DIR)/$(UEMACS_BINARY) $(INSTALL) -m 0755 -D $(UEMACS_DIR)/$(UEMACS_BINARY) $(TARGET_DIR)/$(UEMACS_TARGET_BINARY) diff --git a/package/valgrind/valgrind.mk b/package/valgrind/valgrind.mk index 9e5e1f560..9385aab9e 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_STRIP_UNNEEDED) $(VALGRIND_DIR)/*.so* + -$(STRIPCMD) $(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 c8bc642fc..114c02673 100644 --- a/package/vpnc/vpnc.mk +++ b/package/vpnc/vpnc.mk @@ -40,7 +40,7 @@ $(VPNC_TARGET_BINARY): $(VPNC_BINARY) INCLUDE=$(STAGING_DIR)/usr/include \ LDFLAGS="-lgcrypt -lgpg-error" \ -C $(VPNC_DIR) install - $(STRIP) $(STRIP_STRIP_UNNEEDED) $(VPNC_TARGET_BINARY) + $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(VPNC_TARGET_BINARY) vpnc: uclibc libgcrypt $(VPNC_TARGET_BINARY) diff --git a/package/wireless-tools/wireless-tools.mk b/package/wireless-tools/wireless-tools.mk index c89643331..c86c4f4dc 100644 --- a/package/wireless-tools/wireless-tools.mk +++ b/package/wireless-tools/wireless-tools.mk @@ -20,7 +20,7 @@ $(DL_DIR)/$(WIRELESS_TOOLS_SOURCE): $(WIRELESS_TOOLS_BUILD_DIR)/.unpacked: $(DL_DIR)/$(WIRELESS_TOOLS_SOURCE) $(ZCAT) $(DL_DIR)/$(WIRELESS_TOOLS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - sed -i -e s:'strip':'$(STRIP)':g $(WIRELESS_TOOLS_BUILD_DIR)/Makefile + sed -i -e s:'strip':'$(STRIPCMD)':g $(WIRELESS_TOOLS_BUILD_DIR)/Makefile touch $(WIRELESS_TOOLS_BUILD_DIR)/.unpacked $(WIRELESS_TOOLS_BUILD_DIR)/.configured: $(WIRELESS_TOOLS_BUILD_DIR)/.unpacked diff --git a/package/xerces/xerces.mk b/package/xerces/xerces.mk index 41c963538..56e4b6bcc 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_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libxerces-c.so.27.0 - $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libxerces-depdom.so.27.0 + $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libxerces-c.so.27.0 + $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libxerces-depdom.so.27.0 xerces: uclibc $(TARGET_DIR)/usr/$(XERCES_BINARY) diff --git a/package/xfsprogs/xfsprogs.mk b/package/xfsprogs/xfsprogs.mk index 4a6b7b38b..40928defe 100644 --- a/package/xfsprogs/xfsprogs.mk +++ b/package/xfsprogs/xfsprogs.mk @@ -57,17 +57,17 @@ $(XFSPROGS_DIR)/$(XFSPROGS_BINARY): $(XFSPROGS_DIR)/.configured ifeq ($(XFSPROGS_CONFIG_SHARED),--enable-shared) ( \ cd $(XFSPROGS_DIR); \ - $(STRIP) $(XFSPROGS_STRIP); \ - $(STRIP) $(join $(dir $(XFSPROGS_STRIP_LIBDEP)), \ + $(STRIPCMD) $(XFSPROGS_STRIP); \ + $(STRIPCMD) $(join $(dir $(XFSPROGS_STRIP_LIBDEP)), \ $(addprefix .libs/,$(notdir $(XFSPROGS_STRIP_LIBDEP)))) \ ) - $(STRIP) $(XFSPROGS_DIR)/lib*/.libs/lib*.so.*.* + $(STRIPCMD) $(XFSPROGS_DIR)/lib*/.libs/lib*.so.*.* else ( \ cd $(XFSPROGS_DIR); \ - $(STRIP) $(XFSPROGS_STRIP) $(XFSPROGS_STRIP_LIBDEP) \ + $(STRIPCMD) $(XFSPROGS_STRIP) $(XFSPROGS_STRIP_LIBDEP) \ ) - $(STRIP) $(XFSPROGS_DIR)/lib*/lib*.so.*.* + $(STRIPCMD) $(XFSPROGS_DIR)/lib*/lib*.so.*.* endif touch -c $(XFSPROGS_DIR)/$(XFSPROGS_BINARY) diff --git a/package/xorg/xorg.mk b/package/xorg/xorg.mk index 45c7cf129..ae258989b 100644 --- a/package/xorg/xorg.mk +++ b/package/xorg/xorg.mk @@ -125,11 +125,11 @@ $(TARGET_XSERVER): $(XORG_XSERVER) for file in $(XORG_APPS); do \ cp -f $(XORG_DIR)/programs/$$file $(XORG_BINX); \ chmod a+x $(XORG_PROGS)/$$file; \ - $(STRIP) $(XORG_PROGS)/$$file || /bin/true; \ + $(STRIPCMD) $(XORG_PROGS)/$$file || /bin/true; \ done cp $(XORG_XSERVER) $(TARGET_XSERVER) (cd $(XORG_BINX); ln -snf $(XSERVER_BINARY) X) - $(STRIP) $(TARGET_XSERVER) + $(STRIPCMD) $(TARGET_XSERVER) mkdir -p $(XORG_LIBX)/modules cp -LRf $(XORG_DIR)/exports/lib/modules/ $(XORG_LIBX)/ ( cd $(XORG_DIR)/fonts; $(MAKE) \ @@ -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_STRIP_UNNEEDED) $$file; \ + $(STRIPCMD) $(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 a70774280..2ffe8381a 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_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libz.so* + -$(STRIPCMD) $(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) diff --git a/target/cloop/cloop.mk b/target/cloop/cloop.mk index 5f55bf5a9..91ff55941 100644 --- a/target/cloop/cloop.mk +++ b/target/cloop/cloop.mk @@ -74,7 +74,7 @@ check-tools: - which symlinks clooproot: cloop check-tools $(IMAGE).cramfs ### cramfsroot - -@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true + -@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIPCMD) 2>/dev/null || true ifneq ($(BR2_HAVE_MANPAGES),y) @rm -rf $(TARGET_DIR)/usr/man @rm -rf $(TARGET_DIR)/usr/share/man diff --git a/target/cpio/cpioroot.mk b/target/cpio/cpioroot.mk index b1d117c08..3a8d03a0f 100644 --- a/target/cpio/cpioroot.mk +++ b/target/cpio/cpioroot.mk @@ -37,7 +37,7 @@ cpioroot-init: ln -s sbin/init $(TARGET_DIR)/init $(CPIO_BASE): host-fakeroot makedevs cpioroot-init - -@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true + -@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIPCMD) 2>/dev/null || true ifneq ($(BR2_HAVE_MANPAGES),y) @rm -rf $(TARGET_DIR)/usr/man endif diff --git a/target/cramfs/cramfs.mk b/target/cramfs/cramfs.mk index 9a5e22cf1..d7f358d5c 100644 --- a/target/cramfs/cramfs.mk +++ b/target/cramfs/cramfs.mk @@ -48,8 +48,8 @@ endif CRAMFS_TARGET=$(IMAGE).cramfs cramfsroot: host-fakeroot makedevs cramfs - #-@find $(TARGET_DIR)/lib -type f -name \*.so\* | xargs $(STRIP) --strip-unneeded 2>/dev/null || true - -@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true + #-@find $(TARGET_DIR)/lib -type f -name \*.so\* | xargs $(STRIPCMD) --strip-unneeded 2>/dev/null || true + -@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIPCMD) 2>/dev/null || true ifneq ($(BR2_HAVE_MANPAGES),y) @rm -rf $(TARGET_DIR)/usr/man endif diff --git a/target/device/Atmel/u-boot/u-boot.mk b/target/device/Atmel/u-boot/u-boot.mk index c89ac39b9..94941dcfc 100644 --- a/target/device/Atmel/u-boot/u-boot.mk +++ b/target/device/Atmel/u-boot/u-boot.mk @@ -213,7 +213,7 @@ uboot-new: UBOOT_TARGET:=$(IMAGE).uboot ubootroot: host-fakeroot makedevs uboot - -@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true + -@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIPCMD) 2>/dev/null || true @rm -rf $(TARGET_DIR)/usr/man @rm -rf $(TARGET_DIR)/usr/info -/sbin/ldconfig -r $(TARGET_DIR) 2>/dev/null diff --git a/target/ext2/ext2root.mk b/target/ext2/ext2root.mk index 779ffd9bb..574f30cbf 100644 --- a/target/ext2/ext2root.mk +++ b/target/ext2/ext2root.mk @@ -87,7 +87,7 @@ EXT2_TARGET := $(EXT2_BASE) endif $(EXT2_BASE): host-fakeroot makedevs genext2fs - -@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true + -@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIPCMD) 2>/dev/null || true ifneq ($(BR2_HAVE_MANPAGES),y) @rm -rf $(TARGET_DIR)/usr/man @rm -rf $(TARGET_DIR)/usr/share/man diff --git a/target/initramfs/initramfs.mk b/target/initramfs/initramfs.mk index 28703d672..07f5ec356 100644 --- a/target/initramfs/initramfs.mk +++ b/target/initramfs/initramfs.mk @@ -15,7 +15,7 @@ endif $(INITRAMFS_TARGET) initramfs: host-fakeroot makedevs rm -f $(TARGET_DIR)/init ln -s sbin/init $(TARGET_DIR)/init - -find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true + -find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIPCMD) 2>/dev/null || true ifneq ($(BR2_HAVE_MANPAGES),y) rm -rf $(TARGET_DIR)/usr/man endif diff --git a/target/jffs2/jffs2root.mk b/target/jffs2/jffs2root.mk index de93213b9..6937b8f9d 100644 --- a/target/jffs2/jffs2root.mk +++ b/target/jffs2/jffs2root.mk @@ -49,7 +49,7 @@ endif # just built. # $(JFFS2_TARGET): host-fakeroot makedevs mtd-host - -@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true + -@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIPCMD) 2>/dev/null || true ifneq ($(BR2_HAVE_MANPAGES),y) @rm -rf $(TARGET_DIR)/usr/man @rm -rf $(TARGET_DIR)/usr/share/man diff --git a/target/squashfs/squashfsroot.mk b/target/squashfs/squashfsroot.mk index a324460b2..2d185d1f3 100644 --- a/target/squashfs/squashfsroot.mk +++ b/target/squashfs/squashfsroot.mk @@ -44,7 +44,7 @@ endif SQUASHFS_TARGET:=$(IMAGE).squashfs squashfsroot: host-fakeroot makedevs squashfs - -@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true + -@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIPCMD) 2>/dev/null || true ifneq ($(BR2_HAVE_MANPAGES),y) @rm -rf $(TARGET_DIR)/usr/man endif diff --git a/target/tar/tarroot.mk b/target/tar/tarroot.mk index d471548fb..913cf82a1 100644 --- a/target/tar/tarroot.mk +++ b/target/tar/tarroot.mk @@ -23,7 +23,7 @@ TAR_COMPRESSOR_EXT:=lzma endif tarroot: host-fakeroot makedevs - -@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true + -@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIPCMD) 2>/dev/null || true ifneq ($(BR2_HAVE_MANPAGES),y) @rm -rf $(TARGET_DIR)/usr/man endif diff --git a/toolchain/binutils/binutils.mk b/toolchain/binutils/binutils.mk index ab69cbc06..bede4ef3d 100644 --- a/toolchain/binutils/binutils.mk +++ b/toolchain/binutils/binutils.mk @@ -175,8 +175,8 @@ $(TARGET_DIR)/usr/bin/ld: $(BINUTILS_DIR2)/binutils/objdump -C $(BINUTILS_DIR2) install #rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \ # $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc - -$(STRIP) $(TARGET_DIR)/usr/$(REAL_GNU_TARGET_NAME)/bin/* > /dev/null 2>&1 - -$(STRIP) $(TARGET_DIR)/usr/bin/* > /dev/null 2>&1 + -$(STRIPCMD) $(TARGET_DIR)/usr/$(REAL_GNU_TARGET_NAME)/bin/* > /dev/null 2>&1 + -$(STRIPCMD) $(TARGET_DIR)/usr/bin/* > /dev/null 2>&1 binutils_target: $(BINUTILS_TARGET_PREREQ) $(TARGET_DIR)/usr/bin/ld diff --git a/toolchain/gcc/gcc-uclibc-3.x.mk b/toolchain/gcc/gcc-uclibc-3.x.mk index cac009e53..3e530795e 100644 --- a/toolchain/gcc/gcc-uclibc-3.x.mk +++ b/toolchain/gcc/gcc-uclibc-3.x.mk @@ -467,11 +467,11 @@ endif # # Ok... that's enough of that. # - -(cd $(TARGET_DIR)/bin && find -type f | xargs $(STRIP) > /dev/null 2>&1) - -(cd $(TARGET_DIR)/usr/bin && find -type f | xargs $(STRIP) > /dev/null 2>&1) - -(cd $(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR) && $(STRIP) cc1 cc1plus collect2 > /dev/null 2>&1) - -(cd $(TARGET_DIR)/usr/lib && $(STRIP) libstdc++.so.*.*.* > /dev/null 2>&1) - -(cd $(TARGET_DIR)/lib && $(STRIP) libgcc_s*.so.*.*.* > /dev/null 2>&1) + -(cd $(TARGET_DIR)/bin && find -type f | xargs $(STRIPCMD) > /dev/null 2>&1) + -(cd $(TARGET_DIR)/usr/bin && find -type f | xargs $(STRIPCMD) > /dev/null 2>&1) + -(cd $(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR) && $(STRIPCMD) cc1 cc1plus collect2 > /dev/null 2>&1) + -(cd $(TARGET_DIR)/usr/lib && $(STRIPCMD) libstdc++.so.*.*.* > /dev/null 2>&1) + -(cd $(TARGET_DIR)/lib && $(STRIPCMD) libgcc_s*.so.*.*.* > /dev/null 2>&1) # rm -f $(TARGET_DIR)/usr/lib/*.la* #rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \ diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk index cdf32bc3f..55362ecb6 100644 --- a/toolchain/gcc/gcc-uclibc-4.x.mk +++ b/toolchain/gcc/gcc-uclibc-4.x.mk @@ -468,11 +468,11 @@ endif # # Ok... that's enough of that. # - -(cd $(TARGET_DIR)/bin && find -type f | xargs $(STRIP) > /dev/null 2>&1) - -(cd $(TARGET_DIR)/usr/bin && find -type f | xargs $(STRIP) > /dev/null 2>&1) - -(cd $(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR) && $(STRIP) cc1 cc1plus collect2 > /dev/null 2>&1) - -(cd $(TARGET_DIR)/usr/lib && $(STRIP) libstdc++.so.*.*.* > /dev/null 2>&1) - -(cd $(TARGET_DIR)/lib && $(STRIP) libgcc_s*.so.*.*.* > /dev/null 2>&1) + -(cd $(TARGET_DIR)/bin && find -type f | xargs $(STRIPCMD) > /dev/null 2>&1) + -(cd $(TARGET_DIR)/usr/bin && find -type f | xargs $(STRIPCMD) > /dev/null 2>&1) + -(cd $(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR) && $(STRIPCMD) cc1 cc1plus collect2 > /dev/null 2>&1) + -(cd $(TARGET_DIR)/usr/lib && $(STRIPCMD) libstdc++.so.*.*.* > /dev/null 2>&1) + -(cd $(TARGET_DIR)/lib && $(STRIPCMD) libgcc_s*.so.*.*.* > /dev/null 2>&1) # rm -f $(TARGET_DIR)/usr/lib/*.la* #rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \ diff --git a/toolchain/gdb/gdb.mk b/toolchain/gdb/gdb.mk index 58934b846..864dd1c55 100644 --- a/toolchain/gdb/gdb.mk +++ b/toolchain/gdb/gdb.mk @@ -114,7 +114,7 @@ endif $(GDB_TARGET_DIR)/gdb/gdb: $(GDB_TARGET_DIR)/.configured $(MAKE) CC=$(TARGET_CC) MT_CFLAGS="$(TARGET_CFLAGS)" \ -C $(GDB_TARGET_DIR) - $(STRIP) $(GDB_TARGET_DIR)/gdb/gdb + $(STRIPCMD) $(GDB_TARGET_DIR)/gdb/gdb $(TARGET_DIR)/usr/bin/gdb: $(GDB_TARGET_DIR)/gdb/gdb install -c -D $(GDB_TARGET_DIR)/gdb/gdb $(TARGET_DIR)/usr/bin/gdb @@ -168,7 +168,7 @@ $(GDB_SERVER_DIR)/.configured: $(GDB_DIR)/.unpacked $(GDB_SERVER_DIR)/gdbserver: $(GDB_SERVER_DIR)/.configured $(MAKE) CC=$(TARGET_CC) MT_CFLAGS="$(TARGET_CFLAGS)" \ -C $(GDB_SERVER_DIR) - $(STRIP) $(GDB_SERVER_DIR)/gdbserver + $(STRIPCMD) $(GDB_SERVER_DIR)/gdbserver $(TARGET_DIR)/usr/bin/gdbserver: $(GDB_SERVER_DIR)/gdbserver ifeq ($(strip $(BR2_CROSS_TOOLCHAIN_TARGET_UTILS)),y) mkdir -p $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/target_utils -- cgit v1.2.3