pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
jemalloc: Update to 4.0.4
Module Name: pkgsrc-wip
Committed By: Jonathan Buschmann <jonthn+pkgsrc%pinacea.com@localhost>
Pushed By: jonthn
Date: Tue Jan 5 22:15:40 2016 +0100
Changeset: 18ffbcfe3891323a6e1cfeb77e445711583bab58
Modified Files:
TODO
jemalloc/Makefile
jemalloc/PLIST
jemalloc/buildlink3.mk
jemalloc/distinfo
Added Files:
jemalloc/patches/patch-configure
Removed Files:
jemalloc/patches/patch-Makefile.in
jemalloc/patches/patch-configure.ac
Log Message:
jemalloc: Update to 4.0.4
Switch to release version distributed on Github
This change library so.name from .1 to .2
TODO: Update to 4.0.4 (instead of 4.0.1) was done
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=18ffbcfe3891323a6e1cfeb77e445711583bab58
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
TODO | 1 -
jemalloc/Makefile | 13 +++++--------
jemalloc/PLIST | 8 +++++---
jemalloc/buildlink3.mk | 2 +-
jemalloc/distinfo | 10 +++++-----
jemalloc/patches/patch-Makefile.in | 15 ---------------
jemalloc/patches/patch-configure | 31 +++++++++++++++++++++++++++++++
jemalloc/patches/patch-configure.ac | 25 -------------------------
8 files changed, 47 insertions(+), 58 deletions(-)
diffs:
diff --git a/TODO b/TODO
index c621ce5..d787225 100644
--- a/TODO
+++ b/TODO
@@ -59,7 +59,6 @@ Suggested package updates
o java-asm-3.2
o java-bcel-5.2
o java-swt-3.6
- o jemalloc-4.0.1
o kawa-1.9.1
o kino-1.0.0
o kmymoney4-4.6.2
diff --git a/jemalloc/Makefile b/jemalloc/Makefile
index 20faf50..c14704c 100644
--- a/jemalloc/Makefile
+++ b/jemalloc/Makefile
@@ -1,9 +1,11 @@
# $NetBSD: Makefile,v 1.1 2015/04/30 22:16:52 jonthn Exp $
-DISTNAME= jemalloc-3.6.0
+DISTNAME= jemalloc-4.0.4
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GITHUB:=jemalloc/}
GITHUB_PROJECT= jemalloc
+GITHUB_RELEASE= ${DISTNAME:S/jemalloc-//}
+EXTRACT_SUFX= .tar.bz2
HOMEPAGE= http://www.canonware.com/jemalloc/
COMMENT= Library jemalloc is a general purpose malloc(3) implementation
@@ -17,11 +19,10 @@ USE_LANGUAGES= c
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-cc-silence
CONFIGURE_ARGS+= --enable-xmalloc
-CONFIGURE_ARGS+= --disable-shared
-CONFIGURE_ARGS+= --with-xslroot=${LOCALBASE}/share/xsl/docbook/
+CONFIGURE_ARGS+= --with-xslroot=${PREFIX}/share/xsl/docbook/
USE_TOOLS+= perl:run
-REPLACE_PERL= bin/jepprof
+REPLACE_PERL= bin/jeprof.in
BUILD_TARGET= all dist
@@ -34,8 +35,4 @@ SOEXT= so
.endif
PLIST_SUBST+= SOEXT=${SOEXT}
-pre-configure:
- cd ${WRKSRC} && ./autogen.sh
- cd ${WRKSRC} && mv bin/pprof bin/jepprof
-
.include "../../mk/bsd.pkg.mk"
diff --git a/jemalloc/PLIST b/jemalloc/PLIST
index f8e950a..37d9057 100644
--- a/jemalloc/PLIST
+++ b/jemalloc/PLIST
@@ -1,10 +1,12 @@
-@comment $NetBSD: PLIST,v 1.1 2015/04/30 22:16:52 jonthn Exp $
+@comment $NetBSD$
+bin/jemalloc-config
bin/jemalloc.sh
-bin/jepprof
+bin/jeprof
include/jemalloc/jemalloc.h
-lib/libjemalloc.1.${SOEXT}
+lib/libjemalloc.2.${SOEXT}
lib/libjemalloc.a
lib/libjemalloc.${SOEXT}
lib/libjemalloc_pic.a
+lib/pkgconfig/jemalloc.pc
man/man3/jemalloc.3
share/doc/jemalloc/jemalloc.html
diff --git a/jemalloc/buildlink3.mk b/jemalloc/buildlink3.mk
index 2f1bf33..c35a260 100644
--- a/jemalloc/buildlink3.mk
+++ b/jemalloc/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+= jemalloc
.if !defined(JEMALLOC_BUILDLINK3_MK)
JEMALLOC_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.jemalloc+= jemalloc>=3.6.0
+BUILDLINK_API_DEPENDS.jemalloc+= jemalloc>=4.0.0
BUILDLINK_PKGSRCDIR.jemalloc?= ../../wip/jemalloc
.endif # JEMALLOC_BUILDLINK3_MK
diff --git a/jemalloc/distinfo b/jemalloc/distinfo
index ee1bafa..cb3eaae 100644
--- a/jemalloc/distinfo
+++ b/jemalloc/distinfo
@@ -1,7 +1,7 @@
$NetBSD: distinfo,v 1.1 2015/04/30 22:16:52 jonthn Exp $
-SHA1 (jemalloc-3.6.0.tar.gz) = e05d850acc71987b2334bae0c4d46f8af915d977
-RMD160 (jemalloc-3.6.0.tar.gz) = 816028cbeeda1b4f07e4ee52bc6ea06293f96ae7
-Size (jemalloc-3.6.0.tar.gz) = 335634 bytes
-SHA1 (patch-Makefile.in) = 9561c85484fb8412bc770b5cf27b5c130fe37d00
-SHA1 (patch-configure.ac) = 7249bfe0ac333247df874d28ec92346980545375
+SHA1 (jemalloc-4.0.4.tar.bz2) = 665050e09ed2270899c2421248f21e6d52dfd9dd
+RMD160 (jemalloc-4.0.4.tar.bz2) = 9d3572a41c5c5ed0ed15bd3cb82c1098767b11e7
+SHA512 (jemalloc-4.0.4.tar.bz2) = 93be0551a80d5f5dc3a1044ef3d5f06c5ce65f3c1fd753743ee64340b841fc2d7902178774ab71eaa633f68abad44109870eb84159679fdc8ce6d93db3a53112
+Size (jemalloc-4.0.4.tar.bz2) = 391483 bytes
+SHA1 (patch-configure) = b559bf399071f29f336ba8cb02a7796ec85ff8bb
diff --git a/jemalloc/patches/patch-Makefile.in b/jemalloc/patches/patch-Makefile.in
deleted file mode 100644
index f6d0598..0000000
--- a/jemalloc/patches/patch-Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-Makefile.in,v 1.1 2015/04/30 22:16:52 jonthn Exp $
-
-Rename pprof to jepprof to avoid conflict with gperftools
-
---- Makefile.in.orig 2015-04-30 21:14:08.000000000 +0000
-+++ Makefile.in
-@@ -73,7 +73,7 @@ endif
- LIBJEMALLOC := $(LIBPREFIX)jemalloc$(install_suffix)
-
- # Lists of files.
--BINS := $(srcroot)bin/pprof $(objroot)bin/jemalloc.sh
-+BINS := $(srcroot)bin/jepprof $(objroot)bin/jemalloc.sh
- C_HDRS := $(objroot)include/jemalloc/jemalloc$(install_suffix).h
- C_SRCS := $(srcroot)src/jemalloc.c $(srcroot)src/arena.c \
- $(srcroot)src/atomic.c $(srcroot)src/base.c $(srcroot)src/bitmap.c \
diff --git a/jemalloc/patches/patch-configure b/jemalloc/patches/patch-configure
new file mode 100644
index 0000000..fd9d56a
--- /dev/null
+++ b/jemalloc/patches/patch-configure
@@ -0,0 +1,31 @@
+$NetBSD$
+
+Remove configure code using git to set version, could be problematic if inside
+ a git tree (i.e. pkgsrc-wip)
+
+--- configure.orig 2016-01-05 20:59:08.000000000 +0000
++++ configure
+@@ -6966,23 +6966,6 @@ fi
+
+
+
+-if test "x`test ! \"${srcroot}\" && cd \"${srcroot}\"; git rev-parse --is-inside-work-tree 2>/dev/null`" = "xtrue" ; then
+- rm -f "${objroot}VERSION"
+- for pattern in '[0-9].[0-9].[0-9]' '[0-9].[0-9].[0-9][0-9]' \
+- '[0-9].[0-9][0-9].[0-9]' '[0-9].[0-9][0-9].[0-9][0-9]' \
+- '[0-9][0-9].[0-9].[0-9]' '[0-9][0-9].[0-9].[0-9][0-9]' \
+- '[0-9][0-9].[0-9][0-9].[0-9]' \
+- '[0-9][0-9].[0-9][0-9].[0-9][0-9]'; do
+- if test ! -e "${objroot}VERSION" ; then
+- (test ! "${srcroot}" && cd "${srcroot}"; git describe --long --abbrev=40 --match="${pattern}") > "${objroot}VERSION.tmp" 2>/dev/null
+- if test $? -eq 0 ; then
+- mv "${objroot}VERSION.tmp" "${objroot}VERSION"
+- break
+- fi
+- fi
+- done
+-fi
+-rm -f "${objroot}VERSION.tmp"
+ if test ! -e "${objroot}VERSION" ; then
+ if test ! -e "${srcroot}VERSION" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Missing VERSION file, and unable to generate it; creating bogus VERSION" >&5
diff --git a/jemalloc/patches/patch-configure.ac b/jemalloc/patches/patch-configure.ac
deleted file mode 100644
index f6bd4a7..0000000
--- a/jemalloc/patches/patch-configure.ac
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-configure.ac,v 1.1 2015/04/30 22:16:52 jonthn Exp $
-
-- Fix library id for Darwin
-- Test should use only one '='
-
---- configure.ac.orig 2014-03-31 16:33:19.000000000 +0000
-+++ configure.ac
-@@ -269,7 +269,7 @@ case "${host}" in
- so="dylib"
- importlib="${so}"
- force_tls="0"
-- DSO_LDFLAGS='-shared -Wl,-dylib_install_name,$(@F)'
-+ DSO_LDFLAGS='-shared -Wl,-install_name,$(LIBDIR)/$(@F)'
- SOREV="${rev}.${so}"
- sbrk_deprecated="1"
- ;;
-@@ -869,7 +869,7 @@ fi
- dnl Check whether the BSD/SUSv1 sbrk() exists. If not, disable DSS support.
- AC_CHECK_FUNC([sbrk], [have_sbrk="1"], [have_sbrk="0"])
- if test "x$have_sbrk" = "x1" ; then
-- if test "x$sbrk_deprecated" == "x1" ; then
-+ if test "x$sbrk_deprecated" = "x1" ; then
- AC_MSG_RESULT([Disabling dss allocation because sbrk is deprecated])
- enable_dss="0"
- else
Home |
Main Index |
Thread Index |
Old Index