From nobody Sun Dec 18 21:13:59 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 4NZwYz446Bz1G0Lb; Sun, 18 Dec 2022 21:13:59 +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 4NZwYz3qpnz3sKL; Sun, 18 Dec 2022 21:13:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671398039; 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=a/5Oz5LEdTf/hTEaCRs8UUMFi830uHLk0fBm9QZG4f8=; b=fBrS0mGOLxZuHJLURsOzGorrwGtFhZj67Mb4rO1FvjocB44GaPjdh6/i5e7BlnPFLtaa2a RMa5HGsycXenIcXHWMiL2gPkh3/pPcOKS3fssrOBP/gPVGi58URh2TXOv/iGwzGugJFWAc FmqPGT7XoqqF5qZ+B7bAKoM2sETUhcC41sI5zB2RhuU/JWPmY2+KeXt+k2atxIRl/vLEFz LMvQLoZii2wket7O9w+0huDXjILW3H1PelUp/87BUPlQ8Oj6AV+HaeIDJmOYi2g5FE291T BZEfuWfX9FnAPHlTRESppb+aoUpft8P3HwzGkq5DZ4Jn8NsAbQcgX+A7yRz+NA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671398039; 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=a/5Oz5LEdTf/hTEaCRs8UUMFi830uHLk0fBm9QZG4f8=; b=MqgKLxjGwiYA8WfxACLLXnYHAZ2LHO2dYktNOUXImCNWMwSbuCsUJN3iZU6HStNQ0C/+tu gXQ6Bt4ZizpAuZMI8BJwt04mwIANj50Hp3csRzjTHRxscHx3559ieJ2fDsOPE+ZGdr3ZI9 1WuQly/8cLR2N4/tHaPvSFnhrXx4ZnhsMozap3+p/sJm6oPGHAJ4uTmh5lmJkSZ5MB7NOL Tf/wl1lGWw94gTRtaD74srzIwh6zYP46isXCtKtSMJhDfV5AkhQGfjM7BG547XYjhB21D1 yDbHzr0pdvkBzJBou/IHr1v7MUsLN3HyWshMB2n3qMTlX4PGW3UfPIE0sBAFWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671398039; a=rsa-sha256; cv=none; b=a+OmVgqCMBrQM+xTXXlJ83VI5cOsqvRIzr2rayAwlMa7sX2qac3tqJaGsvkYIEc57+pErL a5v8lh7g2U9EBzwD+J2WJb2lPKdfnfJRvLG5TLkx0yEU16uopkWCXxudZC6dO43w8/Dblm auhZWw4OLwGgt5mxNGaARPO1+p6Q2hFXY+BBmQDQOnfhNpXlA+A3ytx3QHyx2ovzD7/JuI c01TJby1goxUToCNSj8cD/UbA7XMCbBqMQSiPThF7GPyjhURcnU7ui1i/HWqQ5P9wMkJHE +v4u3pmwnEeo3htwAQKRNWpWzzYYwZ0jln2QUZF9BO8GBFS4IKT084gLEAKxyw== 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 4NZwYz2vJVzWPN; Sun, 18 Dec 2022 21:13:59 +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 2BILDx5i008512; Sun, 18 Dec 2022 21:13:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BILDxMp008511; Sun, 18 Dec 2022 21:13:59 GMT (envelope-from git) Date: Sun, 18 Dec 2022 21:13:59 GMT Message-Id: <202212182113.2BILDxMp008511@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: e144ceaf6801 - main - devel/gprbuild: resurrect 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: thierry X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e144ceaf68011728c68e6aaac9782d860747361e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=e144ceaf68011728c68e6aaac9782d860747361e commit e144ceaf68011728c68e6aaac9782d860747361e Author: Thierry Thomas AuthorDate: 2022-12-14 12:31:37 +0000 Commit: Thierry Thomas CommitDate: 2022-12-18 21:13:54 +0000 devel/gprbuild: resurrect --- MOVED | 1 - devel/Makefile | 1 + devel/gprbuild/Makefile | 40 +++++++++++ devel/gprbuild/distinfo | 3 + 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-descr | 10 +++ devel/gprbuild/pkg-plist | 23 +++++++ 12 files changed, 361 insertions(+), 1 deletion(-) diff --git a/MOVED b/MOVED index a496884295c7..1b2ab4f91a95 100644 --- a/MOVED +++ b/MOVED @@ -16894,7 +16894,6 @@ devel/ahven||2022-02-28|Removed, depends on expired lang/gcc6-aux devel/alog||2022-02-28|Removed, depends on expired lang/gcc6-aux devel/aunit||2022-02-28|Removed, depends on expired lang/gcc6-aux devel/florist-gpl||2022-02-28|Removed, depends on expired lang/gcc6-aux -devel/gprbuild||2022-02-28|Removed, depends on expired lang/gcc6-aux devel/libspark2012||2022-02-28|Removed, depends on expired lang/gcc6-aux devel/matreshka||2022-02-28|Removed, depends on expired lang/gcc6-aux devel/pcsc-ada||2022-02-28|Removed, depends on expired lang/gcc6-aux diff --git a/devel/Makefile b/devel/Makefile index 172edef4a323..e51b1254093e 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -877,6 +877,7 @@ SUBDIR += gpds SUBDIR += gperf SUBDIR += gpm + SUBDIR += gprbuild SUBDIR += gputils SUBDIR += gradle SUBDIR += gradle-completion diff --git a/devel/gprbuild/Makefile b/devel/gprbuild/Makefile new file mode 100644 index 000000000000..0d1b625336e4 --- /dev/null +++ b/devel/gprbuild/Makefile @@ -0,0 +1,40 @@ +# Created by: John Marino + +PORTNAME= gprbuild +PORTVERSION= ${SNAPSHOT} +PORTREVISION= 1 +CATEGORIES= devel + +MAINTAINER= ports@FreeBSD.org +COMMENT= Adacore multi-language software build tool + +LICENSE= GPLv3+ +LICENSE_FILE= ${WRKSRC}/COPYING3 + +BUILD_DEPENDS= xmlada>=4.4:textproc/xmlada + +SNAPSHOT= 20160609 +USES= ada +USE_GITHUB= yes +GH_ACCOUNT= AdaCore +GH_TAGNAME= 376670f + +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 + +.include diff --git a/devel/gprbuild/distinfo b/devel/gprbuild/distinfo new file mode 100644 index 000000000000..0557ba24010b --- /dev/null +++ b/devel/gprbuild/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1465501253 +SHA256 (AdaCore-gprbuild-20160609-376670f_GH0.tar.gz) = c595767f69cca960d5f0f7bfa5f7bdcfb2fcba11822432e87f1eef52cfb68fab +SIZE (AdaCore-gprbuild-20160609-376670f_GH0.tar.gz) = 958175 diff --git a/devel/gprbuild/files/Makefile.BSD b/devel/gprbuild/files/Makefile.BSD new file mode 100644 index 000000000000..cc359e7f8caf --- /dev/null +++ b/devel/gprbuild/files/Makefile.BSD @@ -0,0 +1,80 @@ +.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 new file mode 100644 index 000000000000..e3b32868b634 --- /dev/null +++ b/devel/gprbuild/files/patch-share_gprconfig_compilers.xml @@ -0,0 +1,24 @@ +--- 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 new file mode 100644 index 000000000000..38e9d4021c0c --- /dev/null +++ b/devel/gprbuild/files/patch-share_gprconfig_gnat.xml @@ -0,0 +1,20 @@ +--- 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 new file mode 100644 index 000000000000..b3b7d8bc4357 --- /dev/null +++ b/devel/gprbuild/files/patch-share_gprconfig_linker.xml @@ -0,0 +1,56 @@ +--- 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 new file mode 100644 index 000000000000..7ff72692b9fd --- /dev/null +++ b/devel/gprbuild/files/patch-share_gprconfig_targetset.xml @@ -0,0 +1,54 @@ +--- 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 new file mode 100644 index 000000000000..4385d5c92e45 --- /dev/null +++ b/devel/gprbuild/files/patch-src_gprlib.adb @@ -0,0 +1,50 @@ +--- 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-descr b/devel/gprbuild/pkg-descr new file mode 100644 index 000000000000..04cda280a036 --- /dev/null +++ b/devel/gprbuild/pkg-descr @@ -0,0 +1,10 @@ +GPRbuild is an advanced software tool designed to help automate the +construction of multi-language systems. It removes the complexity from +multi-language development by allowing developers to quickly and easily +compile and link software written in a combination of languages including +Ada, Assembler, C, C++, and Fortran. Easily extendable by users to cover +new toolchains and languages it is primarily aimed at projects of all sizes +organized into subsystems and libraries and is particularly well suited for +compiled languages. + +WWW: https://www.adacore.com/home/products/gnatpro/toolsuite/gprbuild/ diff --git a/devel/gprbuild/pkg-plist b/devel/gprbuild/pkg-plist new file mode 100644 index 000000000000..1ec5d5e08a34 --- /dev/null +++ b/devel/gprbuild/pkg-plist @@ -0,0 +1,23 @@ +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