Einige Buildfixes

[people/pmueller/ipfire-2.x.git] / lfs / uClibc

diff --git a/lfs/uClibc b/lfs/uClibc
index 7bc9d1727526b3b72701dc031cab70b74f121962..63a312e6a691ba77251b4a441dcdef94f9264aee 100644 (file)
--- a/lfs/uClibc
+++ b/lfs/uClibc
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: uClibc,v 1.9.2.4 2005/02/05 15:38:16 gespinasse Exp $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -32,11 +26,11 @@
 
 include Config
 
-VER        = 0.9.26
+VER        = 0.9.28
 
 THISAPP    = uClibc-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_KERNEL)/linux/libs/uclibc
+DL_FILE    = $(THISAPP).tar.bz2
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
@@ -44,13 +38,15 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE) gcc-3.3.1.tar.gz
+objects = $(DL_FILE) buildroot-snapshot-20061026.tar.bz2 uClibc-locale-030818.tgz
 
-$(DL_FILE)           = $(DL_FROM)/$(DL_FILE)
-gcc-3.3.1.tar.gz     = $(URL_GNU)/gcc/gcc-3.3.1.tar.gz
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+buildroot-snapshot-20061026.tar.bz2 = $(DL_FROM)/buildroot-snapshot-20061026.tar.bz2
+uClibc-locale-030818.tgz = $(DL_FROM)/uClibc-locale-030818.tgz
 
-$(DL_FILE)_MD5       = b63183651a1b13456c20387ea88b018f
-gcc-3.3.1.tar.gz_MD5 = 46d58197212818b5f7c403267ff24e4e
+$(DL_FILE)_MD5 = 1ada58d919a82561061e4741fb6abd29
+buildroot-snapshot-20061026.tar.bz2_MD5 = ecc5d48a780e46a56d1d39207d5868bd
+uClibc-locale-030818.tgz_MD5 = d75b2239b4e27c3c9cbed1c8f6eabba6
 
 install : $(TARGET)
 
@@ -79,14 +75,25 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP)
-       @rm -rf /opt/$(MACHINE)-uClibc
-       @mkdir -p $(DIR_APP)
-       cd $(DIR_APP) && cp -R $(DIR_SRC)/src/uClibc/* .
-       cd $(DIR_APP) && sed -i -e 's/ARCH:=i386/ARCH:=$(MACHINE)/' Makefile
-       cd $(DIR_APP) && chmod +x sources/patch-kernel.sh
-       cd $(DIR_APP) && make
+       @rm -rf $(DIR_APP) /opt/$(MACHINE)-uClibc $(DIR_SRC)/buildroot
+       @cd $(DIR_SRC) && tar xfj $(DIR_DL)/buildroot-snapshot-20061026.tar.bz2
+       mkdir -p $(DIR_SRC)/buildroot/toolchain_build_$(MACHINE)/$(THISAPP)/extra/locale/
+       cp -f $(DIR_DL)/uClibc-locale-030818.tgz \
+               $(DIR_SRC)/buildroot/toolchain_build_$(MACHINE)/$(THISAPP)/extra/locale/
+       cp -f $(DIR_SRC)/config/uClibc/uClibc.config-$(MACHINE) $(DIR_SRC)/buildroot/toolchain/uClibc/uClibc.config
+       cp -f $(DIR_SRC)/config/uClibc/buildroot.config-$(MACHINE) $(DIR_SRC)/buildroot/.config
+       cp -f $(DIR_SRC)/config/uClibc/buildroot.config.cmd $(DIR_SRC)/buildroot/.config.cmd
+       cd $(DIR_SRC)/buildroot && make
        -mkdir -p /install/initrd/bin
-       cd $(DIR_APP)/toolchain_build_$(MACHINE)/$(THISAPP) && make PREFIX=/install/initrd install_runtime
-       @rm -rf $(DIR_APP)
+       cd $(DIR_SRC)/buildroot/toolchain_build_$(MACHINE)/$(THISAPP) && make RUNTIME_PREFIX=/install/initrd/ install_runtime
+       chmod 755 /install/initrd/lib/libuClibc-$(VER).so
+       rm -f /install/initrd/lib/{libm*,libcrypt*,libutil*,librt*}
+       cp -f /opt/$(MACHINE)-uClibc/lib/libgcc_s.so /lib
+       cp -f /opt/$(MACHINE)-uClibc/lib/ld-uClibc-$(VER).so /lib
+       cp -f /opt/$(MACHINE)-uClibc/lib/libuClibc-$(VER).so /lib
+       cd /lib && ln -sf libgcc_s.so libgcc_s.so.1
+       cd /lib && ln -sf ld-uClibc-$(VER).so ld-uClibc.so.0
+       cd /lib && ln -sf libuClibc-$(VER).so libc.so.0
+       cd /lib && ln -sf libc.so.0 libc.so
+       @rm -rf $(DIR_APP) $(DIR_SRC)/buildroot
        @$(POSTBUILD)