summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sys-apps/baselayout')
-rw-r--r--sys-apps/baselayout/ChangeLog5
-rw-r--r--sys-apps/baselayout/baselayout-1.8.6.13-r1.ebuild6
-rw-r--r--sys-apps/baselayout/files/baselayout-1.8.6.13-r1-gcc2.patch14
3 files changed, 23 insertions, 2 deletions
diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index 2704fc4fe3dd..cc79430db6f8 100644
--- a/sys-apps/baselayout/ChangeLog
+++ b/sys-apps/baselayout/ChangeLog
@@ -1,10 +1,13 @@
# ChangeLog for sys-apps/baselayout
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.122 2004/02/28 00:30:33 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.123 2004/03/03 19:53:40 vapier 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
+ 03 Mar 2004; Mike Frysinger <vapier@gentoo.org> :
+ Add gcc2.x compat patch #43097 by Tristan Henderson.
+
28 Feb 2004; Martin Schlemmer <azarah@gentoo.org>
baselayout-1.8.6.13-r1.ebuild:
Bug #43099.
diff --git a/sys-apps/baselayout/baselayout-1.8.6.13-r1.ebuild b/sys-apps/baselayout/baselayout-1.8.6.13-r1.ebuild
index 8fc65f24599f..0d725e1d5cd2 100644
--- a/sys-apps/baselayout/baselayout-1.8.6.13-r1.ebuild
+++ b/sys-apps/baselayout/baselayout-1.8.6.13-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 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.13-r1.ebuild,v 1.4 2004/03/02 16:43:09 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.6.13-r1.ebuild,v 1.5 2004/03/03 19:53:40 vapier Exp $
IUSE="bootstrap build livecd static selinux"
@@ -69,6 +69,10 @@ src_unpack() {
rm -f inittab.orig
;;
esac
+
+ # temp gcc2 patch #43097
+ cd ${WORKDIR}
+ epatch ${FILESDIR}/${PF}-gcc2.patch
}
src_compile() {
diff --git a/sys-apps/baselayout/files/baselayout-1.8.6.13-r1-gcc2.patch b/sys-apps/baselayout/files/baselayout-1.8.6.13-r1-gcc2.patch
new file mode 100644
index 000000000000..288f0c106d24
--- /dev/null
+++ b/sys-apps/baselayout/files/baselayout-1.8.6.13-r1-gcc2.patch
@@ -0,0 +1,14 @@
+diff -Naur rc-scripts-1.4.3.13p1.orig/src/runscript.c rc-scripts-1.4.3.13p1/src/runscript.c
+--- rc-scripts-1.4.3.13p1.orig/src/runscript.c 2004-02-09 13:40:44.000000000 -0500
++++ rc-scripts-1.4.3.13p1/src/runscript.c 2004-02-27 09:17:06.000000000 -0500
+@@ -16,9 +16,9 @@
+
+ int main(int argc, char **argv) {
+ char *myargs[32];
++ void *lib_handle;
+ int new = 1;
+ myargs[0] = "runscript";
+- void *lib_handle;
+
+ /* if (argc < 3)
+ exit(1);