jer 08/10/15 03:05:19
Modified: squashfs-tools-3.2_p2.ebuild ChangeLog
squashfs-tools-3.1_p2.ebuild
squashfs-tools-3.3.ebuild squashfs-tools-3.4.ebuild
Log:
Pick up CFLAGS from the environment instead of "setting them in stone" (bug #242030).
(Portage version: 2.2_rc12/cvs/Linux 2.6.25-gentoo-r7-JeR i686)
Revision Changes Path
1.4 sys-fs/squashfs-tools/squashfs-tools-3.2_p2.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-3.2_p2.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-3.2_p2.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-3.2_p2.ebuild?r1=1.3&r2=1.4
Index: squashfs-tools-3.2_p2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-3.2_p2.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- squashfs-tools-3.2_p2.ebuild 28 Jun 2008 09:13:48 -0000 1.3
+++ squashfs-tools-3.2_p2.ebuild 15 Oct 2008 03:05:19 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-3.2_p2.ebuild,v 1.3 2008/06/28 09:13:48 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-3.2_p2.ebuild,v 1.4 2008/10/15 03:05:19 jer Exp $
inherit toolchain-funcs
@@ -21,7 +21,7 @@
src_unpack() {
unpack ${A}
cd "${S}"
- sed -i "s:-O2:${CFLAGS}:" Makefile
+ sed -i 's:-O2:$(CFLAGS):' Makefile
}
src_compile() {
1.57 sys-fs/squashfs-tools/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/squashfs-tools/ChangeLog?rev=1.57&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/squashfs-tools/ChangeLog?rev=1.57&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/squashfs-tools/ChangeLog?r1=1.56&r2=1.57
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/ChangeLog,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- ChangeLog 28 Aug 2008 03:36:00 -0000 1.56
+++ ChangeLog 15 Oct 2008 03:05:19 -0000 1.57
@@ -1,6 +1,12 @@
# ChangeLog for sys-fs/squashfs-tools
# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/ChangeLog,v 1.56 2008/08/28 03:36:00 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/ChangeLog,v 1.57 2008/10/15 03:05:19 jer Exp $
+
+ 15 Oct 2008; Jeroen Roovers <jer@g.o> squashfs-tools-3.1_p2.ebuild,
+ squashfs-tools-3.2_p2.ebuild, squashfs-tools-3.3.ebuild,
+ squashfs-tools-3.4.ebuild:
+ Pick up CFLAGS from the environment instead of "setting them in stone"
+ (bug #242030).
*squashfs-tools-3.4 (28 Aug 2008)
1.12 sys-fs/squashfs-tools/squashfs-tools-3.1_p2.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-3.1_p2.ebuild?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-3.1_p2.ebuild?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-3.1_p2.ebuild?r1=1.11&r2=1.12
Index: squashfs-tools-3.1_p2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-3.1_p2.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- squashfs-tools-3.1_p2.ebuild 15 May 2007 15:13:11 -0000 1.11
+++ squashfs-tools-3.1_p2.ebuild 15 Oct 2008 03:05:19 -0000 1.12
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-3.1_p2.ebuild,v 1.11 2007/05/15 15:13:11 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-3.1_p2.ebuild,v 1.12 2008/10/15 03:05:19 jer Exp $
inherit toolchain-funcs
@@ -21,7 +21,7 @@
src_unpack() {
unpack ${A}
cd "${S}"
- sed -i "s:-O2:${CFLAGS}:" Makefile
+ sed -i 's:-O2:$(CFLAGS):' Makefile
}
src_compile() {
1.5 sys-fs/squashfs-tools/squashfs-tools-3.3.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-3.3.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-3.3.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-3.3.ebuild?r1=1.4&r2=1.5
Index: squashfs-tools-3.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-3.3.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- squashfs-tools-3.3.ebuild 28 Jun 2008 09:13:48 -0000 1.4
+++ squashfs-tools-3.3.ebuild 15 Oct 2008 03:05:19 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-3.3.ebuild,v 1.4 2008/06/28 09:13:48 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-3.3.ebuild,v 1.5 2008/10/15 03:05:19 jer Exp $
inherit eutils toolchain-funcs
@@ -21,7 +21,7 @@
src_unpack() {
unpack ${A}
cd "${S}"
- sed -i "s:-O2:${CFLAGS}:" Makefile
+ sed -i 's:-O2:$(CFLAGS):' Makefile
epatch "${FILESDIR}"/squashfs-tools-3.3-posix.patch || die patching failed
}
1.2 sys-fs/squashfs-tools/squashfs-tools-3.4.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-3.4.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-3.4.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-3.4.ebuild?r1=1.1&r2=1.2
Index: squashfs-tools-3.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-3.4.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- squashfs-tools-3.4.ebuild 28 Aug 2008 03:36:00 -0000 1.1
+++ squashfs-tools-3.4.ebuild 15 Oct 2008 03:05:19 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-3.4.ebuild,v 1.1 2008/08/28 03:36:00 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-3.4.ebuild,v 1.2 2008/10/15 03:05:19 jer Exp $
inherit toolchain-funcs
@@ -22,8 +22,8 @@
unpack ${A}
cd "${S}"
sed -i \
- -e "s:-O2:${CFLAGS}:" \
- -e 's:$(CC):$(CC) ${LDFLAGS}:' \
+ -e 's:-O2:$(CFLAGS):' \
+ -e 's:$(CC):$(CC) $(LDFLAGS):' \
Makefile || die "sed failed"
}
|
