From owner-svn-ports-head@freebsd.org Mon Feb 29 00:30:42 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B4D4CAB6A33; Mon, 29 Feb 2016 00:30:42 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8F2C91CA; Mon, 29 Feb 2016 00:30:42 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1T0UfZj028854; Mon, 29 Feb 2016 00:30:41 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1T0Uf9q028852; Mon, 29 Feb 2016 00:30:41 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201602290030.u1T0Uf9q028852@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Mon, 29 Feb 2016 00:30:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r409792 - in head/databases/libzdb: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Feb 2016 00:30:42 -0000 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