Add static support, bug #29295.

4 files changed, 22 insertions, 14 deletions

diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index 65c8db87fdc0..19b148604b92 100644
--- a/sys-apps/baselayout/ChangeLog
+++ b/sys-apps/baselayout/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for sys-apps/baselayout
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.93 2003/09/17 17:03:41 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.94 2003/09/23 15:28:48 azarah Exp $
 
 # See the gentoo-src rc-scripts ChangeLog for up-to-date release information:
 # http://www.gentoo.org/cgi-bin/viewcvs.cgi/rc-scripts/ChangeLog?rev=HEAD&cvsroot=gentoo-src&content-type=text/vnd.viewcvs-markup
@@ -21,6 +21,10 @@
 
 *baselayout-1.8.6.10-r1 (08 Sep 2003)
 
+  23 Sep 2003; Martin Schlemmer <azarah@gentoo.org>
+  baselayout-1.8.6.10-r1.ebuild, baselayout-1.8.6.8-r1.ebuild:
+  Add static support, bug #29295.
+
   08 Sep 2003; Martin Schlemmer <azarah@gentoo.org>
   baselayout-1.8.6.10-r1.ebuild, files/rc-scripts-1.4.3.10p1.tar.bz2:
   This update is a service release - I will get to all the open bugs in the next
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index e6386f026009..9f6b08f9b9b4 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1,12 +1,12 @@
-MD5 4c71bf79f9e29241fce7e36cc383f580 ChangeLog 17779
-MD5 e03af9be5af98ac8004dd861f4e747f0 baselayout-1.8.6.8-r1.ebuild 19208
+MD5 bdcce4557d9dff75146c537d746fb7f5 ChangeLog 17930
 MD5 e395e084421590f4db86ff30087f6fa9 baselayout-1.8.5.9.ebuild 15643
-MD5 47b568ef1dffb3da88ecc8f8d057ad79 baselayout-1.8.6.10-r1.ebuild 19695
+MD5 828c30b9748ff67b0478207cf97998e2 baselayout-1.8.6.8-r1.ebuild 19277
+MD5 7428ac6e99d4560a8b9f2040f9890d12 baselayout-1.8.6.10-r1.ebuild 19765
 MD5 520c7779777130658aa2c770de34ab4b files/MAKEDEV.8 9397
 MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099
-MD5 76a07c8f9b30bd607a50b2b3eba0ebd8 files/digest-baselayout-1.8.6.8-r1 64
 MD5 a0bbfe8eed08e0f2faced365b96e3bad files/rc-scripts-1.4.3.8p1.tar.bz2 95476
+MD5 76a07c8f9b30bd607a50b2b3eba0ebd8 files/digest-baselayout-1.8.6.10-r1 64
 MD5 76a07c8f9b30bd607a50b2b3eba0ebd8 files/digest-baselayout-1.8.5.9 64
 MD5 963a1c8eb93fbf75d215a832b039c65a files/rc-scripts-1.4.2.9.tar.bz2 78886
 MD5 167cac447f085528241e1f4b0c300edd files/rc-scripts-1.4.3.10p1.tar.bz2 98300
-MD5 76a07c8f9b30bd607a50b2b3eba0ebd8 files/digest-baselayout-1.8.6.10-r1 64
+MD5 76a07c8f9b30bd607a50b2b3eba0ebd8 files/digest-baselayout-1.8.6.8-r1 64
diff --git a/sys-apps/baselayout/baselayout-1.8.6.10-r1.ebuild b/sys-apps/baselayout/baselayout-1.8.6.10-r1.ebuild
index 45177a2a1c36..02daac293b3d 100644
--- a/sys-apps/baselayout/baselayout-1.8.6.10-r1.ebuild
+++ b/sys-apps/baselayout/baselayout-1.8.6.10-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.6.10-r1.ebuild,v 1.3 2003/09/17 17:03:41 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.6.10-r1.ebuild,v 1.4 2003/09/23 15:28:48 azarah Exp $
 
 # This ebuild needs to be merged "live".  You can't simply make a package
 # of it and merge it later.
 
-IUSE="bootstrap build"
+IUSE="bootstrap build static"
 
 SV="1.4.3.10p1"
 SVREV=""
@@ -48,6 +48,8 @@ src_unpack() {
 	echo ">>> Unpacking rc-scripts-${SV}${SVREV}.tar.bz2"
 	tar -jxf ${FILESDIR}/rc-scripts-${SV}${SVREV}.tar.bz2 || die
 
+	use static && export LDFLAGS="-static"
+
 	# Fix CFLAGS for sysvinit stuff
 	cd ${S2}
 	cp Makefile Makefile.orig
@@ -102,7 +104,7 @@ src_compile() {
 
 	cd ${S}/src
 	einfo "Building utilities..."
-	make CC="${CC:-gcc}" LD="${CC:-gcc}" \
+	make CC="${CC:-gcc}" LD="${CC:-gcc} ${LDFLAGS}" \
 		CFLAGS="${CFLAGS}" || die "problem compiling utilities"
 
 	if [ -z "`use build`" ]
@@ -111,7 +113,7 @@ src_compile() {
 		cd ${S2}
 		einfo "Building sysvinit..."
 		emake CC="${CC:-gcc}" LD="${CC:-gcc}" \
-			LDFLAGS="" || die "problem compiling sysvinit"
+			LDFLAGS="${LDFLAGS}" || die "problem compiling sysvinit"
 
 		if [ -z "`use bootstrap`" ]
 		then
diff --git a/sys-apps/baselayout/baselayout-1.8.6.8-r1.ebuild b/sys-apps/baselayout/baselayout-1.8.6.8-r1.ebuild
index 49e0b285b529..8da9f88cdfba 100644
--- a/sys-apps/baselayout/baselayout-1.8.6.8-r1.ebuild
+++ b/sys-apps/baselayout/baselayout-1.8.6.8-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.6.8-r1.ebuild,v 1.12 2003/09/08 02:25:17 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.6.8-r1.ebuild,v 1.13 2003/09/23 15:28:48 azarah Exp $
 
 # This ebuild needs to be merged "live".  You can't simply make a package
 # of it and merge it later.
 
-IUSE="bootstrap build"
+IUSE="bootstrap build static"
 
 SV="1.4.3.8p1"
 SVREV=""
@@ -41,6 +41,8 @@ src_unpack() {
 	echo ">>> Unpacking rc-scripts-${SV}${SVREV}.tar.bz2"
 	tar -jxf ${FILESDIR}/rc-scripts-${SV}${SVREV}.tar.bz2 || die
 
+	use static && export LDFLAGS="-static"
+
 	# Fix CFLAGS for sysvinit stuff
 	cd ${S2}
 	cp Makefile Makefile.orig
@@ -95,7 +97,7 @@ src_compile() {
 
 	cd ${S}/src
 	einfo "Building utilities..."
-	make CC="${CC:-gcc}" LD="${CC:-gcc}" \
+	make CC="${CC:-gcc}" LD="${CC:-gcc} ${LDFLAGS}" \
 		CFLAGS="${CFLAGS}" || die "problem compiling utilities"
 
 	if [ -z "`use build`" ]
@@ -104,7 +106,7 @@ src_compile() {
 		cd ${S2}
 		einfo "Building sysvinit..."
 		emake CC="${CC:-gcc}" LD="${CC:-gcc}" \
-			LDFLAGS="" || die "problem compiling sysvinit"
+			LDFLAGS="${LDFLAGS}" || die "problem compiling sysvinit"
 
 		if [ -z "`use bootstrap`" ]
 		then