[gentoo-commits] proj/mozilla:master commit in: dev-libs/jemalloc/files/, dev-libs/jemalloc/

["Jory Pratt" <anarchy@gentoo.org>]

commit:     4a741333ae8edd49cc39a34a6a3c12ff696b359c
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 11 14:45:29 2013 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sun Aug 11 14:45:29 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=4a741333

Fix ar call directly, bug #445988, Thanks iamnr3 for patch

---
 dev-libs/jemalloc/files/jemalloc-fix-ar-call.patch | 59 ++++++++++++++++++++++
 dev-libs/jemalloc/jemalloc-3.3.1.ebuild            |  3 +-
 2 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/dev-libs/jemalloc/files/jemalloc-fix-ar-call.patch b/dev-libs/jemalloc/files/jemalloc-fix-ar-call.patch
new file mode 100644
index 0000000..6d81cda
--- /dev/null
+++ b/dev-libs/jemalloc/files/jemalloc-fix-ar-call.patch
@@ -0,0 +1,59 @@
+diff --git a/Makefile.in b/Makefile.in
+index 7481047..478becb 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -55,6 +55,8 @@ PIC_CFLAGS = @PIC_CFLAGS@
+ CTARGET = @CTARGET@
+ LDTARGET = @LDTARGET@
+ MKLIB = @MKLIB@
++AR = @AR@
++ARFLAGS = crus
+ CC_MM = @CC_MM@
+ 
+ ifeq (macho, $(ABI))
+@@ -185,7 +187,7 @@ $(objroot)lib/$(LIBJEMALLOC)_s.$(A) : $(COBJS)
+ 
+ $(STATIC_LIBS):
+ 	@mkdir -p $(@D)
+-	$(MKLIB) $+
++	$(AR) $(ARFLAGS) $@ $+
+ 
+ $(objroot)test/bitmap$(EXE): $(objroot)src/bitmap.$(O)
+ 
+diff --git a/configure.ac b/configure.ac
+index c270662..f4b4c21 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -226,9 +226,13 @@ PIC_CFLAGS='-fPIC -DPIC'
+ CTARGET='-o $@'
+ LDTARGET='-o $@'
+ EXTRA_LDFLAGS=
+-MKLIB='ar crus $@'
+ CC_MM=1
+ 
++AN_MAKEVAR([AR], [AC_PROG_AR])
++AN_PROGRAM([ar], [AC_PROG_AR])
++AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL(AR, ar, :)])
++AC_PROG_AR
++
+ dnl Platform-specific settings.  abi and RPATH can probably be determined
+ dnl programmatically, but doing so is error-prone, which makes it generally
+ dnl not worth the trouble.
+@@ -310,7 +314,8 @@ case "${host}" in
+ 	  EXTRA_LDFLAGS="-link -DEBUG"
+ 	  CTARGET='-Fo$@'
+ 	  LDTARGET='-Fe$@'
+-	  MKLIB='lib -nologo -out:$@'
++	  AR='lib'
++	  ARFLAGS='-nologo -out:'
+ 	  CC_MM=
+         else
+ 	  importlib="${so}"
+@@ -403,7 +408,6 @@ AC_SUBST([enable_autogen])
+ 
+ AC_PROG_INSTALL
+ AC_PROG_RANLIB
+-AC_PATH_PROG([AR], [ar], [false], [$PATH])
+ AC_PATH_PROG([LD], [ld], [false], [$PATH])
+ AC_PATH_PROG([AUTOCONF], [autoconf], [false], [$PATH])
+ 

diff --git a/dev-libs/jemalloc/jemalloc-3.3.1.ebuild b/dev-libs/jemalloc/jemalloc-3.3.1.ebuild
index afe943a..5874024 100644
--- a/dev-libs/jemalloc/jemalloc-3.3.1.ebuild
+++ b/dev-libs/jemalloc/jemalloc-3.3.1.ebuild
@@ -19,7 +19,8 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}/${PN}-3.0.0-strip-optimization.patch" \
 		"${FILESDIR}/${PN}-3.0.0-no-pprof.patch" \
-		"${FILESDIR}/${PN}-3.0.0_fix_html_install.patch"
+		"${FILESDIR}/${PN}-3.0.0_fix_html_install.patch" \
+		"${FILESDIR}/${PN}-fix-ar-call.patch"
 
 	eautoreconf
 }