From nobody Sat Oct 01 10:24:27 2022 X-Original-To: dev-commits-ports-all@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 4MfjrX02xVz4dmQb; Sat, 1 Oct 2022 10:24:28 +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 4MfjrW6ZvWz3ZGg; Sat, 1 Oct 2022 10:24:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664619867; 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=PUkK9DXii4/s3QuAeB+91Z3oVbmwABIhEL60YvxIbrU=; b=UNCerzod3AOhbdavAiQfKjC0qtbbnwTCYOVA7ZsgyzH2Fnp3hqDUfIomAXdb/E6A+Q9wjA eIBchD1XDiSMwakQ7SpnaQus1WqhQK1n35JBB/zGssDFWG2eBfLQTQ//po/A+xtAOnWWu8 99E+fuJbtRlW/DZgk5wzI8QnR0l0ZPmM8w/ycz5PKoSdF/IitZ/0ghwRRd66eNSwF/2zTg iBgjNHhWSdYq/24zGy4uVODvIvGUOz5iEWu1lx7rL3l4c3mSdUZ2gLWp6pVdMaTxZVbsCu na7QOjipMDaeyodd4Czu2K8vM5Ovtn/QLkPB8VFynCb5ckpxDkHX97eDNdk94w== 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 4MfjrW5NkJzVwK; Sat, 1 Oct 2022 10:24:27 +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 291AOR3K014171; Sat, 1 Oct 2022 10:24:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 291AORkI014170; Sat, 1 Oct 2022 10:24:27 GMT (envelope-from git) Date: Sat, 1 Oct 2022 10:24:27 GMT Message-Id: <202210011024.291AORkI014170@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Emanuel Haupt Subject: git: 3e147a1f5947 - main - shells/bash: fix static build List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ehaupt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3e147a1f594751a68fea00a28090d0792bee0b51 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664619867; 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=PUkK9DXii4/s3QuAeB+91Z3oVbmwABIhEL60YvxIbrU=; b=LaUjAFUo8dVljQe16P4cETIu25QjZQWGUuSl/jT1CHj0+ApuHHZskQQ/fQDrhaGeTYdVC8 4tTkpVL1YYpRQHY8FJBktorB8ztc4bdVxtepjZn5QmnPcsN6+V18tNfzraOqNIpMe9B2x3 2lCdJRnSss25aQU40tIFbfjg5YM72vT80T1jPHuYTaEKSWFOX/7WLS3VEwaHDAMgBzptzi 07+0GmiA9C91Rp134QIKqw8Qoj8H89UmEc4YwjowO8pvVzmFKFn7xyOAr4ldeQDFD8dFsD tN1PCvz7pxCo5qpyY/f1NgP2jmhClp6j44URYTT7s4EMTQm/rcEWQA0RGBs9ZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664619867; a=rsa-sha256; cv=none; b=kFCwEdzEF671wbo4Qf6SzijV6v+UIDBFzxqNLo/mW6s5vvABdQZPzrnDdiRyr9RXhkomha unbCXnnZOSe7EMGTXgPR/5GyLfN7FSGS1hiMLH1W9FPU+MuRsHVPZB9TfNkCTYocZN8hES jVcqpTb9qzRv0FYbWTjksWOUzjnlfdt73OYY+DBi0hdhmUqH3G25RqSMI/ER+9qQyZAzVS +k7v8Tc3U18b/Y4JEpg13siOmiqDGCNv3ZhmksmhEnmJckbmYX3tbvl0gWMbcSIjD6NHJR lMfouC7L4GHEmrpadfSznaLmNeKcI/xqIRJD4FfrtXC0tXcm/XsfrlH/o39DEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ehaupt: URL: https://cgit.FreeBSD.org/ports/commit/?id=3e147a1f594751a68fea00a28090d0792bee0b51 commit 3e147a1f594751a68fea00a28090d0792bee0b51 Author: Dag-Erling Smørgrav AuthorDate: 2022-10-01 10:11:01 +0000 Commit: Emanuel Haupt CommitDate: 2022-10-01 10:12:09 +0000 shells/bash: fix static build The logic in m4/strtoimax.m4 is inverted: it replaces strtoimax() if and only if it is present and functional. files/patch-configure avoids having to run autoreconf in the port and can be removed once the fix has been adopted upstream. differential Revision: https://reviews.freebsd.org/D36849 --- shells/bash/Makefile | 4 +--- shells/bash/files/patch-configure | 11 +++++++++++ shells/bash/files/patch-m4_strtoimax.m4 | 11 +++++++++++ 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/shells/bash/Makefile b/shells/bash/Makefile index 6fdb145d7cb3..59e37945f965 100644 --- a/shells/bash/Makefile +++ b/shells/bash/Makefile @@ -5,7 +5,7 @@ PORTNAME= bash #PATCHLEVEL= 0 #PORTVERSION= 5.2.${PATCHLEVEL:S/^0//g} PORTVERSION= 5.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= shells MASTER_SITES= GNU #DISTNAME= ${PORTNAME}-${PORTVERSION:R} @@ -59,8 +59,6 @@ PORTS_READLINE_BROKEN= ld: error: undefined symbol: rl_trim_arg_from_keyseq PORTS_READLINE_USES= readline PORTS_READLINE_CONFIGURE_WITH= installed-readline -STATIC_BROKEN= multiple definition of strtoimax - .if empty(PKGNAMESUFFIX) CONFLICTS+= bash-static bash52-static .else diff --git a/shells/bash/files/patch-configure b/shells/bash/files/patch-configure new file mode 100644 index 000000000000..0ca11a5d826f --- /dev/null +++ b/shells/bash/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.orig 2022-09-23 14:13:22 UTC ++++ configure +@@ -20443,7 +20443,7 @@ fi + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bash_cv_func_strtoimax" >&5 + printf "%s\n" "$bash_cv_func_strtoimax" >&6; } +-if test $bash_cv_func_strtoimax = yes; then ++if test $bash_cv_func_strtoimax = no ; then + case " $LIBOBJS " in + *" strtoimax.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS strtoimax.$ac_objext" diff --git a/shells/bash/files/patch-m4_strtoimax.m4 b/shells/bash/files/patch-m4_strtoimax.m4 new file mode 100644 index 000000000000..3c047bd97654 --- /dev/null +++ b/shells/bash/files/patch-m4_strtoimax.m4 @@ -0,0 +1,11 @@ +--- m4/strtoimax.m4.orig 2022-04-11 20:31:52 UTC ++++ m4/strtoimax.m4 +@@ -29,7 +29,7 @@ AC_CACHE_VAL(bash_cv_func_strtoimax, + fi + ]) + AC_MSG_RESULT($bash_cv_func_strtoimax) +-if test $bash_cv_func_strtoimax = yes; then ++if test $bash_cv_func_strtoimax = no; then + AC_LIBOBJ(strtoimax) + fi + ])