[openap-cvs] : openap-main/tools/gcc-2.95 Makefile,1.1,1.2

[David Kimdon <address@hidden>]

Update of /cvsroot/openap/openap-main/tools/gcc-2.95
In directory subversions:/tmp/cvs-serv13405/tools/gcc-2.95

Modified Files:
        Makefile 
Log Message:
-toolchain souce now kept in cvs as unpacket tarball
-tarballs that we download when building toolchain now on openap savannah 
 site


Index: Makefile
===================================================================
RCS file: /cvsroot/openap/openap-main/tools/gcc-2.95/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile    28 Aug 2002 18:49:21 -0000      1.1
+++ Makefile    28 Aug 2002 20:07:51 -0000      1.2
@@ -48,7 +48,7 @@
 # Enable this to use the uClibc daily snapshot instead of a released
 # version.  Daily snapshots may contain new features and bugfixes. Or
 # they may not even compile at all, depending on what Erik is doing...
-USE_UCLIBC_SNAPSHOT:=true
+USE_UCLIBC_SNAPSHOT:=false
 
 # The version of libstdc++ included with gcc-2.95 is tightly
 # coupled to glibc, and it will not (yet!) compile with uClibc.
@@ -108,11 +108,15 @@
 # here at the top...  Easier to find things here anyways...
 #
 #############################################################
-LINUX_SITE:=ftp://www.uclibc.org/uClibc/toolchain/
+
+
+OPENAP_SAVANNAH_SITE=http://freesoftware.fsf.org/download/openap/
+
+LINUX_SITE:=$(OPENAP_SAVANNAH_SITE)
 LINUX_SOURCE:=kernel-headers-2.4.18.tar.bz2
 LINUX_DIR:=$(BUILD_DIR)/linux
 
-BINUTILS_SITE:=ftp://ftp.gnu.org/gnu/binutils/
+BINUTILS_SITE:=$(OPENAP_SAVANNAH_SITE)
 BINUTILS_SOURCE:=binutils-2.12.1.tar.bz2
 BINUTILS_DIR:=$(BUILD_DIR)/binutils-2.12.1
 
@@ -121,12 +125,12 @@
 UCLIBC_DIR=$(BUILD_DIR)/uClibc
 UCLIBC_SOURCE=uClibc-snapshot.tar.bz2
 else
-UCLIBC_DIR:=$(BUILD_DIR)/uClibc-0.9.12
-UCLIBC_SOURCE:=uClibc-0.9.12.tar.bz2
+UCLIBC_DIR:=$(BUILD_DIR)/uClibc-0.9.15
+UCLIBC_SOURCE:=uClibc-0.9.15.tar.bz2
 endif
-UCLIBC_SITE:=ftp://www.uclibc.org/uClibc
+UCLIBC_SITE:=$(OPENAP_SAVANNAH_SITE)
 
-GCC_SITE:=ftp://www.uclibc.org/uClibc/toolchain/gcc-2.95/sources/dl
+GCC_SITE:=$(OPENAP_SAVANNAH_SITE)
 GCC_SOURCE:=gcc-20011006.tar.bz2
 GCC_DIR:=$(BUILD_DIR)/gcc-20011006
 GCC_BUILD_DIR1:=$(BUILD_DIR)/gcc-initial
@@ -320,13 +324,24 @@
 #
 #############################################################
 $(DL_DIR)/$(UCLIBC_SOURCE):
-       wget -P $(DL_DIR) $(UCLIBC_SITE)/$(UCLIBC_SOURCE)
+       wget -P $(DL_DIR) --passive-ftp $(UCLIBC_SITE)/$(UCLIBC_SOURCE)
 
 $(UCLIBC_DIR)/.unpacked: $(BUILD_DIR)/.setup $(DL_DIR)/$(UCLIBC_SOURCE)
        bzcat $(DL_DIR)/$(UCLIBC_SOURCE) | tar -C $(BUILD_DIR) -xvf -
        touch $(UCLIBC_DIR)/.unpacked
 
-$(UCLIBC_DIR)/.configured: $(UCLIBC_DIR)/.unpacked
+$(UCLIBC_DIR)/.patched: $(UCLIBC_DIR)/.unpacked
+       # Apply all uclibc patches in the source directory, named uclibc-*.patch
+       for p in $(SOURCE_DIR)/uclibc-*.patch ; do \
+               cat $$p | patch -p1 -d $(UCLIBC_DIR) ; \
+       done
+       @if [ "`find $(UCLIBC_DIR) '(' -name '*.rej' -o -name '.*.rej' ')' 
-print`" ] ; then \
+           echo "Aborting.  Reject files found."; \
+           exit 1; \
+       fi
+       touch $(UCLIBC_DIR)/.patched
+
+$(UCLIBC_DIR)/.configured: $(UCLIBC_DIR)/.patched
        cp $(UCLIBC_DIR)/extra/Configs/Config.$(ARCH) $(UCLIBC_DIR)/Config~;
        echo "TARGET_ARCH=$(ARCH)" >> $(UCLIBC_DIR)/Config~
        perl -i -p -e 's,^HAS_WCHAR.*,HAS_WCHAR=true,g' $(UCLIBC_DIR)/Config~