From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 6 Feb 2011 13:36:22 +0000 (+0100)
Subject: gcc: Move libgcc_s to /lib.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ea2e3d98fbe50e7cae260a95c329a2f5af6a7f7;p=ipfire-3.x.git

gcc: Move libgcc_s to /lib.
---

diff --git a/pkgs/core/gcc/gcc.nm b/pkgs/core/gcc/gcc.nm
index 8b2b4f46a..61b7f614c 100644
--- a/pkgs/core/gcc/gcc.nm
+++ b/pkgs/core/gcc/gcc.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
 
 PKG_NAME       = gcc
 PKG_VER        = 4.5.2
-PKG_REL        = 0
+PKG_REL        = 1
 
 PKG_MAINTAINER = Michael Tremer <michael.tremer@ipfire.org>
 PKG_GROUP      = Development/Compilers
@@ -67,7 +67,7 @@ endef
 # libgcc
 PKG_PACKAGES += libgcc
 define PKG_FILES-libgcc
-	/usr/lib/libgcc*.so.*
+	/lib/libgcc*.so.*
 endef
 
 PKG_PACKAGES += libgcc-devel
@@ -179,6 +179,10 @@ define STAGE_INSTALL
 	ln -sfv ../usr/bin/cpp $(BUILDROOT)/lib/cpp
 	ln -sfv gcc $(BUILDROOT)/usr/bin/cc
 
+	# Move libgcc_s to /lib
+	mv -vf $(BUILDROOT)/usr/lib/libgcc_s.so.1 $(BUILDROOT)/lib/
+	ln -svf ../../lib/libgcc_s.so.1 $(BUILDROOT)/usr/lib/libgcc_s.so
+
 	# Remove some GNU debugger stuff.
 	rm -vf $(BUILDROOT)/usr/lib/lib*.py
 endef