Convert libpthread to new packaging style

[openwrt.git] / obsolete-buildroot / make / openwrt.mk

diff --git a/obsolete-buildroot/make/openwrt.mk b/obsolete-buildroot/make/openwrt.mk
index 38fa958..6b77c2c 100644 (file)
--- a/obsolete-buildroot/make/openwrt.mk
+++ b/obsolete-buildroot/make/openwrt.mk
@@ -23,7 +23,7 @@
 # Currently the dependencies are not all handled.  But that's true of
 # our buildroot in general, since it wasn't really set up for end users.
 
 # Currently the dependencies are not all handled.  But that's true of
 # our buildroot in general, since it wasn't really set up for end users.
 

-OPENWRT_TARGETS:= gcc3_3 openwrt-linux openwrt-kmodules.tar.bz2 \
+OPENWRT_TARGETS:= $(STAGING_DIR)/bin/sstrip gcc3_3 openwrt-linux openwrt-kmodules.tar.bz2 \

        openwrt-shared openwrt-mtd openwrt-nvram openwrt-wlconf \
        bridge dnsmasq1 iptables wtools busybox \
        openwrt-rootprep
        openwrt-shared openwrt-mtd openwrt-nvram openwrt-wlconf \
        bridge dnsmasq1 iptables wtools busybox \
        openwrt-rootprep


@@ -60,7 +60,7 @@ $(LINUX_DIR)/.patched: $(WRT54G_DIR)/.prepared
        )
        touch $(LINUX_DIR)/.patched
 
        )
        touch $(LINUX_DIR)/.patched
 

-$(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched $(LINUX_DIR)/.bbc-patched $(LINUX_DIR)/.nf-patched 
+$(LINUX_DIR)/.configured: $(LINUX_DIR)/.nf-patched $(LINUX_DIR)/.patched $(LINUX_DIR)/.bbc-patched

        $(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" $(LINUX_DIR)/Makefile
        $(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" $(LINUX_DIR)/arch/mips/Makefile
        $(SED) "s,\-mcpu=,\-mtune=,g;" $(LINUX_DIR)/arch/mips/Makefile
        $(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" $(LINUX_DIR)/Makefile
        $(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" $(LINUX_DIR)/arch/mips/Makefile
        $(SED) "s,\-mcpu=,\-mtune=,g;" $(LINUX_DIR)/arch/mips/Makefile


@@ -202,7 +202,7 @@ openwrt-rootprep:
 
 ######################################################################
 
 
 ######################################################################
 

-openwrt-prune: openwrt-base $(STAGING_DIR)/bin/sstrip
+openwrt-prune: openwrt-base

        # remove unneeded uClibc libs
        rm -rf $(TARGET_DIR)/lib/libthread_db*
        rm -rf $(TARGET_DIR)/lib/libpthread*
        # remove unneeded uClibc libs
        rm -rf $(TARGET_DIR)/lib/libthread_db*
        rm -rf $(TARGET_DIR)/lib/libpthread*


@@ -213,12 +213,13 @@ openwrt-prune: openwrt-base $(STAGING_DIR)/bin/sstrip
        rm -f $(TARGET_DIR)/usr/sbin/iptables-save
        rm -f $(TARGET_DIR)/usr/sbin/iptables-restore
        rm -f $(TARGET_DIR)/usr/sbin/ip6tables
        rm -f $(TARGET_DIR)/usr/sbin/iptables-save
        rm -f $(TARGET_DIR)/usr/sbin/iptables-restore
        rm -f $(TARGET_DIR)/usr/sbin/ip6tables

+       rm -f $(TARGET_DIR)/usr/lib/iptables/libip6*

        -@find $(TARGET_DIR) -type f -perm +111 | xargs $(STAGING_DIR)/bin/sstrip 2>/dev/null || true;
 
 ######################################################################
 
 $(STAGING_DIR)/bin/sstrip:
        -@find $(TARGET_DIR) -type f -perm +111 | xargs $(STAGING_DIR)/bin/sstrip 2>/dev/null || true;
 
 ######################################################################
 
 $(STAGING_DIR)/bin/sstrip:

-       $(CC) -o $(STAGING_DIR)/bin/sstrip -I$(STAGING_DIR)/mipsel-linux-uclibc/include $(SOURCE_DIR)/openwrt/tools/sstrip.c
+       $(CC) -o $(STAGING_DIR)/bin/sstrip $(SOURCE_DIR)/openwrt/tools/sstrip.c

 
 wrt-tools:
        $(CC) -o $(WRT54G_DIR)/release/tools/trx $(SOURCE_DIR)/openwrt/tools/trx.c
 
 wrt-tools:
        $(CC) -o $(WRT54G_DIR)/release/tools/trx $(SOURCE_DIR)/openwrt/tools/trx.c