From nobody Sun Dec 18 21:14:01 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 4NZwZ15h7gz1G0Jb; Sun, 18 Dec 2022 21:14:01 +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 4NZwZ15QKWz3sR2; Sun, 18 Dec 2022 21:14:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671398041; 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=uO6AFA9fc8t5Xv74/rKJyeLZIehYjKZmE4Lefc4gkmI=; b=M7AvMMnsngLApy78kyuk6DPlsfm8TLUswDPPYqzDqkuzI5dHM8ozdwhvuxTL85mmUkN5VV XBc360a0Lq8HXk1fIOnvDzHUQ9NUzHyjHxNk9DBprBUm+19jC6s/3T+KDVP97vbeCmSn31 sU0WqznklhUW5mG/m+xv5ZCurLOFQjt/XZEAHV6msT8ngnMiLOTdEFb7PcKS6fQstrKgzI GhXrLsvGEBth/NSwkAqBEbfrl+0He/1OCb+IImuwSJd/KRbBKJjMpegLkwWUiquVSf9Yoz u3SJfRgN8DM2Mb6BNfTBjrr0mhNPWbU6Swq7shdlZ5nlc0PBT7/WHtpVS7bQXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671398041; 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=uO6AFA9fc8t5Xv74/rKJyeLZIehYjKZmE4Lefc4gkmI=; b=EbnaaP8W4C18NHNGIm8DP2R9QI1u3GGuxg+a04A2IT20oCIZil4j0Nq0Q+weASmLdeRFgO sa93kI5DLkeTRrh91IXnGyS0Xw2SBChwsD51fPeFm+5xi7gDOZnDD3nJznsXGLVaHhqOkC /WczbLJ1EF2J0nxQMoYcU2JpTpvmbHoRtYMV4Y6P9ZvR9p2kevCGHDlZozDNfnzE8nbZr2 B5f8fwFimIBDRvo7NOVk/QY8lSN4hHxTuinWsGUD/lCITcvz+m4jEWVQnTuwxGfGNsv3bN ULlH8n5gX1Yk6y6FBkcHorubtMYD9TrvPoEweM8H0cS11KaIFBLRtxDp7t1owg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671398041; a=rsa-sha256; cv=none; b=ddll4splzZmOWntr7IH3aJ628GN9I5ecV8vqDC7biSKq0euTQ6imV73+ZnjMs0pWKLJsN6 84ty5UadTorbpATgL5hT+07bBiy1JT/syc31CX/caA9lU3/r+NTLeVctYN9asqvU7kF7EW 3MEuyACMcyiG82pn2XMDluYD0YvaT7xhZFImJVxUOKq72KEHObBF47HcfBwXtzzgqG8vXA 3CY+2o8dnZuMdHbABqy+kRs7+poUSl7MX3QlBLN7N4pN3DMtp3yEk93smUNTRffU7qna4p +7F9sbySWH0MQp3eMfrFdtjBbHYApedzj5xMeyi1hJIYqascd44ap/j88GxQEA== 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 4NZwZ14S8jzVtj; Sun, 18 Dec 2022 21:14:01 +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 2BILE1xo008568; Sun, 18 Dec 2022 21:14:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BILE1kt008567; Sun, 18 Dec 2022 21:14:01 GMT (envelope-from git) Date: Sun, 18 Dec 2022 21:14:01 GMT Message-Id: <202212182114.2BILE1kt008567@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Thierry Thomas Subject: git: 31b10db372ac - main - devel/gprbuild: upgrade to v23.0.0 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: thierry X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 31b10db372ac3a5b3a2a714bdc7c8476909a3abd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=31b10db372ac3a5b3a2a714bdc7c8476909a3abd commit 31b10db372ac3a5b3a2a714bdc7c8476909a3abd Author: Thierry Thomas AuthorDate: 2022-12-15 14:44:45 +0000 Commit: Thierry Thomas CommitDate: 2022-12-18 21:13:54 +0000 devel/gprbuild: upgrade to v23.0.0 Caveat: gprconfig does not yet acknowledge gfortran12. --- devel/gprbuild/Makefile | 111 +++++++++++++++++---- devel/gprbuild/distinfo | 10 +- devel/gprbuild/files/Makefile.BSD | 80 --------------- .../files/patch-share_gprconfig_compilers.xml | 24 ----- .../gprbuild/files/patch-share_gprconfig_gnat.xml | 20 ---- .../files/patch-share_gprconfig_linker.xml | 56 ----------- .../files/patch-share_gprconfig_targetset.xml | 54 ---------- devel/gprbuild/files/patch-src_gprlib.adb | 50 ---------- devel/gprbuild/pkg-plist | 100 ++++++++++++++----- 9 files changed, 173 insertions(+), 332 deletions(-) diff --git a/devel/gprbuild/Makefile b/devel/gprbuild/Makefile index 6ec009a52001..d11da52e16ab 100644 --- a/devel/gprbuild/Makefile +++ b/devel/gprbuild/Makefile @@ -1,6 +1,7 @@ PORTNAME= gprbuild -PORTVERSION= ${SNAPSHOT} -PORTREVISION= 1 +DISTVERSIONPREFIX= v +DISTVERSION= 23.0.0 +PORTEPOCH= 1 CATEGORIES= devel MAINTAINER= ports@FreeBSD.org @@ -11,30 +12,96 @@ LICENSE= GPLv3+ GPLv3RLE LICENSE_COMB= multi LICENSE_FILE= ${WRKSRC}/COPYING3 -BUILD_DEPENDS= xmlada>=4.4:textproc/xmlada +USES= ada:12,run gmake +USE_BINUTILS= yes -SNAPSHOT= 20160609 -USES= ada USE_GITHUB= yes GH_ACCOUNT= AdaCore -GH_TAGNAME= 376670f +GH_PROJECT= gprconfig_kb:kb xmlada:xa +BOOTPATH= ${WRKSRC}/bootstrap/bin +MAKE_JOBS_NUMBER_LIMIT= 4 +MAKE_ARGS= PROCESSORS=${MAKE_JOBS_NUMBER} \ + ENABLE_SHARED=yes +XMLADA_SRC= ${WRKDIR}/xmlada-${PORTVERSION} +PLATFORM= ${OPSYS:tl}${OSREL} +GARCH= ${ARCH:S/amd64/x86_64/} +CONFIGURE_TARGET= ${GARCH}-portbld-${PLATFORM} +MAKE_ENV+= GPR_PROJECT_PATH=${WRKSRC}/bootstrap/share/gpr +ALL_TARGET= all # libgpr.build.static +INSTALL_TARGET= install # libgpr.install +P2STRIP= libexec/gprbuild/gprbind bin/gprname bin/gprslave bin/gprbuild \ + bin/gprconfig bin/gprls bin/gprinstall bin/gprclean + +GCC_VER= 12 + +OPTIONS_DEFINE= DOCS EXAMPLES +DOCSDIR= ${PREFIX}/gnat${GCC_VER}/share/doc/${PORTNAME} +EXAMPLESDIR= ${PREFIX}/gnat${GCC_VER}/share/examples/${PORTNAME} PORTDOCS= * -MAKE_ARGS= PROCESSORS=${MAKE_JOBS_NUMBER} -BUILD_WRKSRC= ${WRKSRC}/construction -INSTALL_WRKSRC= ${BUILD_WRKSRC} -INSTALL_TARGET= install - -OPTIONS_DEFINE= DOCS -#DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx -#DOCS_ALL_TARGET= gen-docs -#DOCS_INSTALL_TARGET= install-docs - -post-patch: - @${MKDIR} ${BUILD_WRKSRC} - @${CP} ${FILESDIR}/Makefile.BSD ${BUILD_WRKSRC}/Makefile - @${REINPLACE_CMD} -i "" -e "s,@AUXPREFIX@,${PREFIX}/${ADAXX}-aux," \ - ${WRKSRC}/share/gprconfig/compilers.xml - @${RM} ${WRKSRC}/share/gprconfig/*.orig +PORTEXAMPLES= * +DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx + +pre-configure: + ${REINPLACE_CMD} -e '/^LIB_INSTALLER/s|prefix=|prefix=${STAGEDIR}|' \ + ${WRKSRC}/${MAKEFILE} + @${ECHO} "*** Build the boostrap script" + (cd ${WRKSRC} && \ + ${SETENV} ${CONFIGURE_ENV} ./bootstrap.sh \ + --with-xmlada=${XMLADA_SRC} \ + --with-kb=${WRKDIR}/gprconfig_kb-${PORTVERSION} \ + --prefix=./bootstrap ) + +do-configure: + @${ECHO} "*** Make setup" + (cd ${WRKSRC} && \ + ${DO_MAKE_BUILD} setup ) + @${ECHO} "*** Register our Ada compiler gnat${GCC_VER}" + (cd ${WRKSRC} && \ + ${SETENV} PATH=${PATH}:${LOCALBASE}/gnat${GCC_VER}/bin \ + ./gprconfig --batch --target=${CONFIGURE_TARGET} \ + --config=Ada,,default,${LOCALBASE}/gnat${GCC_VER}/bin,GNAT ) + +pre-build: + @${ECHO} "*** Bootstrap xmlada (configure)" + (cd ${XMLADA_SRC} && \ + ${SETENV} ${CONFIGURE_ENV} ./configure --prefix=${WRKSRC}/bootstrap ) + @${ECHO} "*** Bootstrap xmlada (build)" + (cd ${XMLADA_SRC} && \ + ${DO_MAKE_BUILD:C|PATH=|PATH=${WRKSRC}/bootstrap/bin:|} all ) + @${ECHO} "*** Bootstrap xmlada (install)" + (cd ${XMLADA_SRC} && \ + ${DO_MAKE_BUILD:C|PATH=|PATH=${WRKSRC}/bootstrap/bin:|} install ) + +do-build: + @${ECHO} "*** Final build of gprbuild" + (cd ${WRKSRC} && \ + ${DO_MAKE_BUILD:C|PATH=|PATH=${WRKSRC}/bootstrap/bin:|} ${ALL_TARGET} ) + +do-build-DOCS-on: + @${ECHO} "*** Build docs" + (cd ${WRKSRC}/doc && \ + ${DO_MAKE_BUILD} html ) + +do-build-EXAMPLES-on: + @${ECHO} "*** Build examples" + # Fortran is not yet supported on FreeBSD +.for d in ada_f77 matrix + ${MV} ${WRKSRC}/examples/${d} ${WRKDIR} +.endfor + (cd ${WRKSRC}/examples && \ + ${DO_MAKE_BUILD:C|PATH=|PATH=${WRKSRC}/bootstrap/bin:|} ${ALL_TARGET} ) +.for d in ada_f77 matrix + ${MV} ${WRKDIR}/${d} ${WRKSRC}/examples/ +.endfor + +do-install: + @${ECHO} "*** Installation of gprbuild" + (cd ${WRKSRC} && \ + ${SETENV} ${MAKE_ENV:C|PATH=|PATH=${WRKSRC}/bootstrap/bin:|} ${FAKEROOT} \ + ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET} ) +.for p in ${P2STRIP} + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/gnat${GCC_VER}/${p} +.endfor .include diff --git a/devel/gprbuild/distinfo b/devel/gprbuild/distinfo index 0557ba24010b..d0a41f2205f3 100644 --- a/devel/gprbuild/distinfo +++ b/devel/gprbuild/distinfo @@ -1,3 +1,7 @@ -TIMESTAMP = 1465501253 -SHA256 (AdaCore-gprbuild-20160609-376670f_GH0.tar.gz) = c595767f69cca960d5f0f7bfa5f7bdcfb2fcba11822432e87f1eef52cfb68fab -SIZE (AdaCore-gprbuild-20160609-376670f_GH0.tar.gz) = 958175 +TIMESTAMP = 1671273373 +SHA256 (AdaCore-gprbuild-v23.0.0_GH0.tar.gz) = 141b403ea8a3f82b58b6a8690f8409fe295f3692b667ba3ec487fafcbd26e389 +SIZE (AdaCore-gprbuild-v23.0.0_GH0.tar.gz) = 952887 +SHA256 (AdaCore-gprconfig_kb-v23.0.0_GH0.tar.gz) = 182d9108c91390ddd67c841e45a3fc9dd23a94b33d4a1f05ed2788c1fb9b7dd2 +SIZE (AdaCore-gprconfig_kb-v23.0.0_GH0.tar.gz) = 42132 +SHA256 (AdaCore-xmlada-v23.0.0_GH0.tar.gz) = 66245a68f2e391c8dc8dc50d6d5f109eb3b371e261d095d2002dff3927dd5253 +SIZE (AdaCore-xmlada-v23.0.0_GH0.tar.gz) = 1053370 diff --git a/devel/gprbuild/files/Makefile.BSD b/devel/gprbuild/files/Makefile.BSD deleted file mode 100644 index cc359e7f8caf..000000000000 --- a/devel/gprbuild/files/Makefile.BSD +++ /dev/null @@ -1,80 +0,0 @@ -.PATH: ../src -.PATH: ../gpr/src - -STATIC_FLAGS= -gnat12 -gnaty -gnatQ -O2 -gnatpn -gnatws -g1 - -PREFIX?= /usr/local -GPRLIB_INC= -I${PREFIX}/include/xmlada -I../gpr/src -LOOK= -aL${PREFIX}/lib/xmlada/static -aI${PREFIX}/include/xmlada - -libgpr_csrc= gprbuild_dummies.c \ - gpr_imports.c - -LARGS= ${libgpr_csrc:S/^/-largs /:.c=.o} \ - -largs ${PREFIX}/lib/xmlada/static/libxmlada_dom.a \ - -largs ${PREFIX}/lib/xmlada/static/libxmlada_input_sources.a \ - -largs ${PREFIX}/lib/xmlada/static/libxmlada_sax.a \ - -largs ${PREFIX}/lib/xmlada/static/libxmlada_schema.a \ - -largs ${PREFIX}/lib/xmlada/static/libxmlada_unicode.a - -APPS= gprclean/gprclean-main.adb \ - gprconfig/gprconfig-main.adb \ - gprbuild/gprbuild-main.adb \ - gprbind/gprbind.adb \ - gprlib/gprlib.adb \ - gprinstall/gprinstall-main.adb \ - gprslave/gprslave.adb \ - gprname/gprname-main.adb \ - gprls/gprls-main.adb - -all: ${APPS:H} - -gprclean: gprclean-main.adb ${libgpr_csrc:.c=.o} - gnatmake -o ${.TARGET} -j${PROCESSORS} \ - ${STATIC_FLAGS} ${GPRLIB_INC} ${LOOK} \ - ${.ALLSRC:M*adb} ${LARGS} - -.for app in ${APPS:Ngprclean*} -${app:H}: gprclean ${app:T} ${libgpr_csrc:.c=.o} - gnatmake -o ${.TARGET} ${STATIC_FLAGS} ${GPRLIB_INC} ${LOOK} \ - ${.ALLSRC:M*adb} ${LARGS} -.endfor - -clean: - rm -f *.o *.ali b~* ${APP:H} - -gen-docs: - ${MAKE} -e -C ${.CURDIR:H}/doc html txt - -install: - mkdir -p ${DESTDIR}${PREFIX}/bin \ - ${DESTDIR}${PREFIX}/libexec/gprbuild \ - ${DESTDIR}${PREFIX}/share/gpr \ - ${DESTDIR}${PREFIX}/share/gprconfig - ${BSD_INSTALL_PROGRAM} \ - ${.CURDIR}/gprclean \ - ${.CURDIR}/gprinstall \ - ${.CURDIR}/gprconfig \ - ${.CURDIR}/gprslave \ - ${.CURDIR}/gprls \ - ${.CURDIR}/gprname \ - ${.CURDIR}/gprbuild \ - ${DESTDIR}${PREFIX}/bin - ${BSD_INSTALL_PROGRAM} \ - ${.CURDIR}/gprbind \ - ${.CURDIR}/gprlib \ - ${DESTDIR}${PREFIX}/libexec/gprbuild - ${BSD_INSTALL_DATA} \ - ${.CURDIR}/../share/_default.gpr \ - ${DESTDIR}${PREFIX}/share/gpr - ${BSD_INSTALL_DATA} \ - ${.CURDIR}/../share/gprconfig/*.x[sm][dl] \ - ${DESTDIR}${PREFIX}/share/gprconfig - -install-docs: - mkdir -p ${DESTDIR}${PREFIX}/share/doc/gprbuild/txt - ${BSD_INSTALL_DATA} ${.CURDIR}/../doc/txt/gprbuild_ug.txt \ - ${DESTDIR}${PREFIX}/share/doc/gprbuild/txt - rm -rf ${.CURDIR}/../doc/html/_sources - rm -f ${.CURDIR}/../doc/html/.buildinfo - cp -a ${.CURDIR}/../doc/html ${DESTDIR}${PREFIX}/share/doc/gprbuild diff --git a/devel/gprbuild/files/patch-share_gprconfig_compilers.xml b/devel/gprbuild/files/patch-share_gprconfig_compilers.xml deleted file mode 100644 index e3b32868b634..000000000000 --- a/devel/gprbuild/files/patch-share_gprconfig_compilers.xml +++ /dev/null @@ -1,24 +0,0 @@ ---- share/gprconfig/compilers.xml.orig 2015-04-28 15:02:41 UTC -+++ share/gprconfig/compilers.xml -@@ -693,17 +693,15 @@ - - Ada - -- ${PREFIX}gcc -v -+ ${PREFIX}ada -v - - - -- \.\./lib/gcc(-lib)?/$TARGET/$gcc_version/adalib/ -- \.\./lib/gcc(-lib)?/$TARGET/$gcc_version/ada_object_path -- \.\./lib/gcc(-lib)?/$TARGET/$gcc_version/rts-(.*)/adalib/ -- \.\./$TARGET/lib/gnat/(.*)/adalib/ -+ \.\./lib/gcc/$TARGET/$gcc_version/adalib -+ /usr/local/gcc5-aux/lib/gcc/$TARGET/$gcc_version/adalib - - -- ${PREFIX}gcc -dumpmachine -+ ${PREFIX}ada -dumpmachine - - - diff --git a/devel/gprbuild/files/patch-share_gprconfig_gnat.xml b/devel/gprbuild/files/patch-share_gprconfig_gnat.xml deleted file mode 100644 index 38e9d4021c0c..000000000000 --- a/devel/gprbuild/files/patch-share_gprconfig_gnat.xml +++ /dev/null @@ -1,20 +0,0 @@ ---- share/gprconfig/gnat.xml.orig 2014-10-13 22:03:37 UTC -+++ share/gprconfig/gnat.xml -@@ -63,7 +63,7 @@ - - - -- -+ - - &filter_gnat; - -@@ -75,7 +75,7 @@ - end Naming; - - package Compiler is -- for Driver ("Ada") use "${PATH(ada)}${PREFIX(ada)}gcc"; -+ for Driver ("Ada") use "${PATH(ada)}${PREFIX(ada)}ada"; - for Language_Kind ("Ada") use "unit_based"; - for Dependency_Kind ("Ada") use "ALI_File"; - for Leading_Required_Switches ("Ada") use diff --git a/devel/gprbuild/files/patch-share_gprconfig_linker.xml b/devel/gprbuild/files/patch-share_gprconfig_linker.xml deleted file mode 100644 index b3b7d8bc4357..000000000000 --- a/devel/gprbuild/files/patch-share_gprconfig_linker.xml +++ /dev/null @@ -1,56 +0,0 @@ ---- share/gprconfig/linker.xml.orig 2015-04-28 14:21:56 UTC -+++ share/gprconfig/linker.xml -@@ -687,11 +687,14 @@ - - - -- -+ - - - - -+ -+ -+ - - - -@@ -763,10 +766,13 @@ - - - -- -+ - - - -+ -+ -+ - - - for Run_Path_Option use ("-Wl,-rpath,"); -@@ -1308,6 +1314,12 @@ - - - -+ -+ -+ -+ -+ -+ - - - -@@ -1392,6 +1404,9 @@ - - - -+ -+ -+ - - - diff --git a/devel/gprbuild/files/patch-share_gprconfig_targetset.xml b/devel/gprbuild/files/patch-share_gprconfig_targetset.xml deleted file mode 100644 index 7ff72692b9fd..000000000000 --- a/devel/gprbuild/files/patch-share_gprconfig_targetset.xml +++ /dev/null @@ -1,54 +0,0 @@ ---- share/gprconfig/targetset.xml.orig 2014-09-11 13:36:47 UTC -+++ share/gprconfig/targetset.xml -@@ -66,8 +66,8 @@ - - - -- x86-solaris -- i.86-(pc-)?solaris.* -+ i.86-.*-solaris.* -+ x86_64-.*-solaris.* - - - -@@ -162,19 +162,34 @@ - pent.*-cygwin.* - - -- -+ - -- x86-freebsd - i.86-.*freebsd.* -+ amd64-.*-freebsd.* -+ x86_64-.*-freebsd.* - - -- -+ - -- x86_64-freebsd -- x86_64-.*freebsd.* -- amd64-.*freebsd.* -+ i.86-.*-dragonfly.* -+ x86_64-.*-dragonfly.* - - -+ -+ -+ i.86-.*-netbsd.* -+ amd64-.*-netbsd.* -+ x86_64-.*-netbsd.* -+ -+ -+ -+ -+ i.86-.*-openbsd.* -+ amd64-.*-openbsd.* -+ x86_64-.*-openbsd.* -+ -+ -+ - - - diff --git a/devel/gprbuild/files/patch-src_gprlib.adb b/devel/gprbuild/files/patch-src_gprlib.adb deleted file mode 100644 index 4385d5c92e45..000000000000 --- a/devel/gprbuild/files/patch-src_gprlib.adb +++ /dev/null @@ -1,50 +0,0 @@ ---- src/gprlib.adb.orig 2015-05-06 11:08:38 UTC -+++ src/gprlib.adb -@@ -393,6 +393,11 @@ procedure Gprlib is - - Separate_Run_Path_Options : Boolean := False; - -+ Rpath_Disabled : Boolean := False; -+ -- If -R is passed through the library options for the linker, it will -+ -- prevent the implemented libraries portion of the rpath switch from -+ -- being built, even if the linker is capable of supporting rpath. -+ - Rpath : String_List_Access := null; - -- Allocated only if Path Option is supported - -@@ -1011,7 +1016,12 @@ begin - Use_GNAT_Lib := False; - end if; - -- Library_Options_Table.Append (new String'(Line (1 .. Last))); -+ if Line (1 .. Last) = "-R" then -+ Rpath_Disabled := True; -+ else -+ Library_Options_Table.Append -+ (new String'(Line (1 .. Last))); -+ end if; - - when Gprexch.Library_Rpath_Options => - Library_Rpath_Options_Table.Append -@@ -1143,10 +1153,10 @@ begin - - Libgnat := - new String' -- ("-lgnat-" & Line (6 .. Last)); -+ ("-lgnat-" & Line (6)); - Libgnarl := - new String' -- ("-lgnarl-" & Line (6 .. Last)); -+ ("-lgnarl-" & Line (6)); - end if; - - else -@@ -2113,7 +2123,7 @@ begin - Library_Switches_Table.Append - (new String'("-L" & Imported_Library_Directories.Table (J).all)); - -- if Path_Option /= null then -+ if not Rpath_Disabled and then Path_Option /= null then - Add_Rpath (Imported_Library_Directories.Table (J)); - end if; - diff --git a/devel/gprbuild/pkg-plist b/devel/gprbuild/pkg-plist index 1ec5d5e08a34..09b87da5b4b6 100644 --- a/devel/gprbuild/pkg-plist +++ b/devel/gprbuild/pkg-plist @@ -1,23 +1,77 @@ -bin/gprbuild -bin/gprclean -bin/gprconfig -bin/gprinstall -bin/gprls -bin/gprname -bin/gprslave -libexec/gprbuild/gprbind -libexec/gprbuild/gprlib -share/gpr/_default.gpr -share/gprconfig/asm.xml -share/gprconfig/c.xml -share/gprconfig/clean.xml -share/gprconfig/compilers.xml -share/gprconfig/cpp.xml -share/gprconfig/cross.xml -share/gprconfig/fortran.xml -share/gprconfig/gnat.xml -share/gprconfig/gprconfig.xsd -share/gprconfig/linker.xml -share/gprconfig/nocompiler.xml -share/gprconfig/targetset.xml -share/gprconfig/windres.xml +gnat12/bin/gprbuild +gnat12/bin/gprclean +gnat12/bin/gprconfig +gnat12/bin/gprinstall +gnat12/bin/gprls +gnat12/bin/gprname +gnat12/bin/gprslave +gnat12/doinstall +gnat12/libexec/gprbuild/gprbind +gnat12/libexec/gprbuild/gprlib +gnat12/share/gpr/_default.gpr +gnat12/share/gpr/manifests/gprbuild +gnat12/share/gprconfig/0_default.xml +gnat12/share/gprconfig/aamp.xml +gnat12/share/gprconfig/aamp_compilers.xml +gnat12/share/gprconfig/aarch64-vx7.xml +gnat12/share/gprconfig/aarch64-vx7r2.xml +gnat12/share/gprconfig/arm-vx6.xml +gnat12/share/gprconfig/arm-vx7.xml +gnat12/share/gprconfig/arm-vx7r2.xml +gnat12/share/gprconfig/asis.xml +gnat12/share/gprconfig/asm.xml +gnat12/share/gprconfig/baselined.xml +gnat12/share/gprconfig/bin_img.xml +gnat12/share/gprconfig/c.xml +gnat12/share/gprconfig/clean.xml +gnat12/share/gprconfig/compilers-arm-vx7.xml +gnat12/share/gprconfig/compilers-asis.xml +gnat12/share/gprconfig/compilers-baselined.xml +gnat12/share/gprconfig/compilers-e500v2-vx6.xml +gnat12/share/gprconfig/compilers-e500v2-vx653.xml +gnat12/share/gprconfig/compilers-e500v2-vx7.xml +gnat12/share/gprconfig/compilers-e500v2-vx7r2.xml +gnat12/share/gprconfig/compilers-ppc-vx653.xml +gnat12/share/gprconfig/compilers-ppc-vx7.xml +gnat12/share/gprconfig/compilers-ppc-vx7r2.xml +gnat12/share/gprconfig/compilers-ppc64-vx7.xml +gnat12/share/gprconfig/compilers-ppc64-vx7r2.xml +gnat12/share/gprconfig/compilers-vxworks.xml +gnat12/share/gprconfig/compilers-x86-vx7.xml +gnat12/share/gprconfig/compilers-x86_64-vx7.xml +gnat12/share/gprconfig/compilers.xml +gnat12/share/gprconfig/cpp.xml +gnat12/share/gprconfig/cross.xml +gnat12/share/gprconfig/e500v2-vx6.xml +gnat12/share/gprconfig/e500v2-vx653.xml +gnat12/share/gprconfig/e500v2-vx7.xml +gnat12/share/gprconfig/e500v2-vx7r2.xml +gnat12/share/gprconfig/env.ent +gnat12/share/gprconfig/fallback_targets.xml +gnat12/share/gprconfig/fortran.xml +gnat12/share/gprconfig/gnat.xml +gnat12/share/gprconfig/gprconfig.xsd +gnat12/share/gprconfig/linker.xml +gnat12/share/gprconfig/nocompiler.xml +gnat12/share/gprconfig/ppc-vx6.xml +gnat12/share/gprconfig/ppc-vx653.xml +gnat12/share/gprconfig/ppc-vx7.xml +gnat12/share/gprconfig/ppc-vx7r2.xml +gnat12/share/gprconfig/ppc64-vx7.xml +gnat12/share/gprconfig/ppc64-vx7r2.xml +gnat12/share/gprconfig/shortcuts.ent +gnat12/share/gprconfig/targetset.xml +gnat12/share/gprconfig/tricore-compilers.xml +gnat12/share/gprconfig/tricore-configuration.xml +gnat12/share/gprconfig/tricore-target.xml +gnat12/share/gprconfig/vx6.ent +gnat12/share/gprconfig/vx653.ent +gnat12/share/gprconfig/vx7.ent +gnat12/share/gprconfig/vxworks.ent +gnat12/share/gprconfig/vxworks.xml +gnat12/share/gprconfig/windres.xml +gnat12/share/gprconfig/x86-vx6.xml +gnat12/share/gprconfig/x86-vx7.xml +gnat12/share/gprconfig/x86-vx7r2.xml +gnat12/share/gprconfig/x86_64-vx7.xml +gnat12/share/gprconfig/x86_64-vx7r2.xml