public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-util/elfkickers/files/, dev-util/elfkickers/
@ 2016-11-16 22:24 Anthony G. Basile
  0 siblings, 0 replies; 4+ messages in thread
From: Anthony G. Basile @ 2016-11-16 22:24 UTC (permalink / raw
  To: gentoo-commits

commit:     7ff69ead5f44e461213fbe78abe8c3d82491ddb0
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 16 22:21:30 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Nov 16 22:24:32 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ff69ead

dev-util/elfkickers: version bump to 3.1

Package-Manager: portage-2.3.0

 dev-util/elfkickers/Manifest                       |   1 +
 dev-util/elfkickers/elfkickers-3.1.ebuild          |  35 +++++++
 .../files/elfkickers-3.1-create-destdir-path.patch |  17 ++++
 .../elfkickers-3.1-respect-CFLAGS-LDFLAGS.patch    | 103 +++++++++++++++++++++
 4 files changed, 156 insertions(+)

diff --git a/dev-util/elfkickers/Manifest b/dev-util/elfkickers/Manifest
index 8e8bff7..c2e6deb 100644
--- a/dev-util/elfkickers/Manifest
+++ b/dev-util/elfkickers/Manifest
@@ -1,2 +1,3 @@
 DIST ELFkickers-3.0.tar.gz 99527 SHA256 8597dc38ecb1a352f86c5075608547f2c4dcd50f4ba89de70c5494cf6611c6aa SHA512 dab3076baa0bc62cdcadd885fa101df77e602ba32b67ad1635be1f981e817078944f682f3bffaba1c8b0dc181036f7266ddbd82fe15a2e34ca5dadf1aa9974ed WHIRLPOOL d5d4a98169ad397df695a7f7861a95b44ca7c48d454968788965098077e04a58c953d984dfa6dbb7963c1cd52cec2965f4faf6a7ca08e1adde1e9d8915dabd62
 DIST ELFkickers-3.0a.tar.gz 100112 SHA256 c3429957142169c21ff550e0c06bbb0d48bb76437c4ccbc67164bf56b6e9774f SHA512 c90a763e5b60069f9cb67fd5c114da753184ff466c3db1dd9a44e86de9408a4384a3ac00a8c67191ca9a6556fd0db11058542361e987710f9b5bedabaec2717c WHIRLPOOL 9ed47c5c64c79dca6bce891beb430502b33481b3bc14f19f46e26157b6772ca5d1e6bc00907337dd3dc07d163b6a0cc246fef7e4afd36a85547e210b7b4bd2ea
+DIST ELFkickers-3.1.tar.gz 101406 SHA256 6d663fb06dd723a078282937052368498e3860d3c42f0d765579d496e5f51a58 SHA512 a0b1ba6cdb23b12f41b81cac1960b15cc2a4418cef48923900b668fa5132ce428bab16b1780698864fdf0c374762d57f471fc124d231f8de143be172c757000b WHIRLPOOL 550df625744d0de9170623ae6aa849840309369085be65d7784b81147826109f8c2997d65cdc20359f728b468a94b212bc5c89d6236a0cb05c9f98fa8e3fec9d

diff --git a/dev-util/elfkickers/elfkickers-3.1.ebuild b/dev-util/elfkickers/elfkickers-3.1.ebuild
new file mode 100644
index 00000000..dbeb2f2
--- /dev/null
+++ b/dev-util/elfkickers/elfkickers-3.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+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 ~arm ~hppa ~mips ~sparc ~x86 ~x86-fbsd"
+IUSE="doc"
+
+DEPEND="app-misc/pax-utils"
+RDEPEND=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-respect-CFLAGS-LDFLAGS.patch
+	epatch "${FILESDIR}"/${P}-create-destdir-path.patch
+	epatch "${FILESDIR}"/add-freebsd-elf-defs.patch
+	sed -i -e "s:^prefix = /usr/local:prefix = ${D}:" Makefile \
+		|| die "sed failed"
+	eapply_user
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) all
+}

diff --git a/dev-util/elfkickers/files/elfkickers-3.1-create-destdir-path.patch b/dev-util/elfkickers/files/elfkickers-3.1-create-destdir-path.patch
new file mode 100644
index 00000000..1f0c3e9
--- /dev/null
+++ b/dev-util/elfkickers/files/elfkickers-3.1-create-destdir-path.patch
@@ -0,0 +1,17 @@
+diff -Naur ELFkickers-3.1.orig/Makefile ELFkickers-3.1/Makefile
+--- ELFkickers-3.1.orig/Makefile	2015-07-23 13:25:30.000000000 -0400
++++ ELFkickers-3.1/Makefile	2016-11-16 17:17:08.237039268 -0500
+@@ -24,10 +24,9 @@
+ infect: bin/infect doc/infect.1
+ 
+ install: $(PROGRAMS)
+-	mkdir -p $(prefix)/bin
+-	cp bin/* $(prefix)/bin/.
+-	mkdir -p $(prefix)/share/man/man1
+-	cp doc/* $(prefix)/share/man/man1/.
++	install -d $(prefix)/usr/bin $(prefix)/usr/share/man/man1
++	install bin/* $(prefix)/usr/bin
++	install -m 644 doc/* $(prefix)/usr/share/man/man1
+ 
+ clean:
+ 	for dir in elfrw $(PROGRAMS) ; do $(MAKE) -C$$dir clean ; done

diff --git a/dev-util/elfkickers/files/elfkickers-3.1-respect-CFLAGS-LDFLAGS.patch b/dev-util/elfkickers/files/elfkickers-3.1-respect-CFLAGS-LDFLAGS.patch
new file mode 100644
index 00000000..b285f3b
--- /dev/null
+++ b/dev-util/elfkickers/files/elfkickers-3.1-respect-CFLAGS-LDFLAGS.patch
@@ -0,0 +1,103 @@
+diff -Naur ELFkickers-3.1.orig/ebfc/Makefile ELFkickers-3.1/ebfc/Makefile
+--- ELFkickers-3.1.orig/ebfc/Makefile	2014-11-17 14:50:34.000000000 -0500
++++ ELFkickers-3.1/ebfc/Makefile	2016-11-16 17:13:53.297033908 -0500
+@@ -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.1.orig/elfls/Makefile ELFkickers-3.1/elfls/Makefile
+--- ELFkickers-3.1.orig/elfls/Makefile	2011-05-31 02:53:05.000000000 -0400
++++ ELFkickers-3.1/elfls/Makefile	2016-11-16 17:12:48.885032137 -0500
+@@ -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.1.orig/elfrw/Makefile ELFkickers-3.1/elfrw/Makefile
+--- ELFkickers-3.1.orig/elfrw/Makefile	2011-05-22 14:02:12.000000000 -0400
++++ ELFkickers-3.1/elfrw/Makefile	2016-11-16 17:13:06.653032625 -0500
+@@ -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.1.orig/elftoc/Makefile ELFkickers-3.1/elftoc/Makefile
+--- ELFkickers-3.1.orig/elftoc/Makefile	2011-05-23 23:30:22.000000000 -0400
++++ ELFkickers-3.1/elftoc/Makefile	2016-11-16 17:12:57.549032375 -0500
+@@ -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.1.orig/infect/Makefile ELFkickers-3.1/infect/Makefile
+--- ELFkickers-3.1.orig/infect/Makefile	2011-05-31 02:52:27.000000000 -0400
++++ ELFkickers-3.1/infect/Makefile	2016-11-16 17:12:30.617031634 -0500
+@@ -1,7 +1,6 @@
+ #  Makefile for infect
+ 
+-CC = gcc
+-CFLAGS = -Wall -Wextra
++CC ?= gcc
+ 
+ infect: infect.c
+ 
+diff -Naur ELFkickers-3.1.orig/objres/Makefile ELFkickers-3.1/objres/Makefile
+--- ELFkickers-3.1.orig/objres/Makefile	2016-11-14 16:46:24.000000000 -0500
++++ ELFkickers-3.1/objres/Makefile	2016-11-16 17:13:40.225033549 -0500
+@@ -1,8 +1,7 @@
+ #  Makefile for objres
+ 
+-CC = gcc
+-CFLAGS = -Wall -Wextra -I../elfrw
+-LDFLAGS = -Wall -Wextra
++CC ?= gcc
++CFLAGS += -I../elfrw
+ 
+ objres: objres.o ../elfrw/libelfrw.a
+ 
+diff -Naur ELFkickers-3.1.orig/rebind/Makefile ELFkickers-3.1/rebind/Makefile
+--- ELFkickers-3.1.orig/rebind/Makefile	2011-05-23 23:29:16.000000000 -0400
++++ ELFkickers-3.1/rebind/Makefile	2016-11-16 17:13:17.373032920 -0500
+@@ -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.1.orig/sstrip/Makefile ELFkickers-3.1/sstrip/Makefile
+--- ELFkickers-3.1.orig/sstrip/Makefile	2011-05-23 23:29:58.000000000 -0400
++++ ELFkickers-3.1/sstrip/Makefile	2016-11-16 17:14:05.949034256 -0500
+@@ -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
+ 


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

* [gentoo-commits] repo/gentoo:master commit in: dev-util/elfkickers/files/, dev-util/elfkickers/
@ 2020-02-18 19:11 David Seifert
  0 siblings, 0 replies; 4+ messages in thread
From: David Seifert @ 2020-02-18 19:11 UTC (permalink / raw
  To: gentoo-commits

commit:     2040b0d642f3de39fa3cb12c0d71fa329c60eb2d
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 18 19:11:22 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Feb 18 19:11:22 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2040b0d6

dev-util/elfkickers: Remove old

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 dev-util/elfkickers/Manifest                       |   2 -
 dev-util/elfkickers/elfkickers-3.0a.ebuild         |  33 -------
 dev-util/elfkickers/elfkickers-3.1.ebuild          |  37 --------
 .../elfkickers/files/create-destdir-path.patch     |  14 ---
 .../elfkickers/files/respect-CFLAGS-LDFLAGS.patch  | 102 ---------------------
 5 files changed, 188 deletions(-)

diff --git a/dev-util/elfkickers/Manifest b/dev-util/elfkickers/Manifest
index fc20901c0db..9ec6982fc21 100644
--- a/dev-util/elfkickers/Manifest
+++ b/dev-util/elfkickers/Manifest
@@ -1,3 +1 @@
-DIST ELFkickers-3.0a.tar.gz 100112 BLAKE2B 3fad92a6fd0cb285d8df2d529f95eccd7df8382925520989a3096354170535e02c890f5d5b4f6ae5a520750afe2477625371ee71f1bfc5d6b35d752749c7dc5a SHA512 c90a763e5b60069f9cb67fd5c114da753184ff466c3db1dd9a44e86de9408a4384a3ac00a8c67191ca9a6556fd0db11058542361e987710f9b5bedabaec2717c
-DIST ELFkickers-3.1.tar.gz 101406 BLAKE2B 8de2c27904909ede753b94cebe87789b27f02f98ce54342031330579a7ae021585117be4b61d8c7895c9c6a2c9b33f398cde9be1070ccbe24e51669db59bba73 SHA512 a0b1ba6cdb23b12f41b81cac1960b15cc2a4418cef48923900b668fa5132ce428bab16b1780698864fdf0c374762d57f471fc124d231f8de143be172c757000b
 DIST ELFkickers-3.1a.tar.gz 101709 BLAKE2B f4e32be84bb05d0f5823fb09d60596086d70f726312285ce847b79ed7f08eed936cf72a9eff92123c4fecee9e4748a83363a05075a29d04490bd02701d53bc59 SHA512 a3ec3c1d5062c67e0108a04ea9a7e9d88d1e5090af887544be756f3269a28950d1211908b74da287d82975dada4a6ea30686b5a3cffa203b9ebf835a5c13d408

diff --git a/dev-util/elfkickers/elfkickers-3.0a.ebuild b/dev-util/elfkickers/elfkickers-3.0a.ebuild
deleted file mode 100644
index f23d0b5fe81..00000000000
--- a/dev-util/elfkickers/elfkickers-3.0a.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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 arm ~hppa ~mips sparc x86"
-IUSE="doc"
-
-DEPEND="app-misc/pax-utils"
-RDEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/respect-CFLAGS-LDFLAGS.patch
-	epatch "${FILESDIR}"/create-destdir-path.patch
-	epatch "${FILESDIR}"/add-freebsd-elf-defs.patch
-	sed -i -e "s:^prefix = /usr/local:prefix = ${D}:" Makefile \
-		|| die "sed failed"
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) all
-}

diff --git a/dev-util/elfkickers/elfkickers-3.1.ebuild b/dev-util/elfkickers/elfkickers-3.1.ebuild
deleted file mode 100644
index 25bd020329b..00000000000
--- a/dev-util/elfkickers/elfkickers-3.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit 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 ~arm ~hppa ~mips ~sparc ~x86"
-IUSE="doc"
-
-DEPEND="app-misc/pax-utils"
-RDEPEND=""
-
-PATCHES=(
-	"${FILESDIR}"/${P}-respect-CFLAGS-LDFLAGS.patch
-	"${FILESDIR}"/${P}-create-destdir-path.patch
-	"${FILESDIR}"/add-freebsd-elf-defs.patch
-)
-
-src_prepare() {
-	default
-	sed -i -e "s:^prefix = /usr/local:prefix = ${D}:" Makefile \
-		|| die "sed failed"
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) all
-}

diff --git a/dev-util/elfkickers/files/create-destdir-path.patch b/dev-util/elfkickers/files/create-destdir-path.patch
deleted file mode 100644
index d279db0ad60..00000000000
--- a/dev-util/elfkickers/files/create-destdir-path.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- Makefile.orig	2011-05-30 16:37:41.000000000 -0400
-+++ Makefile	2011-05-30 16:38:30.000000000 -0400
-@@ -22,8 +22,9 @@
- infect: bin/infect doc/infect.1
- 
- install: $(PROGRAMS:%=bin/%)
--	cp bin/* $(prefix)/bin/.
--	cp doc/* $(prefix)/share/man/man1/.
-+	install -d $(prefix)/usr/bin $(prefix)/usr/share/man/man1
-+	install bin/* $(prefix)/usr/bin
-+	install -m 644 doc/* $(prefix)/usr/share/man/man1
- 
- clean:
- 	for dir in elfrw $(PROGRAMS) ; do $(MAKE) -C$$dir clean ; done

diff --git a/dev-util/elfkickers/files/respect-CFLAGS-LDFLAGS.patch b/dev-util/elfkickers/files/respect-CFLAGS-LDFLAGS.patch
deleted file mode 100644
index 6663ef8e79a..00000000000
--- a/dev-util/elfkickers/files/respect-CFLAGS-LDFLAGS.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-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
- 


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

* [gentoo-commits] repo/gentoo:master commit in: dev-util/elfkickers/files/, dev-util/elfkickers/
@ 2021-05-16 17:38 Sergei Trofimovich
  0 siblings, 0 replies; 4+ messages in thread
From: Sergei Trofimovich @ 2021-05-16 17:38 UTC (permalink / raw
  To: gentoo-commits

commit:     5d9fb1a5e06bd4902df8b2bd0992148957089e25
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun May 16 17:32:42 2021 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun May 16 17:37:57 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d9fb1a5

dev-util/elfkickers: respect user's $(AR)

Reported-by: Agostino Sarubbo
Closes: https://bugs.gentoo.org/724258
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 dev-util/elfkickers/elfkickers-3.1a.ebuild        | 10 +++++-----
 dev-util/elfkickers/files/elfkickers-3.1-AR.patch | 23 +++++++++++++++++++++++
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/dev-util/elfkickers/elfkickers-3.1a.ebuild b/dev-util/elfkickers/elfkickers-3.1a.ebuild
index cc49c477cb5..769f64eccd2 100644
--- a/dev-util/elfkickers/elfkickers-3.1a.ebuild
+++ b/dev-util/elfkickers/elfkickers-3.1a.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,14 +24,14 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.1-respect-CFLAGS-LDFLAGS.patch
 	"${FILESDIR}"/${PN}-3.1-create-destdir-path.patch
 	"${FILESDIR}"/add-freebsd-elf-defs.patch
+	"${FILESDIR}"/${PN}-3.1-AR.patch
 )
 
 src_prepare() {
 	default
+
+	tc-export AR CC
+
 	sed -i -e "s:^prefix = /usr/local:prefix = ${D}:" Makefile \
 		|| die "sed failed"
 }
-
-src_compile() {
-	emake CC=$(tc-getCC) all
-}

diff --git a/dev-util/elfkickers/files/elfkickers-3.1-AR.patch b/dev-util/elfkickers/files/elfkickers-3.1-AR.patch
new file mode 100644
index 00000000000..6b5100c06ee
--- /dev/null
+++ b/dev-util/elfkickers/files/elfkickers-3.1-AR.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/724258
+--- a/ebfc/Makefile
++++ b/ebfc/Makefile
+@@ -10,7 +10,7 @@ brainfuck.o: brainfuck.c elfparts.h ebfc.h
+ 
+ libelfparts.a: elfparts.o ehdr.o phdrtab.o shdrtab.o progbits.o	\
+                strtab.o symtab.o hash.o rel.o got.o dynamic.o
+-	ar crs libelfparts.a $^
++	$(AR) crs libelfparts.a $^
+ 
+ elfparts.o: elfparts.c elfparts.h gen.h
+ ehdr.o: ehdr.c elfparts.h gen.h
+--- a/elfrw/Makefile
++++ b/elfrw/Makefile
+@@ -6,7 +6,7 @@ LIBOBJS = elfrw.o elfrw_dyn.o elfrw_ehdr.o elfrw_phdr.o elfrw_rel.o \
+           elfrw_shdr.o elfrw_sym.o elfrw_ver.o
+ 
+ libelfrw.a: $(LIBOBJS)
+-	ar crs $@ $^
++	$(AR) crs $@ $^
+ 
+ elfrw.o: elfrw.c elfrw.h elfrw_int.h
+ elfrw_dyn.o: elfrw_dyn.c elfrw_int.h


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

* [gentoo-commits] repo/gentoo:master commit in: dev-util/elfkickers/files/, dev-util/elfkickers/
@ 2024-08-24 16:28 Sam James
  0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2024-08-24 16:28 UTC (permalink / raw
  To: gentoo-commits

commit:     bc62cb38178f2a4a588ba56de321d646a6975894
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 24 16:24:40 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Aug 24 16:24:40 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc62cb38

dev-util/elfkickers: drop 3.1a

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/elfkickers/Manifest                      |  1 -
 dev-util/elfkickers/elfkickers-3.1a.ebuild        | 38 -----------------------
 dev-util/elfkickers/files/elfkickers-3.1-CC.patch | 12 -------
 3 files changed, 51 deletions(-)

diff --git a/dev-util/elfkickers/Manifest b/dev-util/elfkickers/Manifest
index 4a29c8469b00..ae05cf51db20 100644
--- a/dev-util/elfkickers/Manifest
+++ b/dev-util/elfkickers/Manifest
@@ -1,2 +1 @@
-DIST ELFkickers-3.1a.tar.gz 101709 BLAKE2B f4e32be84bb05d0f5823fb09d60596086d70f726312285ce847b79ed7f08eed936cf72a9eff92123c4fecee9e4748a83363a05075a29d04490bd02701d53bc59 SHA512 a3ec3c1d5062c67e0108a04ea9a7e9d88d1e5090af887544be756f3269a28950d1211908b74da287d82975dada4a6ea30686b5a3cffa203b9ebf835a5c13d408
 DIST ELFkickers-3.2.tar.gz 108555 BLAKE2B d9ed0c6a2a782e7178480436d526674661af1f625788a28c8e41b97cabb1412f083b492fd36778de17ded7d123003dde878a45af9a63cf7c1e7bff860dc3a0d1 SHA512 ea8b274030880579a44149a1c093e0dce2d9889729f5b4bf1a998d97a78f9bb3cf3fdec807eafda964060fd464a44d4992b35a397737724f7f95732186b8b3ea

diff --git a/dev-util/elfkickers/elfkickers-3.1a.ebuild b/dev-util/elfkickers/elfkickers-3.1a.ebuild
deleted file mode 100644
index 17da43f9da49..000000000000
--- a/dev-util/elfkickers/elfkickers-3.1a.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit 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 arm ~hppa ~mips sparc x86"
-IUSE="doc"
-
-DEPEND="app-misc/pax-utils"
-RDEPEND=""
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1-respect-CFLAGS-LDFLAGS.patch
-	"${FILESDIR}"/${PN}-3.1-create-destdir-path.patch
-	"${FILESDIR}"/add-freebsd-elf-defs.patch
-	"${FILESDIR}"/${PN}-3.1-AR.patch
-	"${FILESDIR}"/${PN}-3.1-CC.patch
-)
-
-src_prepare() {
-	default
-
-	tc-export AR CC
-
-	sed -i -e "s:^prefix = /usr/local:prefix = \${DESTDIR}/:" Makefile \
-		|| die "sed failed"
-}

diff --git a/dev-util/elfkickers/files/elfkickers-3.1-CC.patch b/dev-util/elfkickers/files/elfkickers-3.1-CC.patch
deleted file mode 100644
index b1541d5cb179..000000000000
--- a/dev-util/elfkickers/files/elfkickers-3.1-CC.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-https://bugs.gentoo.org/790611
---- a/elftoc/Makefile
-+++ b/elftoc/Makefile
-@@ -30,7 +30,7 @@ out.o     : out.c out.h gen.h readelf.h pieces.h address.h shdrtab.h \
- elftoc.o  : elftoc.c gen.h readelf.h pieces.h address.h outbase.h out.h
- 
- elfnames.c: mknames
--	echo '#include <elf.h>' | gcc -E -dM -xc /dev/stdin | ./$^ $@
-+	echo '#include <elf.h>' | $(CC) -E -dM -xc /dev/stdin | ./$^ $@
- 
- mknames: mknames.o
- mknames.o: mknames.c


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

end of thread, other threads:[~2024-08-24 16:28 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-02-18 19:11 [gentoo-commits] repo/gentoo:master commit in: dev-util/elfkickers/files/, dev-util/elfkickers/ David Seifert
  -- strict thread matches above, loose matches on Subject: below --
2024-08-24 16:28 Sam James
2021-05-16 17:38 Sergei Trofimovich
2016-11-16 22:24 Anthony G. Basile

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