[Armadeus-commitlog] SF.net SVN: armadeus: [654] trunk

[<jo...@us...>]

Revision: 654
          http://armadeus.svn.sourceforge.net/armadeus/?rev=654&view=rev
Author:   jorasse
Date:     2007-10-20 11:58:54 -0700 (Sat, 20 Oct 2007)

Log Message:
-----------
- Changed reference server to download buildroot package
- fixed gcc patch to fix shared lib gcc deployement

Modified Paths:
--------------
    trunk/Makefile
    trunk/patches/030-buildroot-gcc.diff

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2007-10-20 18:03:20 UTC (rev 653)
+++ trunk/Makefile	2007-10-20 18:58:54 UTC (rev 654)
@@ -26,7 +26,7 @@
 
 BUILDROOT_NAME=buildroot
 BUILDROOT_FILE_PATH:=downloads
-BUILDROOT_SITE:=http://buildroot.uclibc.org/downloads/snapshots/
+BUILDROOT_SITE:=ftp://ftp2.armadeus.com/armadeus/download
 BUILDROOT_VERSION:=20071006
 BUILDROOT_SOURCE:=buildroot-$(BUILDROOT_VERSION).tar.bz2
 

Modified: trunk/patches/030-buildroot-gcc.diff
===================================================================
--- trunk/patches/030-buildroot-gcc.diff	2007-10-20 18:03:20 UTC (rev 653)
+++ trunk/patches/030-buildroot-gcc.diff	2007-10-20 18:58:54 UTC (rev 654)
@@ -1,13 +1,13 @@
 diff -purN -x .svn -x '*~' buildrootref/toolchain/gcc/gcc-uclibc-3.x.mk buildroot/toolchain/gcc/gcc-uclibc-3.x.mk
 --- buildrootref/toolchain/gcc/gcc-uclibc-3.x.mk	2007-10-15 22:41:00.000000000 +0200
 +++ buildroot/toolchain/gcc/gcc-uclibc-3.x.mk	2007-10-20 18:04:02.000000000 +0200
-@@ -327,8 +327,7 @@ endif
+@@ -327,8 +327,8 @@ endif
  	#
  	mkdir -p $(TARGET_DIR)/usr/lib $(TARGET_DIR)/usr/sbin
  	touch $@
--
+
 -$(GCC_BUILD_DIR2)/.libs_installed: $(GCC_BUILD_DIR2)/.installed
-+$(TARGET_DIR)/lib/libgcc_s*: $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib/libgcc_s*
++$(TARGET_DIR)/lib/libgcc_s*: $(GCC_BUILD_DIR2)/.installed
  ifeq ($(BR2_GCC_SHARED_LIBGCC),y)
  	# These are in /lib, so...
  	rm -rf $(TARGET_DIR)/usr/lib/libgcc_s*.so*
@@ -23,13 +23,13 @@
 diff -purN -x .svn -x '*~' buildrootref/toolchain/gcc/gcc-uclibc-4.x.mk buildroot/toolchain/gcc/gcc-uclibc-4.x.mk
 --- buildrootref/toolchain/gcc/gcc-uclibc-4.x.mk	2007-10-15 22:41:00.000000000 +0200
 +++ buildroot/toolchain/gcc/gcc-uclibc-4.x.mk	2007-10-20 18:06:25.000000000 +0200
-@@ -340,14 +340,15 @@ endif
+@@ -340,14 +340,16 @@ endif
  	#
  	mkdir -p $(TARGET_DIR)/usr/lib $(TARGET_DIR)/usr/sbin
  	touch $@
--
+
 -$(GCC_BUILD_DIR2)/.libs_installed: $(GCC_BUILD_DIR2)/.installed
-+$(TARGET_DIR)/lib/libgcc_s*: $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib/libgcc_s*
++$(TARGET_DIR)/lib/libgcc_s*: $(GCC_BUILD_DIR2)/.installed
  ifeq ($(BR2_GCC_SHARED_LIBGCC),y)
  	# These are in /lib, so...
  	rm -rf $(TARGET_DIR)/usr/lib/libgcc_s*.so*


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.