From nobody Wed Feb 23 12:18:52 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 7333B19EC1BA; Wed, 23 Feb 2022 12:18:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K3Zp516Y5z3KFd; Wed, 23 Feb 2022 12:18:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645618733; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qUUoXbmRx0Gukg1qZIfDB3MuNifg/VXNqGWeORxAGEk=; b=E246cN/Li2Orbb1c58yj4zHGBzB+h6qGuxd0WDpAbDz6JD2zB5Y60GkGu2L33OakRHnGU0 0HyTqwm23EsHAfrqhoKea93KKH1dVQFixeLrofOlMudJ1yzjElM3/4M7qg0dgeomxgGBY8 CqUBv/0PrbHM3tD27R2QHFi5nUtuyfyCV/hJ2ngzN+sUOoiOTAVw/9uPgdWi/AvqtUl8lm 04+WdlnuqE5aW6Dd4RTchXEu6w1LlxPkLd4soUsxHatzL7y8n7PfJdwZ3Wx5Iitw6n3dOa vQ0kvTbW9nUBl0vkrJ9HDK6a6vZfu4lZw8zSnMWCGzRhoyGVKrYNnrN8AjZfNA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 05BD5181A9; Wed, 23 Feb 2022 12:18:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21NCIqBj046240; Wed, 23 Feb 2022 12:18:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21NCIquR046239; Wed, 23 Feb 2022 12:18:52 GMT (envelope-from git) Date: Wed, 23 Feb 2022 12:18:52 GMT Message-Id: <202202231218.21NCIquR046239@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jochen Neumeister Subject: git: 01c086fdc8ba - main - devel/apr1: Fix output of `apu-1-config --libs` when default version of berkeley db is 18 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: joneum X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 01c086fdc8ba6e15aa430c515c71b4d3e1679e2e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645618733; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qUUoXbmRx0Gukg1qZIfDB3MuNifg/VXNqGWeORxAGEk=; b=c4dvF8v1Oamj3uT36we2wwdZj4KAcMKTHW4Wd2QvOw8d/jJT9HWTeg6dSBPeiF8RZXJKPd eTe6pUgGJlYjtJyYC3f2TT+9Xf8CdAGkP8si8Q9DT5vYSYP0/vPRO2M8Onme9cNno96VXc 6aSqC7JlWpVE8rtZN1dnl9c5N8F52qbwMb3MRB0Eq1t7Bd0s+mI2QQwZczCv7fOOmjPVbS vYHh+SjytA7uEfbzP3U2Y22Vz/7tpV/NSuF/niDkZRzb8dMySF29rFjedHgMj/IaDezM9O E60PL4um4DN6f903ZsIwzkLEeHLWtJm0zKdDxeBNe+9bqt0a+UeufeFTL2xvHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645618733; a=rsa-sha256; cv=none; b=o6quLPbbOT+enIgYNdjf0DZutqehqI4kgjqSjxSWccSPz7qqOoM+Ta+OV513GzL8LY1yOS L89l4V/VEdjZJEYqBa8SZTZPNgNljX7VFd0/nth1yXeKaWLdhbo67+QkydQpO6qPrcofVC qNlYdspTlpZJDtWLAF60kjN2MrQ5KOtXcUC0Ve3LNnNT2n0FmYwEMmBO3Q6dwDOSyUbvkf jfSNUVIBliixaNMYrp6j/TpFUV1ojF15pD7fYzBFu6K8TKvR0WwU9RY/Gfi6g3FLA6ci43 v6D8cLzU+6hKScPzT6AXrcLTA1ozwgxcjCn/Fo81XQWyprfi29FossBG3+E7fA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by joneum: URL: https://cgit.FreeBSD.org/ports/commit/?id=01c086fdc8ba6e15aa430c515c71b4d3e1679e2e commit 01c086fdc8ba6e15aa430c515c71b4d3e1679e2e Author: Jochen Neumeister AuthorDate: 2022-02-23 12:15:49 +0000 Commit: Jochen Neumeister CommitDate: 2022-02-23 12:15:49 +0000 devel/apr1: Fix output of `apu-1-config --libs` when default version of berkeley db is 18 When default version of berkeley db is 18, `apu-1-config --libs` returns following output. yasu@eastasia[2137]% apu-1-config --libs -ldb -lgdbm -lexpat yasu@eastasia[2146]% However, it is not libdb.so but libdb-18.1.so that is installed under ${PREFIX}/lib when you install database/db18. And it results in build failure of some ports that depend on devel/apr1 and use the output of `apu-1-config --libs` to get the options necessary for linking libraries properly. So fix the output by adding patch that makes configure script detects library name correctly. PR: 262137 Submitted by: yasu Approved by: apache (with hat) Sponsored by: Netzkommune GmbH --- devel/apr1/Makefile | 4 +- devel/apr1/files/patch-bdb18 | 107 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 110 insertions(+), 1 deletion(-) diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile index b44d6b247f4a..36e44fa40ad2 100644 --- a/devel/apr1/Makefile +++ b/devel/apr1/Makefile @@ -2,7 +2,7 @@ PORTNAME= apr PORTVERSION= ${APR_VERSION}.${APU_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= APACHE/apr DISTFILES= apr-${APR_VERSION}.tar.gz \ @@ -13,6 +13,7 @@ COMMENT= Apache Portability Library LICENSE= APACHE20 +BUILD_DEPENDS+= automake>=1.16.1:devel/automake LIB_DEPENDS= libexpat.so:textproc/expat2 USES= iconv pathfix libtool cpe @@ -138,6 +139,7 @@ do-configure: ${SETENV} ${APR_CONF_ENV} ./configure ${APR_CONF_ARGS} ${CONFIGURE_ARGS}) @${ECHO_MSG} "# ===> ${.TARGET} apr-util-${APU_VERSION}" (cd ${APU_WRKDIR} && \ + autoreconf -f -i && \ ${SETENV} ${APU_CONF_ENV} ./configure ${APU_CONF_ARGS} ${CONFIGURE_ARGS}) do-build: diff --git a/devel/apr1/files/patch-bdb18 b/devel/apr1/files/patch-bdb18 new file mode 100644 index 000000000000..302dfca4d6ac --- /dev/null +++ b/devel/apr1/files/patch-bdb18 @@ -0,0 +1,107 @@ +diff --git apr-util-1.6.1/build/dbm.m4 apr-util-1.6.1/build/dbm.m4 +index 57bd131f..5cbee4b3 100644 +--- apr-util-1.6.1/build/dbm.m4 ++++ apr-util-1.6.1/build/dbm.m4 +@@ -112,7 +112,7 @@ AC_DEFUN([APU_CHECK_BERKELEY_DB], [ + changequote([,]) + unset $cache_id + AC_CHECK_HEADER([$bdb_header], [ +- if test "$1" = "3" -o "$1" = "4" -o "$1" = "5" -o "$1" = "6"; then ++ if test "$1" = "3" -o "$1" = "4" -o "$1" = "5" -o "$1" = "6" -o "$1" = "18"; then + # We generate a separate cache variable for each prefix and libname + # we search under. That way, we avoid caching information that + # changes if the user runs `configure' with a different set of +@@ -432,7 +432,15 @@ AC_DEFUN([APU_CHECK_DB], [ + AC_MSG_ERROR(Berkeley db$db_major not found) + fi + ;; +- db[[456]]) ++ db18[[0-9]]) ++ db_major=`echo "$requested" | sed -e 's/db//' -e 's/.$//'` ++ db_minor=`echo "$requested" | sed -e 's/db//' -e 's/..//'` ++ APU_CHECK_DBXY("$check_places", "$db_major", "$db_minor") ++ if test "$apu_db_version" != "$db_major"; then ++ AC_MSG_ERROR(Berkeley db$db_major not found) ++ fi ++ ;; ++ db[[456]] | db18) + db_major=`echo "$requested" | sed -e 's/db//'` + # Start version search at version x.9 + db_minor=9 +@@ -455,17 +463,21 @@ AC_DEFUN([APU_CHECK_DB], [ + ]) + + dnl +-dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 6.X to 1. ++dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 18.X to 1. + dnl + AC_DEFUN([APU_CHECK_DB_ALL], [ + all_places=$1 + +- # Start version search at version 6.9 +- db_version=69 ++ # Start version search at version 18.9 ++ db_version=189 + while [[ $db_version -ge 40 ]] + do + db_major=`echo $db_version | sed -e 's/.$//'` +- db_minor=`echo $db_version | sed -e 's/.//'` ++ if test "$db_version" -ge "100" ; then ++ db_minor=`echo $db_version | sed -e 's/..//'` ++ else ++ db_minor=`echo $db_version | sed -e 's/.//'` ++ fi + APU_CHECK_DBXY("$all_places", "$db_major", "$db_minor") + if test "$apu_have_db" = "1"; then + break +@@ -511,7 +523,7 @@ AC_DEFUN([APU_CHECK_DBM], [ + apu_db_version=0 + + # Maximum supported version announced in help string. +- # Although we search for all versions up to 6.9, ++ # Although we search for all versions up to 18.9, + # we should only include existing versions in our + # help string. + dbm_list="sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4" +@@ -531,7 +543,7 @@ AC_DEFUN([APU_CHECK_DBM], [ + dbm_list="$dbm_list, db$db_version" + db_version=`expr $db_version + 1` + done +- db_max_version=60 ++ db_max_version=62 + db_min_version=60 + db_version="$db_min_version" + while [[ $db_version -le $db_max_version ]] +@@ -539,9 +551,17 @@ AC_DEFUN([APU_CHECK_DBM], [ + dbm_list="$dbm_list, db$db_version" + db_version=`expr $db_version + 1` + done ++ db_max_version=181 ++ db_min_version=180 ++ db_version="$db_min_version" ++ while [[ $db_version -le $db_max_version ]] ++ do ++ dbm_list="$dbm_list, db$db_version" ++ db_version=`expr $db_version + 1` ++ done + + AC_ARG_WITH(dbm, [APR_HELP_STRING([--with-dbm=DBM], [choose the DBM type to use. +- DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db4X,db5X,db6X} for some X=0,...,9])], ++ DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db4X,db5X,db6X,db18x} for some X=0,...,9])], + [ + if test "$withval" = "yes"; then + AC_MSG_ERROR([--with-dbm needs to specify a DBM type to use. +@@ -684,11 +704,11 @@ AC_DEFUN([APU_CHECK_DBM], [ + eval "apu_use_$requested=1" + apu_default_dbm=$requested + ;; +- db185 | db[[123456]]) ++ db185 | db[[123456]] | db18) + apu_use_db=1 + apu_default_dbm=$requested + ;; +- db[[456]][[0-9]]) ++ db[[456]][[0-9]] | db18[[0-9]]) + apu_use_db=1 + apu_default_dbm=`echo $requested | sed -e 's/.$//'` + ;;