svn commit: r409792 - in head/databases/libzdb: . files

[Raphael Kubo da Costa]

Author: rakuco
Date: Mon Feb 29 00:30:41 2016
New Revision: 409792
URL: https://svnweb.freebsd.org/changeset/ports/409792

Log:
  Fix the port's configure script to properly detect SQLite3.
  
  This has been broken since r397227 ("Upgrade to 3.1"): the port's build system
  passes -ldl when trying to detect SQLite3. Since this will always fail on
  FreeBSD, SQLite3 support will always be disabled as well.
  
  PR:		203424
  MFH:		2016Q1

Added:
  head/databases/libzdb/files/
  head/databases/libzdb/files/patch-configure   (contents, props changed)
Modified:
  head/databases/libzdb/Makefile

Modified: head/databases/libzdb/Makefile
==============================================================================
--- head/databases/libzdb/Makefile	Mon Feb 29 00:10:02 2016	(r409791)
+++ head/databases/libzdb/Makefile	Mon Feb 29 00:30:41 2016	(r409792)
@@ -3,6 +3,7 @@
 
 PORTNAME=	libzdb
 PORTVERSION=	3.1
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	http://www.tildeslash.com/libzdb/dist/
 
@@ -28,7 +29,7 @@ MYSQL_CONFIGURE_OFF=	--without-mysql
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_ON=	--with-postgresql=${LOCALBASE}/bin/pg_config
 PGSQL_CONFIGURE_OFF=	--without-postgresql
-SQLITE_USE=		sqlite=3
+SQLITE_USES=		sqlite
 SQLITE_CONFIGURE_ON=	--with-sqlite=${LOCALBASE}
 SQLITE_CONFIGURE_OFF=	--without-sqlite
 SSL_USE=		openssl=yes

Added: head/databases/libzdb/files/patch-configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/libzdb/files/patch-configure	Mon Feb 29 00:30:41 2016	(r409792)
@@ -0,0 +1,51 @@
+Stop passing -dl when trying to detect SQLite3's presence.
+
+If we don't, the configuration tests will fail and SQLite3 support will always
+be disabled.
+--- configure.orig	2015-08-31 12:55:11 UTC
++++ configure
+@@ -16834,7 +16834,7 @@ for ac_lib in '' sqlite3; do
+     ac_res="none required"
+   else
+     ac_res=-l$ac_lib
+-    LIBS="-l$ac_lib -ldl $ac_func_search_save_LIBS"
++    LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+   fi
+   if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_search_sqlite3_open=$ac_res
+@@ -16900,7 +16900,7 @@ for ac_lib in '' sqlite3; do
+     ac_res="none required"
+   else
+     ac_res=-l$ac_lib
+-    LIBS="-l$ac_lib -ldl $ac_func_search_save_LIBS"
++    LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+   fi
+   if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_search_sqlite3_open=$ac_res
+@@ -17031,7 +17031,7 @@ for ac_lib in '' sqlite3; do
+     ac_res="none required"
+   else
+     ac_res=-l$ac_lib
+-    LIBS="-l$ac_lib -ldl $ac_func_search_save_LIBS"
++    LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+   fi
+   if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_search_sqlite3_soft_heap_limit=$ac_res
+@@ -17089,7 +17089,7 @@ for ac_lib in '' sqlite3; do
+     ac_res="none required"
+   else
+     ac_res=-l$ac_lib
+-    LIBS="-l$ac_lib -ldl $ac_func_search_save_LIBS"
++    LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+   fi
+   if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_search_sqlite3_soft_heap_limit64=$ac_res
+@@ -17147,7 +17147,7 @@ for ac_lib in '' sqlite3; do
+     ac_res="none required"
+   else
+     ac_res=-l$ac_lib
+-    LIBS="-l$ac_lib -ldl $ac_func_search_save_LIBS"
++    LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+   fi
+   if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_search_sqlite3_errstr=$ac_res