Gentoo Archives: gentoo-commits

From: Jory Pratt <anarchy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/jemalloc/files/
Date: Mon, 05 Sep 2016 01:22:15
Message-Id: 1473029924.742d5110137c2031c6ff08faf1163aeed0f5e836.anarchy@gentoo
1 commit: 742d5110137c2031c6ff08faf1163aeed0f5e836
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Sat Sep 3 16:00:06 2016 +0000
4 Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
5 CommitDate: Sun Sep 4 22:58:44 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=742d5110
7
8 dev-libs/jemalloc: remove unused patch
9
10 Closes: https://github.com/gentoo/gentoo/pull/2230
11
12 Signed-off-by: Jory A. Pratt <anarchy <AT> gentoo.org>
13
14 dev-libs/jemalloc/files/jemalloc-fix-ar-call.patch | 59 ----------------------
15 1 file changed, 59 deletions(-)
16
17 diff --git a/dev-libs/jemalloc/files/jemalloc-fix-ar-call.patch b/dev-libs/jemalloc/files/jemalloc-fix-ar-call.patch
18 deleted file mode 100644
19 index 6d81cda..00000000
20 --- a/dev-libs/jemalloc/files/jemalloc-fix-ar-call.patch
21 +++ /dev/null
22 @@ -1,59 +0,0 @@
23 -diff --git a/Makefile.in b/Makefile.in
24 -index 7481047..478becb 100644
25 ---- a/Makefile.in
26 -+++ b/Makefile.in
27 -@@ -55,6 +55,8 @@ PIC_CFLAGS = @PIC_CFLAGS@
28 - CTARGET = @CTARGET@
29 - LDTARGET = @LDTARGET@
30 - MKLIB = @MKLIB@
31 -+AR = @AR@
32 -+ARFLAGS = crus
33 - CC_MM = @CC_MM@
34 -
35 - ifeq (macho, $(ABI))
36 -@@ -185,7 +187,7 @@ $(objroot)lib/$(LIBJEMALLOC)_s.$(A) : $(COBJS)
37 -
38 - $(STATIC_LIBS):
39 - @mkdir -p $(@D)
40 -- $(MKLIB) $+
41 -+ $(AR) $(ARFLAGS) $@ $+
42 -
43 - $(objroot)test/bitmap$(EXE): $(objroot)src/bitmap.$(O)
44 -
45 -diff --git a/configure.ac b/configure.ac
46 -index c270662..f4b4c21 100644
47 ---- a/configure.ac
48 -+++ b/configure.ac
49 -@@ -226,9 +226,13 @@ PIC_CFLAGS='-fPIC -DPIC'
50 - CTARGET='-o $@'
51 - LDTARGET='-o $@'
52 - EXTRA_LDFLAGS=
53 --MKLIB='ar crus $@'
54 - CC_MM=1
55 -
56 -+AN_MAKEVAR([AR], [AC_PROG_AR])
57 -+AN_PROGRAM([ar], [AC_PROG_AR])
58 -+AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL(AR, ar, :)])
59 -+AC_PROG_AR
60 -+
61 - dnl Platform-specific settings. abi and RPATH can probably be determined
62 - dnl programmatically, but doing so is error-prone, which makes it generally
63 - dnl not worth the trouble.
64 -@@ -310,7 +314,8 @@ case "${host}" in
65 - EXTRA_LDFLAGS="-link -DEBUG"
66 - CTARGET='-Fo$@'
67 - LDTARGET='-Fe$@'
68 -- MKLIB='lib -nologo -out:$@'
69 -+ AR='lib'
70 -+ ARFLAGS='-nologo -out:'
71 - CC_MM=
72 - else
73 - importlib="${so}"
74 -@@ -403,7 +408,6 @@ AC_SUBST([enable_autogen])
75 -
76 - AC_PROG_INSTALL
77 - AC_PROG_RANLIB
78 --AC_PATH_PROG([AR], [ar], [false], [$PATH])
79 - AC_PATH_PROG([LD], [ld], [false], [$PATH])
80 - AC_PATH_PROG([AUTOCONF], [autoconf], [false], [$PATH])
81 -