Commit 14a71561 authored by Bernhard Reutner-Fischer's avatar Bernhard Reutner-Fischer
Browse files

- just use the strip binary to avoid confusing libtool (quotes) 

- use $(STRIPCMD) in packages to avoid clashes with $(STRIP)
parent 4ad141c3

package/Makefile.in

+4 −4
Original line number Diff line number Diff line
@@ -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

package/acpid/acpid.mk

+2 −2
Original line number Diff line number Diff line
@@ -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

package/alsa-lib/alsa-lib.mk

+2 −2
Original line number Diff line number Diff line
@@ -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)

package/argus/argus.mk

+1 −1
Original line number Diff line number Diff line
@@ -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)

package/asterisk/asterisk.mk

+4 −4
Original line number Diff line number Diff line
@@ -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