uClibc-0.29.8 funktioniert mit GCC 4.0.3

[people/pmueller/ipfire-2.x.git] / src / uClibc / make / uclibc.mk

diff --git a/src/uClibc/make/uclibc.mk b/src/uClibc/make/uclibc.mk
index accef5fefd7072b2e717d96127620ef56d05190e..b2eb0b7b2a78290f052b8e6322c1ccbe78852695 100644 (file)
--- a/src/uClibc/make/uclibc.mk
+++ b/src/uClibc/make/uclibc.mk
@@ -45,7 +45,7 @@ $(UCLIBC_DIR)/.configured: $(UCLIBC_DIR)/.unpacked
        cp $(SOURCE_DIR)/codesets.txt $(UCLIBC_DIR)/extra/locale
        $(MAKE) -C $(UCLIBC_DIR) PREFIX=$(STAGING_DIR) headers;
        (cd $(UCLIBC_DIR)/extra/locale; \
-               patch -Np0 < /usr/src/src/patches/uClibc-gen_wctype-segfault.patch; \
+               patch -Np0 < /usr/src/src/patches/uClibc-gen_wctype-segfault.patch; \
                $(MAKE); \
        )
        $(MAKE) -C $(UCLIBC_DIR) PREFIX=$(STAGING_DIR) install_dev;
@@ -59,7 +59,7 @@ $(UCLIBC_DIR)/lib/libc.a: $(UCLIBC_DIR)/.configured $(LIBFLOAT_TARGET)
        $(MAKE) -C $(UCLIBC_DIR) headers
        -$(MAKE) -C $(UCLIBC_DIR) pregen
        (cd $(UCLIBC_DIR)/extra/locale; \
-               patch -Np0 < /usr/src/src/patches/uClibc-gen_wctype-segfault.patch; \
+               patch -Np0 < /usr/src/src/patches/uClibc-gen_wctype-segfault.patch; \
                $(MAKE); \
        )
        $(MAKE) -C $(UCLIBC_DIR)
@@ -94,10 +94,8 @@ endif
 
 uclibc-configured: $(UCLIBC_DIR)/.configured
 
-#uclibc: $(STAGING_DIR)/bin/$(ARCH)-linux-uclibc-gcc $(STAGING_DIR)/lib/libc.a \
-#      $(UCLIBC_TARGETS)
-
-uclibc: fix_gcc $(STAGING_DIR)/lib/libc.a $(UCLIBC_TARGETS)
+uclibc: $(STAGING_DIR)/bin/$(ARCH)-linux-uclibc-gcc $(STAGING_DIR)/lib/libc.a \
+       $(UCLIBC_TARGETS)
 
 uclibc-source: $(DL_DIR)/$(UCLIBC_SOURCE)
 
@@ -110,6 +108,9 @@ uclibc-clean:
 uclibc-dirclean:
        rm -rf $(UCLIBC_DIR)
 
+
+
+
 #############################################################
 #
 # uClibc for the target just needs its header files
@@ -135,7 +136,7 @@ $(TARGET_DIR)/usr/lib/libc.a: $(STAGING_DIR)/lib/libc.a
 ifeq ($(GCC_2_95_TOOLCHAIN),true)
 uclibc_target: gcc2_95 uclibc $(TARGET_DIR)/usr/lib/libc.a
 else
-uclibc_target: gcc uclibc $(TARGET_DIR)/usr/lib/libc.a
+uclibc_target: gcc3_3 uclibc $(TARGET_DIR)/usr/lib/libc.a
 endif
 
 uclibc_target-clean:
@@ -144,8 +145,3 @@ uclibc_target-clean:
 uclibc_target-dirclean:
        rm -f $(TARGET_DIR)/include
 
-fix_gcc:
-       cd /opt/$(MACHINE)-uClibc/bin && for i in `find . -name "-*" | cut -c 3-`; do \
-               cat < $$i > $(MACHINE)-linux-uclibc$$i; \
-               chmod 755 $(MACHINE)-linux-uclibc$$i; \
-       done