diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2014-01-23 14:20:25 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2014-01-23 14:20:25 +0000 |
| commit | 0ab481552db7d5a4658ea4da53897e2b0b7e7fe9 (patch) | |
| tree | c5148c33e85b65dfde031f29369c5494f32810ff | |
| parent | RDEPEND on sys-apps/getent to provide user/group management (diff) | |
| download | gentoo-2-0ab481552db7d5a4658ea4da53897e2b0b7e7fe9.tar.gz gentoo-2-0ab481552db7d5a4658ea4da53897e2b0b7e7fe9.tar.bz2 gentoo-2-0ab481552db7d5a4658ea4da53897e2b0b7e7fe9.zip | |
Fix patching 1.92.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key A792A613)
| -rw-r--r-- | sys-boot/palo/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-boot/palo/files/palo-1.92-toolchain.patch | 20 | ||||
| -rw-r--r-- | sys-boot/palo/palo-1.92.ebuild | 4 |
3 files changed, 27 insertions, 3 deletions
diff --git a/sys-boot/palo/ChangeLog b/sys-boot/palo/ChangeLog index 82ed73c2dcf7..afbef360e996 100644 --- a/sys-boot/palo/ChangeLog +++ b/sys-boot/palo/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-boot/palo # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/palo/ChangeLog,v 1.43 2014/01/23 14:14:20 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/palo/ChangeLog,v 1.44 2014/01/23 14:20:25 jer Exp $ + + 23 Jan 2014; Jeroen Roovers <jer@gentoo.org> palo-1.92.ebuild, + +files/palo-1.92-toolchain.patch: + Fix patching 1.92. 23 Jan 2014; Jeroen Roovers <jer@gentoo.org> palo-1.92.ebuild, palo-9999.ebuild, files/palo-9999-toolchain.patch: diff --git a/sys-boot/palo/files/palo-1.92-toolchain.patch b/sys-boot/palo/files/palo-1.92-toolchain.patch new file mode 100644 index 000000000000..b72947b63699 --- /dev/null +++ b/sys-boot/palo/files/palo-1.92-toolchain.patch @@ -0,0 +1,20 @@ +--- a/palo/Makefile ++++ b/palo/Makefile +@@ -14,7 +14,7 @@ + ifeq ($(strip ${OS}),HP-UX) + CFLAGS=-g -O -I../include -I../lib -I$(PA)/include + else +-CFLAGS=-g -O -I../include -I../lib ++CFLAGS+= -O -I../include -I../lib + endif + + # LDFLAGS=-Wl,-Bstatic +@@ -34,7 +34,7 @@ + $(CC) $(CFLAGS) $(LDFLAGS) -o palo palo.a build.o + + palo.a: $(OFILES) +- ar rv palo.a $? ++ $(AR) rv palo.a $? + + mkbootable: $(OFILES2) + $(CC) $(CFLAGS) $(LDFLAGS) -o mkbootable $(OFILES2) diff --git a/sys-boot/palo/palo-1.92.ebuild b/sys-boot/palo/palo-1.92.ebuild index 335c474e8c0a..fd3e287b9d84 100644 --- a/sys-boot/palo/palo-1.92.ebuild +++ b/sys-boot/palo/palo-1.92.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/palo/palo-1.92.ebuild,v 1.4 2014/01/23 14:14:20 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/palo/palo-1.92.ebuild,v 1.5 2014/01/23 14:20:25 jer Exp $ EAPI=5 @@ -17,7 +17,7 @@ IUSE="" src_prepare() { epatch \ - "${FILESDIR}"/${PN}-9999-toolchain.patch + "${FILESDIR}"/${PN}-1.92-toolchain.patch sed -i palo/Makefile -e '/^LDFLAGS=/d' || die } |