public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in sys-boot/syslinux: ChangeLog syslinux-3.84.ebuild
@ 2010-02-18 18:27 Jeroen Roovers (jer)
  0 siblings, 0 replies; 2+ messages in thread
From: Jeroen Roovers (jer) @ 2010-02-18 18:27 UTC (permalink / raw
  To: gentoo-commits

jer         10/02/18 18:27:53

  Modified:             ChangeLog syslinux-3.84.ebuild
  Log:
  Switch to IUSE=custom-cflags (bug #305783).
  (Portage version: 2.2_rc62/cvs/Linux i686)

Revision  Changes    Path
1.52                 sys-boot/syslinux/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/syslinux/ChangeLog?rev=1.52&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/syslinux/ChangeLog?rev=1.52&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/syslinux/ChangeLog?r1=1.51&r2=1.52

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/syslinux/ChangeLog,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- ChangeLog	18 Feb 2010 17:40:22 -0000	1.51
+++ ChangeLog	18 Feb 2010 18:27:52 -0000	1.52
@@ -1,6 +1,9 @@
 # ChangeLog for sys-boot/syslinux
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/ChangeLog,v 1.51 2010/02/18 17:40:22 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/ChangeLog,v 1.52 2010/02/18 18:27:52 jer Exp $
+
+  18 Feb 2010; Jeroen Roovers <jer@gentoo.org> syslinux-3.84.ebuild:
+  Switch to IUSE=custom-cflags (bug #305783).
 
   18 Feb 2010; Jeroen Roovers <jer@gentoo.org> syslinux-3.84.ebuild:
   Respect CFLAGS, LDFLAGS, CC.



1.3                  sys-boot/syslinux/syslinux-3.84.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/syslinux/syslinux-3.84.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/syslinux/syslinux-3.84.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/syslinux/syslinux-3.84.ebuild?r1=1.2&r2=1.3

Index: syslinux-3.84.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-3.84.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- syslinux-3.84.ebuild	18 Feb 2010 17:40:22 -0000	1.2
+++ syslinux-3.84.ebuild	18 Feb 2010 18:27:52 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-3.84.ebuild,v 1.2 2010/02/18 17:40:22 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-3.84.ebuild,v 1.3 2010/02/18 18:27:52 jer Exp $
 
 inherit eutils toolchain-funcs
 
@@ -11,7 +11,7 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
+IUSE="custom-cflags"
 
 RDEPEND="sys-fs/mtools
 		dev-perl/Crypt-PasswdMD5
@@ -34,16 +34,18 @@
 
 	rm -f gethostip #bug 137081
 
-	sed -i \
-		extlinux/Makefile \
-		linux/Makefile \
-		mtools/Makefile \
-		sample/Makefile \
-		utils/Makefile \
-		-e '/^LDFLAGS/d' \
-		-e 's|-Os||g' \
-		-e 's|CFLAGS[[:space:]]\+=|CFLAGS +=|g' \
-		|| die "sed failed"
+	local SYSLINUX_MAKEFILES="extlinux/Makefile linux/Makefile mtools/Makefile \
+		sample/Makefile utils/Makefile"
+	sed -i ${SYSLINUX_MAKEFILES} -e '/^LDFLAGS/d' || die "sed failed"
+
+	if use custom-cflags; then
+		sed -i ${SYSLINUX_MAKEFILES} \
+			-e 's|-g -Os||g' \
+			-e 's|-Os||g' \
+			-e 's|CFLAGS[[:space:]]\+=|CFLAGS +=|g' \
+			|| die "sed custom-cflags failed"
+	fi
+
 }
 
 src_compile() {






^ permalink raw reply	[flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-boot/syslinux: ChangeLog syslinux-3.84.ebuild
@ 2010-02-18 17:40 Jeroen Roovers (jer)
  0 siblings, 0 replies; 2+ messages in thread
From: Jeroen Roovers (jer) @ 2010-02-18 17:40 UTC (permalink / raw
  To: gentoo-commits

jer         10/02/18 17:40:23

  Modified:             ChangeLog syslinux-3.84.ebuild
  Log:
  Respect CFLAGS, LDFLAGS, CC.
  (Portage version: 2.2_rc62/cvs/Linux i686)

Revision  Changes    Path
1.51                 sys-boot/syslinux/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/syslinux/ChangeLog?rev=1.51&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/syslinux/ChangeLog?rev=1.51&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/syslinux/ChangeLog?r1=1.50&r2=1.51

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/syslinux/ChangeLog,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- ChangeLog	16 Feb 2010 14:54:38 -0000	1.50
+++ ChangeLog	18 Feb 2010 17:40:22 -0000	1.51
@@ -1,6 +1,9 @@
 # ChangeLog for sys-boot/syslinux
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/ChangeLog,v 1.50 2010/02/16 14:54:38 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/ChangeLog,v 1.51 2010/02/18 17:40:22 jer Exp $
+
+  18 Feb 2010; Jeroen Roovers <jer@gentoo.org> syslinux-3.84.ebuild:
+  Respect CFLAGS, LDFLAGS, CC.
 
   16 Feb 2010; Steve Dibb <beandog@gentoo.org> syslinux-3.83.ebuild:
   amd64 stable, bug 292442



1.2                  sys-boot/syslinux/syslinux-3.84.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/syslinux/syslinux-3.84.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/syslinux/syslinux-3.84.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/syslinux/syslinux-3.84.ebuild?r1=1.1&r2=1.2

Index: syslinux-3.84.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-3.84.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- syslinux-3.84.ebuild	16 Feb 2010 12:47:45 -0000	1.1
+++ syslinux-3.84.ebuild	18 Feb 2010 17:40:22 -0000	1.2
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-3.84.ebuild,v 1.1 2010/02/16 12:47:45 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-3.84.ebuild,v 1.2 2010/02/18 17:40:22 jer Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="SysLinux, IsoLinux and PXELinux bootloader"
 HOMEPAGE="http://syslinux.zytor.com/"
@@ -33,10 +33,21 @@
 	epatch "${FILESDIR}"/${PN}-3.72-nostrip.patch
 
 	rm -f gethostip #bug 137081
+
+	sed -i \
+		extlinux/Makefile \
+		linux/Makefile \
+		mtools/Makefile \
+		sample/Makefile \
+		utils/Makefile \
+		-e '/^LDFLAGS/d' \
+		-e 's|-Os||g' \
+		-e 's|CFLAGS[[:space:]]\+=|CFLAGS +=|g' \
+		|| die "sed failed"
 }
 
 src_compile() {
-	emake installer || die
+	emake CC=$(tc-getCC) installer || die
 }
 
 src_install() {






^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2010-02-18 18:27 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-02-18 18:27 [gentoo-commits] gentoo-x86 commit in sys-boot/syslinux: ChangeLog syslinux-3.84.ebuild Jeroen Roovers (jer)
  -- strict thread matches above, loose matches on Subject: below --
2010-02-18 17:40 Jeroen Roovers (jer)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox