Date: Wed, 11 Jan 2017 07:50:07 +0000 (UTC) From: Hiroki Sato <hrs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r431160 - in head/security/heimdal: . files Message-ID: <201701110750.v0B7o7gb044102@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hrs Date: Wed Jan 11 07:50:07 2017 New Revision: 431160 URL: https://svnweb.freebsd.org/changeset/ports/431160 Log: Fix build when !BDB and db5 is installed at the same time. The configure script picked up the db5 library though ac_cv_func_db_create=no. PR: 215772 Modified: head/security/heimdal/Makefile head/security/heimdal/files/patch-configure Modified: head/security/heimdal/Makefile ============================================================================== --- head/security/heimdal/Makefile Wed Jan 11 06:40:00 2017 (r431159) +++ head/security/heimdal/Makefile Wed Jan 11 07:50:07 2017 (r431160) @@ -68,7 +68,8 @@ BDB_CONFIGURE_ENV= ac_cv_header_db${BDB_ ac_cv_funclib_db_create="-l${BDB_LIB_NAME}" BDB_CONFIGURE_ON= --disable-ndbm-db BDB_CONFIGURE_ENV_OFF= ac_cv_header_db_h=yes \ - ac_cv_func_db_create=no + ac_cv_func_db_create=no \ + ac_cv_funclib_db_create=no BDB_CONFIGURE_OFF= --enable-ndbm-db LMDB_DESC= Enable LMDB KDC backend support Modified: head/security/heimdal/files/patch-configure ============================================================================== --- head/security/heimdal/files/patch-configure Wed Jan 11 06:40:00 2017 (r431159) +++ head/security/heimdal/files/patch-configure Wed Jan 11 07:50:07 2017 (r431160) @@ -1,15 +1,6 @@ --- configure.orig 2016-12-20 04:24:03 UTC +++ configure -@@ -9588,7 +9588,7 @@ $as_echo_n "checking whether the $compil - hardcode_minus_L=no - hardcode_shlibpath_var=unsupported - inherit_rpath=no -- link_all_deplibs=unknown -+ link_all_deplibs=no - module_cmds= - module_expsym_cmds= - old_archive_from_new_cmds= -@@ -16126,7 +16126,7 @@ case "$host" in +@@ -16126,7 +16126,7 @@ ;; *-*-freebsd*) native_pthread_support=yes @@ -18,7 +9,16 @@ ;; *-*-openbsd*) native_pthread_support=yes -@@ -16935,6 +16935,9 @@ esac +@@ -16362,7 +16362,7 @@ + $as_echo_n "(cached) " >&6 + else + +-if eval "test \"\$ac_cv_func_db_create\" != yes" ; then ++if eval "test \"\$ac_cv_func_db_create\" = yes" ; then + ac_save_LIBS="$LIBS" + for ac_lib in "" $dbheader db-5 db5 db4 db3 db; do + case "$ac_lib" in +@@ -16935,6 +16935,9 @@ $as_echo "#define HAVE_NDBM 1" >>confdefs.h have_ndbm=yes @@ -28,7 +28,7 @@ else $as_unset ac_cv_func_dbm_firstkey -@@ -28685,7 +28688,7 @@ fi +@@ -28685,7 +28688,7 @@ krb_cv_compile_et="no" krb_cv_com_err_need_r=""
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701110750.v0B7o7gb044102>