Attachment #148410 for bug #194435

Lines 1-7 Link Here

(-)mariadb55-server/Makefile (-1 / +1 lines)
1	# $FreeBSD: head/databases/mariadb55-server/Makefile 367285 2014-09-04 16:14:25Z robak $	1	# $FreeBSD: head/databases/mariadb55-server/Makefile 367285 2014-09-04 16:14:25Z robak $
2		2
3	PORTNAME?= mariadb	3	PORTNAME?= mariadb
4	PORTVERSION= 5.5.39	4	PORTVERSION= 5.5.40
5	CATEGORIES= databases ipv6	5	CATEGORIES= databases ipv6
6	MASTER_SITES= http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/source/ \	6	MASTER_SITES= http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/source/ \
7	http://mirrors.supportex.net/mariadb/${PORTNAME}-${PORTVERSION}/source/ \	7	http://mirrors.supportex.net/mariadb/${PORTNAME}-${PORTVERSION}/source/ \

Lines 1-2 Link Here

(-)mariadb55-server/distinfo (-2 / +2 lines)
1	SHA256 (mariadb-5.5.39.tar.gz) = cb850865ab55ce5f01c99a612cc75b76ead5d75adfa75a606f453d32f9089d14	1	SHA256 (mariadb-5.5.40.tar.gz) = cbde17f4a31483143490def6fcce33310ebae49eafe92dc4ada0e7227202415a
2	SIZE (mariadb-5.5.39.tar.gz) = 45084762	2	SIZE (mariadb-5.5.40.tar.gz) = 44745240




--- cmake/jemalloc.cmake.orig	2013-09-20 00:34:22.000000000 +0200
+++ cmake/jemalloc.cmake	2013-09-27 22:46:05.791110010 +0200
@@ -37,9 +37,9 @@
     SET(WITH_JEMALLOC "no")
   ENDIF()
   IF(WITH_JEMALLOC STREQUAL "system" OR WITH_JEMALLOC STREQUAL "yes")
-    CHECK_LIBRARY_EXISTS(jemalloc malloc_stats_print "" HAVE_JEMALLOC)
+    CHECK_LIBRARY_EXISTS(c malloc_stats_print "" HAVE_JEMALLOC)
     IF (HAVE_JEMALLOC)
-      SET(LIBJEMALLOC jemalloc)
+      SET(LIBJEMALLOC c)
     ELSEIF (WITH_JEMALLOC STREQUAL "system")
       MESSAGE(FATAL_ERROR "system jemalloc is not found")
     ELSEIF (WITH_JEMALLOC STREQUAL "yes")




--- cmake/jemalloc.cmake.orig	2014-10-08 15:19:51.000000000 +0200
+++ cmake/jemalloc.cmake	2014-10-17 22:20:23.000000000 +0200
@@ -22,11 +22,11 @@
       SET(libname jemalloc)
     ENDIF()
 
-    CHECK_LIBRARY_EXISTS(${libname} malloc_stats_print "" HAVE_JEMALLOC)
+    CHECK_LIBRARY_EXISTS(c malloc_stats_print "" HAVE_JEMALLOC)
     SET(CMAKE_REQUIRED_LIBRARIES)
 
     IF (HAVE_JEMALLOC)
-      SET(LIBJEMALLOC ${libname})
+      SET(LIBJEMALLOC c)
     ELSEIF (NOT WITH_JEMALLOC STREQUAL "auto")
       MESSAGE(FATAL_ERROR "${libname} is not found")
     ENDIF()

Return to bug 194435

Lines 1-14 Link Here

(-)mariadb55-server/files/patch-cmake__jemalloc.cmake (-14 lines)
1	--- cmake/jemalloc.cmake.orig 2013-09-20 00:34:22.000000000 +0200
2	+++ cmake/jemalloc.cmake 2013-09-27 22:46:05.791110010 +0200
3	@@ -37,9 +37,9 @@
4	SET(WITH_JEMALLOC "no")
5	ENDIF()
6	IF(WITH_JEMALLOC STREQUAL "system" OR WITH_JEMALLOC STREQUAL "yes")
7	- CHECK_LIBRARY_EXISTS(jemalloc malloc_stats_print "" HAVE_JEMALLOC)
8	+ CHECK_LIBRARY_EXISTS(c malloc_stats_print "" HAVE_JEMALLOC)
9	IF (HAVE_JEMALLOC)
10	- SET(LIBJEMALLOC jemalloc)
11	+ SET(LIBJEMALLOC c)
12	ELSEIF (WITH_JEMALLOC STREQUAL "system")
13	MESSAGE(FATAL_ERROR "system jemalloc is not found")
14	ELSEIF (WITH_JEMALLOC STREQUAL "yes")

Line 0 Link Here

(-)mariadb55-server/files/patch-cmake_jemalloc.cmake (+16 lines)
	1	--- cmake/jemalloc.cmake.orig 2014-10-08 15:19:51.000000000 +0200
	2	+++ cmake/jemalloc.cmake 2014-10-17 22:20:23.000000000 +0200
	3	@@ -22,11 +22,11 @@
	4	SET(libname jemalloc)
	5	ENDIF()
	6
	7	- CHECK_LIBRARY_EXISTS(${libname} malloc_stats_print "" HAVE_JEMALLOC)
	8	+ CHECK_LIBRARY_EXISTS(c malloc_stats_print "" HAVE_JEMALLOC)
	9	SET(CMAKE_REQUIRED_LIBRARIES)
	10
	11	IF (HAVE_JEMALLOC)
	12	- SET(LIBJEMALLOC ${libname})
	13	+ SET(LIBJEMALLOC c)
	14	ELSEIF (NOT WITH_JEMALLOC STREQUAL "auto")
	15	MESSAGE(FATAL_ERROR "${libname} is not found")
	16	ENDIF()