From 565e730d81bbd836c4a49183eaf72b1fa9987d8b Mon Sep 17 00:00:00 2001 From: "Anthony G. Basile" Date: Fri, 3 Jun 2011 03:14:45 +0000 Subject: Respect CC/CFLAGS/LDFLAGS, bugs #369813 and 369817 (Portage version: 2.1.9.42/cvs/Linux x86_64) --- dev-util/elfkickers/ChangeLog | 8 +- dev-util/elfkickers/elfkickers-3.0-r1.ebuild | 32 +++++++ dev-util/elfkickers/elfkickers-3.0.ebuild | 27 ------ .../elfkickers/files/respect-CFLAGS-LDFLAGS.patch | 102 +++++++++++++++++++++ 4 files changed, 141 insertions(+), 28 deletions(-) create mode 100644 dev-util/elfkickers/elfkickers-3.0-r1.ebuild delete mode 100644 dev-util/elfkickers/elfkickers-3.0.ebuild create mode 100644 dev-util/elfkickers/files/respect-CFLAGS-LDFLAGS.patch (limited to 'dev-util') diff --git a/dev-util/elfkickers/ChangeLog b/dev-util/elfkickers/ChangeLog index 514f0e49d234..d3bd0685ac1a 100644 --- a/dev-util/elfkickers/ChangeLog +++ b/dev-util/elfkickers/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-util/elfkickers # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/elfkickers/ChangeLog,v 1.35 2011/06/02 00:25:46 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/elfkickers/ChangeLog,v 1.36 2011/06/03 03:14:45 blueness Exp $ + +*elfkickers-3.0-r1 (03 Jun 2011) + + 03 Jun 2011; Anthony G. Basile -elfkickers-3.0.ebuild, + +elfkickers-3.0-r1.ebuild, +files/respect-CFLAGS-LDFLAGS.patch: + Respect CC/CFLAGS/LDFLAGS, bugs #369813 and 369817 02 Jun 2011; Anthony G. Basile Manifest: Fixed manifest diff --git a/dev-util/elfkickers/elfkickers-3.0-r1.ebuild b/dev-util/elfkickers/elfkickers-3.0-r1.ebuild new file mode 100644 index 000000000000..f8761462c7b7 --- /dev/null +++ b/dev-util/elfkickers/elfkickers-3.0-r1.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/elfkickers/elfkickers-3.0-r1.ebuild,v 1.1 2011/06/03 03:14:45 blueness Exp $ + +EAPI="4" + +inherit eutils toolchain-funcs + +MY_PN=${PN/elf/ELF}-${PV} +S=${WORKDIR}/${MY_PN} + +DESCRIPTION="collection of programs to manipulate ELF files: sstrip, rebind, elfls, elftoc" +HOMEPAGE="http://www.muppetlabs.com/~breadbox/software/elfkickers.html" +SRC_URI="http://www.muppetlabs.com/~breadbox/pub/software/${MY_PN}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc" + +DEPEND="app-misc/pax-utils" +RDEPEND="" + +src_prepare() { + epatch "${FILESDIR}"/respect-CFLAGS-LDFLAGS.patch + epatch "${FILESDIR}"/create-destdir-path.patch + sed -i -e "s:^prefix = /usr/local:prefix = ${D}:" Makefile +} + +src_compile() { + emake CC=$(tc-getCC) all +} diff --git a/dev-util/elfkickers/elfkickers-3.0.ebuild b/dev-util/elfkickers/elfkickers-3.0.ebuild deleted file mode 100644 index c92d51c294c9..000000000000 --- a/dev-util/elfkickers/elfkickers-3.0.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/elfkickers/elfkickers-3.0.ebuild,v 1.1 2011/05/31 22:12:51 blueness Exp $ - -EAPI="4" - -inherit eutils - -MY_PF=${PF/elf/ELF} -S=${WORKDIR}/${MY_PF} - -DESCRIPTION="collection of programs to manipulate ELF files: sstrip, rebind, elfls, elftoc" -HOMEPAGE="http://www.muppetlabs.com/~breadbox/software/elfkickers.html" -SRC_URI="http://www.muppetlabs.com/~breadbox/pub/software/${MY_PF}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc" - -DEPEND="app-misc/pax-utils" -RDEPEND="" - -src_prepare() { - epatch "${FILESDIR}"/create-destdir-path.patch - sed -i -e "s:^prefix = /usr/local:prefix = ${D}:" Makefile -} diff --git a/dev-util/elfkickers/files/respect-CFLAGS-LDFLAGS.patch b/dev-util/elfkickers/files/respect-CFLAGS-LDFLAGS.patch new file mode 100644 index 000000000000..6663ef8e79af --- /dev/null +++ b/dev-util/elfkickers/files/respect-CFLAGS-LDFLAGS.patch @@ -0,0 +1,102 @@ +diff -Naur ELFkickers-3.0.orig//ebfc/Makefile ELFkickers-3.0/ebfc/Makefile +--- ELFkickers-3.0.orig//ebfc/Makefile 2011-05-24 00:51:07.000000000 -0400 ++++ ELFkickers-3.0/ebfc/Makefile 2011-06-02 23:05:30.000000000 -0400 +@@ -1,7 +1,7 @@ + # Makefile for ebfc + +-CC = gcc +-CFLAGS = -Wall -Wextra -Wno-missing-field-initializers ++CC ?= gcc ++CFLAGS += -Wno-missing-field-initializers + + ebfc: ebfc.o brainfuck.o libelfparts.a + +diff -Naur ELFkickers-3.0.orig//elfls/Makefile ELFkickers-3.0/elfls/Makefile +--- ELFkickers-3.0.orig//elfls/Makefile 2011-05-31 02:53:05.000000000 -0400 ++++ ELFkickers-3.0/elfls/Makefile 2011-06-02 23:04:15.000000000 -0400 +@@ -1,7 +1,7 @@ + # Makefile for elfls + +-CC = gcc +-CFLAGS = -Wall -Wextra -I../elfrw ++CC ?= gcc ++CFLAGS += -I../elfrw + + elfls: elfls.c ../elfrw/libelfrw.a + +diff -Naur ELFkickers-3.0.orig//elfrw/Makefile ELFkickers-3.0/elfrw/Makefile +--- ELFkickers-3.0.orig//elfrw/Makefile 2011-05-22 14:02:12.000000000 -0400 ++++ ELFkickers-3.0/elfrw/Makefile 2011-06-02 23:04:37.000000000 -0400 +@@ -1,7 +1,6 @@ + # Makefile for libelfrw.a + +-CC = gcc +-CFLAGS = -Wall -Wextra -O3 ++CC ?= gcc + + LIBOBJS = elfrw.o elfrw_dyn.o elfrw_ehdr.o elfrw_phdr.o elfrw_rel.o \ + elfrw_shdr.o elfrw_sym.o elfrw_ver.o +diff -Naur ELFkickers-3.0.orig//elftoc/Makefile ELFkickers-3.0/elftoc/Makefile +--- ELFkickers-3.0.orig//elftoc/Makefile 2011-05-23 23:30:22.000000000 -0400 ++++ ELFkickers-3.0/elftoc/Makefile 2011-06-02 23:04:27.000000000 -0400 +@@ -1,8 +1,6 @@ + # Makefile for elftoc + +-CC = gcc +-CFLAGS = -Wall -Wextra +-LDFLAGS = -Wall -Wextra ++CC ?= gcc + + OBJS = gen.o names.o address.o readelf.o shdrtab.o phdrtab.o dynamic.o \ + pieces.o outbase.o outitems.o outelf64.o outelf32.o out.o elftoc.o +diff -Naur ELFkickers-3.0.orig//infect/Makefile ELFkickers-3.0/infect/Makefile +--- ELFkickers-3.0.orig//infect/Makefile 2011-05-31 02:52:27.000000000 -0400 ++++ ELFkickers-3.0/infect/Makefile 2011-06-02 23:04:01.000000000 -0400 +@@ -1,7 +1,6 @@ + # Makefile for infect + +-CC = gcc +-CFLAGS = -Wall -Wextra ++CC ?= gcc + + infect: infect.c + +diff -Naur ELFkickers-3.0.orig//objres/Makefile ELFkickers-3.0/objres/Makefile +--- ELFkickers-3.0.orig//objres/Makefile 2011-05-23 23:29:39.000000000 -0400 ++++ ELFkickers-3.0/objres/Makefile 2011-06-02 23:05:08.000000000 -0400 +@@ -1,7 +1,7 @@ + # Makefile for objres + +-CC = gcc +-CFLAGS = -Wall -Wextra -I../elfrw ++CC ?= gcc ++CFLAGS += -I../elfrw + + objres: objres.c ../elfrw/libelfrw.a + +diff -Naur ELFkickers-3.0.orig//rebind/Makefile ELFkickers-3.0/rebind/Makefile +--- ELFkickers-3.0.orig//rebind/Makefile 2011-05-23 23:29:16.000000000 -0400 ++++ ELFkickers-3.0/rebind/Makefile 2011-06-02 23:04:57.000000000 -0400 +@@ -1,7 +1,7 @@ + # Makefile for rebind + +-CC = gcc +-CFLAGS = -Wall -Wextra -I../elfrw ++CC ?= gcc ++CFLAGS += -I../elfrw + + rebind: rebind.c ../elfrw/libelfrw.a + +diff -Naur ELFkickers-3.0.orig//sstrip/Makefile ELFkickers-3.0/sstrip/Makefile +--- ELFkickers-3.0.orig//sstrip/Makefile 2011-05-23 23:29:58.000000000 -0400 ++++ ELFkickers-3.0/sstrip/Makefile 2011-06-02 23:05:41.000000000 -0400 +@@ -1,7 +1,7 @@ + # Makefile for sstrip + +-CC = gcc +-CFLAGS = -Wall -Wextra -I../elfrw ++CC ?= gcc ++CFLAGS += -I../elfrw + + sstrip: sstrip.c ../elfrw/libelfrw.a + -- cgit v1.2.3-65-gdbad