From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 31 Oct 2009 18:38:49 +0000 (+0100)
Subject: Some fixes on the packages.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69b4aebfe91fd53977639cb0508a378cf8b3d6a8;p=ipfire-3.x.git

Some fixes on the packages.

Removed unused lines, etc.
---

diff --git a/pkgs/core/binutils/binutils.nm b/pkgs/core/binutils/binutils.nm
index 3b8b9d206..57c4f6742 100644
--- a/pkgs/core/binutils/binutils.nm
+++ b/pkgs/core/binutils/binutils.nm
@@ -88,7 +88,6 @@ $(STAGE_INSTALL): $(STAGE_BUILD)
 
 	cd $(DIR_SRC)/binutils-build && make tooldir=/usr install DESTDIR=$(BUILDROOT)
 
-	cp -fv ../$(THISAPP)/include/libiberty.h $(BUILDROOT)/usr/include
-	rm -vf /usr/lib/libiberty.a $(BUILDROOT)/usr/lib/lib{bfd,opcodes}.la
+	cp -fv $(DIR_APP)/include/libiberty.h $(BUILDROOT)/usr/include
 
 	@$(POST_INSTALL)
diff --git a/pkgs/core/gcc/gcc.nm b/pkgs/core/gcc/gcc.nm
index 7e440e9ba..0cd7ae5a2 100644
--- a/pkgs/core/gcc/gcc.nm
+++ b/pkgs/core/gcc/gcc.nm
@@ -139,8 +139,6 @@ $(STAGE_INSTALL): $(STAGE_BUILD)
 
 	cd $(DIR_SRC)/gcc-build && make install DESTDIR=$(BUILDROOT)
 
-	rm -vf $(BUILDROOT)/usr/lib/lib{ffi,gomp,mudflap{,th},stdc++,supc++}.la
-
 	ln -sfv ../usr/bin/cpp $(BUILDROOT)/lib
 	ln -sfv gcc $(BUILDROOT)/usr/bin/cc
 
diff --git a/pkgs/core/glibc/glibc.nm b/pkgs/core/glibc/glibc.nm
index c805892e9..c35267d28 100644
--- a/pkgs/core/glibc/glibc.nm
+++ b/pkgs/core/glibc/glibc.nm
@@ -179,8 +179,6 @@ $(STAGE_BUILD): $(STAGE_PREPARE)
 	# canary value changes at run-time. This is not as good as /dev/urandom, but
 	# it's better than nothing and has very good performance.
 
-	if [ ! -e /bin/pwd ]; then ln -sfn $(TOOLS_DIR)/bin/pwd /bin/pwd; fi
-
 	cd $(DIR_APP) && sed 's/-nostdlib/& -fno-stack-protector/g' -i.orig configure
 
 	cd $(DIR_APP) && sed -i 's|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=$(LINKER) -o|' \
@@ -228,27 +226,16 @@ $(STAGE_INSTALL): $(STAGE_BUILD)
 
 	cd $(DIR_SRC)/glibc-build && make install install_root=$(BUILDROOT)
 
-	install -vd $(BUILDROOT)/usr/lib/static/
-	mv -v $(BUILDROOT)/usr/lib/{libbsd-compat,libg,libieee,libmcheck}.a $(BUILDROOT)/usr/lib/static/
-	mv -v $(BUILDROOT)/usr/lib/{libBrokenLocale,libanl,libcrypt}.a $(BUILDROOT)/usr/lib/static/
-	mv -v $(BUILDROOT)/usr/lib/{libm,libnsl,libpthread,libresolv}.a $(BUILDROOT)/usr/lib/static/
-	mv -v $(BUILDROOT)/usr/lib/{librpcsvc,librt,libutil}.a $(BUILDROOT)/usr/lib/static/
-
-	rm -vf $(BUILDROOT){/usr,}/lib/*_g.a
-
 	# Locales
 	-mkdir -pv $(BUILDROOT)/usr/lib/locale
 	# This would install all locales that are supported, but we do only
 	# install a minimal set of them
 	cd $(DIR_SRC)/glibc-build && make localedata/install-locales install_root=$(BUILDROOT)
 
-
 	# Timezone
 	cp -v --remove-destination $(BUILDROOT)/usr/share/zoneinfo/GMT $(BUILDROOT)/etc/localtime
 
 	# Configuration
 	cp -vf $(DIR_SOURCE)/{ld.so.conf,nsswitch.conf} $(BUILDROOT)/etc
 
-	if [ -h /bin/pwd ]; then rm -f /bin/pwd; fi
-
 	@$(POST_INSTALL)
diff --git a/pkgs/core/xz/xz.nm b/pkgs/core/xz/xz.nm
index d463b6447..b1c775e22 100644
--- a/pkgs/core/xz/xz.nm
+++ b/pkgs/core/xz/xz.nm
@@ -70,12 +70,3 @@ $(STAGE_BUILD): $(STAGE_PREPARE)
 	cd $(DIR_APP) && make $(PARALLELISMFLAGS)
 
 	@$(POST_BUILD)
-
-$(STAGE_INSTALL): $(STAGE_BUILD)
-	@$(PRE_INSTALL)
-
-	cd $(DIR_APP) && make install DESTDIR=$(BUILDROOT)
-
-	rm -vf $(BUILDROOT)/usr/lib/liblzma.la
-
-	@$(POST_INSTALL)
diff --git a/pkgs/core/zlib/zlib.nm b/pkgs/core/zlib/zlib.nm
index 8e294b807..04c12c9b4 100644
--- a/pkgs/core/zlib/zlib.nm
+++ b/pkgs/core/zlib/zlib.nm
@@ -71,7 +71,7 @@ $(STAGE_INSTALL): $(STAGE_BUILD)
 	cd $(DIR_APP) && make install DESTDIR=$(BUILDROOT)
 	-mkdir -pv $(BUILDROOT)/usr/{include,lib}
 	cd $(DIR_APP) && cp -pfv zconf.h zlib.h $(BUILDROOT)/usr/include
-	rm -vf $(BUILDROOT)/lib/libz.{la,so}
+	rm -vf $(BUILDROOT)/lib/libz.so
 	ln -sfv ../../lib/libz.so.$(PKG_VER) $(BUILDROOT)/usr/lib/libz.so
 
 	@$(POST_INSTALL)