From nobody Thu Oct 19 07:08:19 2023 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 4S9zMS0jL4z4y4jg; Thu, 19 Oct 2023 07:08:20 +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 4S9zMS0Fw8z3Dsq; Thu, 19 Oct 2023 07:08:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697699300; 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=QvkOT1tjlEyUk0AwZSH/fnDqwMy8hXP15uKoU7aeLTs=; b=czrSkcHgA7qZy0ffHTJjkpGz3YtKh9pgiGHDWGbqSuslDoYuai4sGSzsaY+WHXbVsM8F+M oKTpBpqzD//sT3xQ1uAc6Pxj/C9LpwyHqH+moQbvxHh5oAgDf7h/GuZMT0W5bvr8771bHK a194MYpfwfKuTwKkIzKezG+2B8q+sVC+93sXH0qL/2z/ZRMdmh6avFLci+UA1iLrV9b778 lSAC2jPBoOnkq9zj81iGrVt/pbUkANjwqozUrRaNECawDSX/MC3o50NMMSxb6zyOhs7Vuq K5zQigOdL90MK+gpyWbBLCH9G6+gS5wsUVkNdupqxRj9SqayifNiALHf1d9YMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697699300; a=rsa-sha256; cv=none; b=scj+si9wCoyjf05LrPI8eNxe3AdMmrNHh8Q8bTcox/2XpcNXkkS6CTYLLRzBWetiOCTAYt Y5POcNobI2pJE8khohdVQEolkkOA5z4vP08z7I8qUiYuT7LxvvOj6NfjRJziQdUIKXhJ7f HVWF2IHHV0EwlI6NY0mWVo3iHS7iCgwGfCwmbALaj6c4lZsDNqcLrhUIa0A9S8NvEkQ3B1 duHE+VDw41MjIwZYQcO685lNeyYBWJLwzL7h0LwhTdIlLl/ULCmt8WF1GWwl3YHkaYze5g PlLLGHVb+jZ9D1Y+itjjBXbeGrprn/lwK3v9z4TK7UwY8AAebOTMo1WlqHL7zA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697699300; 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=QvkOT1tjlEyUk0AwZSH/fnDqwMy8hXP15uKoU7aeLTs=; b=f76+os6ZP6yDHNArMUmF7vUlrUyHvW21Ls74sz6VPWcZ9YRRL3jHKUy0rlJt0P+P7SIZMr WRGDZI7FUnmZ8SpIYygYtrLQDkMJnhFjQJm6vVHJwgyiWt3N6RXo2jzIt49HgLodEPMbTp fg3ipck24Kfbapt8wRC9+YzWvc8fNgSVBzBaS2f4DWyoUhtIwTdYEdpx4gPr3DESe5r/Yx v/d8a/v4M9ELl5UeLt4oyZlJ9pN5FZxov/mNZs1fBd3KvNgdyI+81yGAKWv4k65TIca2gC jk7OJ0mRhilY794o09nD5+7HnsprAojBenj9Q4BlRVVC9ZExxqFSP5pK4EED9Q== 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 4S9zMR5yjMzfwy; Thu, 19 Oct 2023 07:08:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39J78JUi045480; Thu, 19 Oct 2023 07:08:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39J78Jeg045478; Thu, 19 Oct 2023 07:08:19 GMT (envelope-from git) Date: Thu, 19 Oct 2023 07:08:19 GMT Message-Id: <202310190708.39J78Jeg045478@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 69e85930e200 - main - lang/gnat12: Add missing binutils RUN_DEPENDS and fix broken library search paths 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: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 69e85930e200e0ee30f78119063bbd43abe2be3e Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=69e85930e200e0ee30f78119063bbd43abe2be3e commit 69e85930e200e0ee30f78119063bbd43abe2be3e Author: Nico Sonack AuthorDate: 2023-10-01 16:57:46 +0000 Commit: Robert Clausecker CommitDate: 2023-10-19 07:07:28 +0000 lang/gnat12: Add missing binutils RUN_DEPENDS and fix broken library search paths Any produce binary of the gnat12 Ada compiler that had dependencies on libstdc++ from this package would result in broken binaries because no RUNPATH and no ldconfig paths were set up such that the included libstdc++ would get found. While we're at it, add the missing binutils dependency because the compiler driver would find the GNU assembler that is hardcoded in the Makefile. PR: 274239 Signed-off-by: Nico Sonack Approved by: thierry (maintainer timeout, two weeks) MFH: 2023Q4 --- lang/gnat12/Makefile | 125 +++++++++++++++++++++++++++------------------------ 1 file changed, 66 insertions(+), 59 deletions(-) diff --git a/lang/gnat12/Makefile b/lang/gnat12/Makefile index 6aa9ee7cb562..fcad0a697d5c 100644 --- a/lang/gnat12/Makefile +++ b/lang/gnat12/Makefile @@ -1,10 +1,10 @@ PORTNAME= gnat12 -PORTVERSION= 12.2.0 -PORTREVISION= 5 +DISTVERSION= 12.2.0 +PORTREVISION= 6 CATEGORIES= lang -MASTER_SITES= ${MASTER_SITE_GCC}:gcc \ +MASTER_SITES= ${MASTER_SITE_GCC}:gcc \ LOCAL/thierry:gnat -MASTER_SITE_SUBDIR=releases/gcc-${PORTVERSION} +MASTER_SITE_SUBDIR= releases/gcc-${PORTVERSION} DISTFILES= gcc-${PORTVERSION}.tar.xz:gcc MAINTAINER= thierry@FreeBSD.org @@ -14,26 +14,28 @@ WWW= https://www.adacore.com/community LICENSE= GPLv2 GPLv3 GPLv3RLE LICENSE_COMB= multi -LIB_DEPENDS= libgmp.so:math/gmp \ - libmpc.so:math/mpc \ - libisl.so:devel/isl \ +LIB_DEPENDS= libgmp.so:math/gmp \ + libisl.so:devel/isl \ + libmpc.so:math/mpc \ libmpfr.so:math/mpfr +RUN_DEPENDS= ${LOCALBASE}/bin/as:devel/binutils + USES= bison gettext-runtime gmake iconv libtool localbase tar:xz USE_BINUTILS= yes BINARY_ALIAS= make=${GMAKE} -OPTIONS_DEFINE= ASSETS -OPTIONS_RADIO= BOOTSTRAP -OPTIONS_RADIO_BOOTSTRAP= GCC6AUX PREVASSET -OPTIONS_DEFAULT=GCC6AUX +OPTIONS_DEFINE= ASSETS +OPTIONS_RADIO= BOOTSTRAP +OPTIONS_RADIO_BOOTSTRAP= GCC6AUX PREVASSET +OPTIONS_DEFAULT= GCC6AUX .if defined(PACKAGE_BUILDING) -OPTIONS_DEFAULT+= ASSETS +OPTIONS_DEFAULT+= ASSETS .endif -OPTIONS_SUB= yes -ASSETS_DESC= Build an asset for future bootstrap on the target platform -GCC6AUX_DESC= Bootstrap from lang/gcc6-aux -PREVASSET_DESC= Bootstrap from the previous asset (if available) +OPTIONS_SUB= yes +ASSETS_DESC= Build an asset for future bootstrap on the target platform +GCC6AUX_DESC= Bootstrap from lang/gcc6-aux +PREVASSET_DESC= Bootstrap from the previous asset (if available) GCC6AUX_BUILD_DEPENDS= gcc6-aux>0:lang/gcc6-aux PREVASSET_DISTFILES+= ${PREV_ASSET_FILE}.tar.xz:gnat @@ -42,70 +44,73 @@ GCC6AUX_VARS= PATHAUX=${LOCALBASE}/gcc6-aux/bin PREVASSET_VARS= PATHAUX=${WRKDIR}/${PREV_ASSET_FILE}/bin ASSETS_VARS= PKGMESSAGE=${WRKDIR}/pkg-message -GNU_CONFIGURE= yes -CONFIGURE_OUTSOURCE= yes -WRKSRC= ${WRKDIR}/gcc-${PORTVERSION} -PKG_PREFIX= ${PREFIX}/${PORTNAME} -FULLPATH= /sbin:/bin:/usr/sbin:/usr/bin:${PATHAUX}:${PREFIX}/bin:${LOCALBASE}/bin -TARGLIB= ${PKG_PREFIX}/lib/gcc${GCCVER} +GNU_CONFIGURE= yes +CONFIGURE_OUTSOURCE= yes +WRKSRC= ${WRKDIR}/gcc-${PORTVERSION} +PKG_PREFIX= ${PREFIX}/${PORTNAME} +FULLPATH= /sbin:/bin:/usr/sbin:/usr/bin:${PATHAUX}:${PREFIX}/bin:${LOCALBASE}/bin +TARGLIB= ${PKG_PREFIX}/lib \ + ${PKG_PREFIX}/lib/gcc${GCCVER} GNU_CONFIGURE_PREFIX= ${PKG_PREFIX} -GNU_CONFIGURE_MANPREFIX=${PKG_PREFIX} -MANPREFIX= ${PKG_PREFIX} -CONFIGURE_ENV+= PATH=${FULLPATH} \ - CC=${PATHAUX}/gcc \ - CXX=${PATHAUX}/g++ -CONFIGURE_ARGS= --enable-languages="c,ada" \ - --with-pkgversion="${OPSYS} Ports Collection" \ - --enable-gnu-indirect-function \ - --with-as=${LOCALBASE}/bin/as \ - --with-ld=${LOCALBASE}/bin/ld \ - --enable-threads=posix \ - --disable-libquadmath \ - --enable-host-shared \ - --disable-libmudflap \ - --with-system-zlib \ - --disable-libgomp \ - --disable-libssp \ - --enable-libada \ - --without-zstd -CONFIGURE_TARGET= ${GARCH}-portbld-${PLATFORM} +GNU_CONFIGURE_MANPREFIX= ${PKG_PREFIX} +MANPREFIX= ${PKG_PREFIX} +CONFIGURE_ENV+= CC=${PATHAUX}/gcc \ + CXX=${PATHAUX}/g++ \ + PATH=${FULLPATH} +CONFIGURE_ARGS= --disable-libgomp \ + --disable-libmudflap \ + --disable-libquadmath \ + --disable-libssp \ + --disable-bootstrap \ + --enable-gnu-indirect-function \ + --enable-host-shared \ + --enable-languages="c,ada" \ + --enable-libada \ + --enable-threads=posix \ + --with-as=${LOCALBASE}/bin/as \ + --with-ld=${LOCALBASE}/bin/ld \ + --with-pkgversion="${OPSYS} Ports Collection" \ + --with-system-zlib \ + --without-zstd +CONFIGURE_TARGET= ${GARCH}-portbld-${PLATFORM} MAKE_ENV+= PATH=${FULLPATH} INSTALL_TARGET= install-strip USE_LDCONFIG= ${TARGLIB} GNATMAKE= ${PATHAUX}/gnatmake -GNATBING= ${PATHAUX}/gnatbind +GNATBIND= ${PATHAUX}/gnatbind GCCVER= ${PORTVERSION:R:R} -PLATFORM= ${OPSYS:tl}${OSREL} -GARCH= ${ARCH:S/amd64/x86_64/} -OS_LABEL4VERS= [${OPSYS}${GARCH:S/amd//:S/x86_//:S/aarch/\/ARM/:S/i386/32/}] -REVFILE= ${WRKSRC}/gcc/REVISION -PHASEFILE= ${WRKSRC}/gcc/DEV-PHASE -ASSET_FILE= gnat-${GARCH}-${OPSYS:tl}.${OSREL:R}-${PKGVERSION} +PLATFORM= ${OPSYS:tl}${OSREL} +GARCH= ${ARCH:S/amd64/x86_64/} +OS_LABEL4VERS= [${OPSYS}${GARCH:S/amd//:S/x86_//:S/aarch/\/ARM/:S/i386/32/}] +REVFILE= ${WRKSRC}/gcc/REVISION +PHASEFILE= ${WRKSRC}/gcc/DEV-PHASE +ASSET_FILE= gnat-${GARCH}-${OPSYS:tl}.${OSREL:R}-${PKGVERSION} PREV_ASSET_VER?= ${PORTVERSION} PREV_ASSET_REV?= _2 -PREV_ASSET_GCC= ${PREV_ASSET_VER:R:R} +PREV_ASSET_GCC= ${PREV_ASSET_VER:R:R} PREV_ASSET_OSREL?= ${OSREL:R} -PREV_ASSET_FILE=gnat-${GARCH}-${OPSYS:tl}.${PREV_ASSET_OSREL}-${PREV_ASSET_VER}${PREV_ASSET_REV} +PREV_ASSET_FILE= gnat-${GARCH}-${OPSYS:tl}.${PREV_ASSET_OSREL}-${PREV_ASSET_VER}${PREV_ASSET_REV} -PLIST_SUB= CONFTRGT=${CONFIGURE_TARGET} VER=${PORTVERSION} \ - ASSET_FILE=${ASSET_FILE} +PLIST_SUB= ASSET_FILE=${ASSET_FILE} \ + CONFTRGT=${CONFIGURE_TARGET} \ + VER=${PORTVERSION} # add-plist-info does not honor GNU_CONFIGURE_PREFIX => remove INFO files -INFOS= cpp cppinternals gcc gccinstall gccint gnat_rm gnat_ugn \ +INFOS= cpp cppinternals gcc gccinstall gccint gnat_rm gnat_ugn \ gnat-style libitm .if exists(/usr/lib32/libc.so) -OPTIONS_DEFINE_amd64+= MULTILIB +OPTIONS_DEFINE_amd64+= MULTILIB OPTIONS_DEFAULT_amd64+= MULTILIB OPTIONS_DEFINE_powerpc64+= MULTILIB #OPTIONS_DEFAULT_powerpc64+= MULTILIB # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105010 -MULTILIB_DESC= Build support for 32-bit and 64-bit targets +MULTILIB_DESC= Build support for 32-bit and 64-bit targets MULTILIB_CONFIGURE_ENABLE= multilib .else -CONFIGURE_ARGS+= --disable-multilib +CONFIGURE_ARGS+= --disable-multilib .endif .include @@ -124,9 +129,11 @@ PLIST_SUB+= 32BITS="" . endif .endif .if ${ARCH} == aarch64 -PLIST_SUB+= ARM="" NOARM="@comment " +PLIST_SUB+= ARM="" \ + NOARM="@comment " .else -PLIST_SUB+= ARM="@comment " NOARM="" +PLIST_SUB+= ARM="@comment " \ + NOARM="" .endif pre-configure: