Date: Thu, 25 Apr 2013 14:38:45 GMT From: John Marino <draco@marino.st> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/178146: devel/gprbuild: [NEW PORT] based on devel/gprbuild-aux to replace it Message-ID: <201304251438.r3PEcj0u007029@red.freebsd.org> Resent-Message-ID: <201304251440.r3PEe0tY014669@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 178146
>Category: ports
>Synopsis: devel/gprbuild: [NEW PORT] based on devel/gprbuild-aux to replace it
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Thu Apr 25 14:40:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: John Marino
>Release:
>Organization:
>Environment:
>Description:
The devel/gprbuild-aux is heavily tied with lang/gnat-aux. No other gnat compiler can use it (e.g. lang/gnat).
This new port intends to be more versatile although the only verified compiler atm is lang/gcc-aux. Once the two port that depend on gprbuild are updated, devel/gprbuild-aux should be removed and another PR will be submitted to do that.
main points:
1) supports new USES+= ada
2) Updated to GNAT GPL 2012 source
3) supports DESTDIR (tested on pkgsrc)
4) improved targetsets
5) Includes custom support for -R RPATH support (only found here, I created it)
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
# This is a shell archive. Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file". Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
# devel/gprbuild
# devel/gprbuild/Makefile
# devel/gprbuild/distinfo
# devel/gprbuild/pkg-descr
# devel/gprbuild/pkg-plist
# devel/gprbuild/files
# devel/gprbuild/files/patch-Makefile.in
# devel/gprbuild/files/patch-gprbuild.gpr
# devel/gprbuild/files/patch-share_gprconfig_compilers.xml
# devel/gprbuild/files/patch-share_gprconfig_gnat.xml
# devel/gprbuild/files/patch-share_gprconfig_linker.xml
# devel/gprbuild/files/patch-share_gprconfig_targetset.xml
# devel/gprbuild/files/patch-src_gprlib.adb
#
echo c - devel/gprbuild
mkdir -p devel/gprbuild > /dev/null 2>&1
echo x - devel/gprbuild/Makefile
sed 's/^X//' >devel/gprbuild/Makefile << '85a130f3c8d7e8a20bfedb38909a9cb3'
X# Created by: John Marino <draco@marino.st>
X# $FreeBSD$
X
XPORTNAME= gprbuild
XPORTVERSION= ${SNAPSHOT}
XCATEGORIES= devel
XMASTER_SITES= http://downloads.dragonlace.net/src/
XDISTNAME= gprbuild-gpl-2012-src
XEXTRACT_SUFX= .tgz
X
XMAINTAINER= draco@marino.st
XCOMMENT= Adacore multi-language software build tool
X
XLICENSE= GPLv3
X
XBUILD_DEPENDS+= xmlada>=3.2:${PORTSDIR}/textproc/xmlada
X
XEXAMPLESDIR= share/examples/gprbuild
XDOCSDIR= share/doc/gprbuild
XWRKSRC= ${WRKDIR}/gprbuild-2012-src
XSNAPSHOT= 20120510
XGNU_CONFIGURE= yes
XUSE_GMAKE= yes
XUSES+= ada
X
X.include <bsd.port.pre.mk>
X
X.if ${OPSYS} == "FreeBSD"
XCONFIGURE_TARGET= ${ARCH:S/amd64/x86_64/}-portbld-${OPSYS:L}${OSREL}
X.endif
X
Xpost-patch:
X @${REINPLACE_CMD} -e "s,@AUXPREFIX@,${PREFIX}/gcc-aux," \
X ${WRKSRC}/share/gprconfig/compilers.xml
X
X.include <bsd.port.post.mk>
85a130f3c8d7e8a20bfedb38909a9cb3
echo x - devel/gprbuild/distinfo
sed 's/^X//' >devel/gprbuild/distinfo << '35d6eead1a7c1857611f173903700553'
XSHA256 (gprbuild-gpl-2012-src.tgz) = 6884def18abae463ffcc31a958f3aba804e5445ebdaef7d6b27c3c8efc912eb4
XSIZE (gprbuild-gpl-2012-src.tgz) = 2159669
35d6eead1a7c1857611f173903700553
echo x - devel/gprbuild/pkg-descr
sed 's/^X//' >devel/gprbuild/pkg-descr << '830586e0e9ed64a90f7b6444470f4a6a'
XGPRbuild is an advanced software tool designed to help automate the
Xconstruction of multi-language systems. It removes the complexity from
Xmulti-language development by allowing developers to quickly and easily
Xcompile and link software written in a combination of languages including
XAda, Assembler, C, C++, and Fortran. Easily extendable by users to cover
Xnew toolchains and languages it is primarily aimed at projects of all sizes
Xorganized into subsystems and libraries and is particularly well suited for
Xcompiled languages.
X
XWWW: http://www.adacore.com/home/products/gnatpro/toolsuite/gprbuild/
830586e0e9ed64a90f7b6444470f4a6a
echo x - devel/gprbuild/pkg-plist
sed 's/^X//' >devel/gprbuild/pkg-plist << 'e1e02df5489d1017cdf478b76611fd2f'
Xbin/gprbuild
Xbin/gprclean
Xbin/gprconfig
Xlibexec/gprbuild/gprbind
Xlibexec/gprbuild/gprlib
X%%DOCSDIR%%/html/gnat_style.css
X%%DOCSDIR%%/html/gprbuild.css
X%%DOCSDIR%%/html/gprbuild_ug.html
X%%DOCSDIR%%/html/gps_index.xml
X%%DOCSDIR%%/html/important.png
X%%DOCSDIR%%/html/note.png
X%%DOCSDIR%%/html/tip.png
X%%DOCSDIR%%/info/gprbuild_ug.info
X%%DOCSDIR%%/pdf/gprbuild_ug.pdf
X%%DOCSDIR%%/txt/gprbuild_ug.txt
X%%EXAMPLESDIR%%/Makefile
X%%EXAMPLESDIR%%/ada_cpp/Makefile
X%%EXAMPLESDIR%%/ada_cpp/animals.gpr
X%%EXAMPLESDIR%%/ada_cpp/except.gpr
X%%EXAMPLESDIR%%/ada_cpp/src1/ada_main.adb
X%%EXAMPLESDIR%%/ada_cpp/src1/call_cpp.adb
X%%EXAMPLESDIR%%/ada_cpp/src1/call_cpp.ads
X%%EXAMPLESDIR%%/ada_cpp/src1/cpp_main.cpp
X%%EXAMPLESDIR%%/ada_cpp/src1/cpp_routine.cpp
X%%EXAMPLESDIR%%/ada_cpp/src1/cpp_routine.h
X%%EXAMPLESDIR%%/ada_cpp/src2/animals.adb
X%%EXAMPLESDIR%%/ada_cpp/src2/animals.ads
X%%EXAMPLESDIR%%/ada_cpp/src2/animals.h
X%%EXAMPLESDIR%%/ada_cpp/src2/animals_c.cc
X%%EXAMPLESDIR%%/ada_cpp/src2/animals_interfaces.ads
X%%EXAMPLESDIR%%/ada_cpp/src2/main.adb
X%%EXAMPLESDIR%%/ada_f77/Makefile
X%%EXAMPLESDIR%%/ada_f77/ess.f
X%%EXAMPLESDIR%%/ada_f77/fm.gpr
X%%EXAMPLESDIR%%/ada_f77/ft.gpr
X%%EXAMPLESDIR%%/ada_f77/src/fm-interfac.adb
X%%EXAMPLESDIR%%/ada_f77/src/fm-interfac.ads
X%%EXAMPLESDIR%%/ada_f77/src/fm-locks.adb
X%%EXAMPLESDIR%%/ada_f77/src/fm-locks.ads
X%%EXAMPLESDIR%%/ada_f77/src/fm-protected_queue.adb
X%%EXAMPLESDIR%%/ada_f77/src/fm-protected_queue.ads
X%%EXAMPLESDIR%%/ada_f77/src/fm-system_dependant.adb
X%%EXAMPLESDIR%%/ada_f77/src/fm-system_dependant.ads
X%%EXAMPLESDIR%%/ada_f77/src/fm-tuple_manager.adb
X%%EXAMPLESDIR%%/ada_f77/src/fm-tuple_manager.ads
X%%EXAMPLESDIR%%/ada_f77/src/fm-types.ads
X%%EXAMPLESDIR%%/ada_f77/src/fm.adb
X%%EXAMPLESDIR%%/ada_f77/src/fm.ads
X%%EXAMPLESDIR%%/extended_projects/Makefile
X%%EXAMPLESDIR%%/extended_projects/new_ada_main.gpr
X%%EXAMPLESDIR%%/extended_projects/new_ada_src/ada_main.adb
X%%EXAMPLESDIR%%/extended_projects/new_common_subsystem.gpr
X%%EXAMPLESDIR%%/extended_projects/new_util_src/c_lib.ads
X%%EXAMPLESDIR%%/extended_projects/new_util_src/lib2.c
X%%EXAMPLESDIR%%/first_steps/Makefile
X%%EXAMPLESDIR%%/first_steps/ada_main.gpr
X%%EXAMPLESDIR%%/first_steps/ada_src/ada_main.adb
X%%EXAMPLESDIR%%/first_steps/c_main.gpr
X%%EXAMPLESDIR%%/first_steps/c_src/c_main.c
X%%EXAMPLESDIR%%/first_steps/util_src/ada_lib.adb
X%%EXAMPLESDIR%%/first_steps/util_src/ada_lib.ads
X%%EXAMPLESDIR%%/first_steps/util_src/c_lib.ads
X%%EXAMPLESDIR%%/first_steps/util_src/lib.c
X%%EXAMPLESDIR%%/first_steps/util_src/lib.h
X%%EXAMPLESDIR%%/libraries/Makefile
X%%EXAMPLESDIR%%/libraries/Makefile2
X%%EXAMPLESDIR%%/libraries/ada_main.adb
X%%EXAMPLESDIR%%/libraries/c_main.c
X%%EXAMPLESDIR%%/libraries/dynamic_lib.gpr
X%%EXAMPLESDIR%%/libraries/extern_lib.gpr
X%%EXAMPLESDIR%%/libraries/lib_src/ada_lib.adb
X%%EXAMPLESDIR%%/libraries/lib_src/ada_lib.ads
X%%EXAMPLESDIR%%/libraries/lib_src/c_lib.ads
X%%EXAMPLESDIR%%/libraries/lib_src/lib.c
X%%EXAMPLESDIR%%/libraries/lib_src/lib.h
X%%EXAMPLESDIR%%/libraries/main0.gpr
X%%EXAMPLESDIR%%/libraries/main1.gpr
X%%EXAMPLESDIR%%/libraries/main2.gpr
X%%EXAMPLESDIR%%/libraries/main3.gpr
X%%EXAMPLESDIR%%/libraries/main4.gpr
X%%EXAMPLESDIR%%/libraries/sa_lib.gpr
X%%EXAMPLESDIR%%/libraries/static_lib.gpr
X%%EXAMPLESDIR%%/matrix/Makefile
X%%EXAMPLESDIR%%/matrix/matrix.gpr
X%%EXAMPLESDIR%%/matrix/src/initmat.c
X%%EXAMPLESDIR%%/matrix/src/main.adb
X%%EXAMPLESDIR%%/matrix/src/multmat.f
X%%EXAMPLESDIR%%/namings/Makefile
X%%EXAMPLESDIR%%/namings/_print2.ada
X%%EXAMPLESDIR%%/namings/_print3.adb
X%%EXAMPLESDIR%%/namings/main.adb
X%%EXAMPLESDIR%%/namings/my_routine.c1
X%%EXAMPLESDIR%%/namings/my_routine2.c1
X%%EXAMPLESDIR%%/namings/namings.gpr
X%%EXAMPLESDIR%%/namings/src1/main.adb
X%%EXAMPLESDIR%%/namings/util-case1.ada
X%%EXAMPLESDIR%%/namings/util-case2.ada
X%%EXAMPLESDIR%%/namings/util.ads
X%%EXAMPLESDIR%%/ppc-elf/Makefile
X%%EXAMPLESDIR%%/ppc-elf/gdb.run
X%%EXAMPLESDIR%%/ppc-elf/hello.gpr
X%%EXAMPLESDIR%%/ppc-elf/srcs/c_io.c
X%%EXAMPLESDIR%%/ppc-elf/srcs/hello.adb
X%%EXAMPLESDIR%%/ppc-elf/srcs/ppc_start.s
X%%EXAMPLESDIR%%/ppc-elf/srcs/textio.adb
X%%EXAMPLESDIR%%/ppc-elf/srcs/textio.ads
X%%EXAMPLESDIR%%/scenarios/Makefile
X%%EXAMPLESDIR%%/scenarios/general_lib.gpr
X%%EXAMPLESDIR%%/scenarios/main.gpr
X%%EXAMPLESDIR%%/subsystems/Makefile
X%%EXAMPLESDIR%%/subsystems/ada_main.gpr
X%%EXAMPLESDIR%%/subsystems/ada_src/ada_main.adb
X%%EXAMPLESDIR%%/subsystems/attribute_sharing.gpr
X%%EXAMPLESDIR%%/subsystems/c_main.gpr
X%%EXAMPLESDIR%%/subsystems/c_src/c_main.c
X%%EXAMPLESDIR%%/subsystems/common_subsystem.gpr
X%%EXAMPLESDIR%%/subsystems/util_src/ada_lib.adb
X%%EXAMPLESDIR%%/subsystems/util_src/ada_lib.ads
X%%EXAMPLESDIR%%/subsystems/util_src/c_lib.ads
X%%EXAMPLESDIR%%/subsystems/util_src/lib.c
X%%EXAMPLESDIR%%/subsystems/util_src/lib.h
Xshare/gprconfig/asm.xml
Xshare/gprconfig/c.xml
Xshare/gprconfig/compilers.xml
Xshare/gprconfig/cpp.xml
Xshare/gprconfig/cross.xml
Xshare/gprconfig/fortran.xml
Xshare/gprconfig/gnat.xml
Xshare/gprconfig/gprconfig.xsd
Xshare/gprconfig/linker.xml
Xshare/gprconfig/nocompiler.xml
Xshare/gprconfig/targetset.xml
X@dirrm %%DOCSDIR%%
X@dirrm %%DOCSDIR%%/html
X@dirrm %%DOCSDIR%%/info
X@dirrm %%DOCSDIR%%/pdf
X@dirrm %%DOCSDIR%%/txt
X@dirrmtry %%EXAMPLESDIR%%/ada_cpp/src1
X@dirrmtry %%EXAMPLESDIR%%/ada_cpp/src2
X@dirrmtry %%EXAMPLESDIR%%/ada_cpp
X@dirrmtry %%EXAMPLESDIR%%/ada_f77/dlib
X@dirrmtry %%EXAMPLESDIR%%/ada_f77/dobj
X@dirrmtry %%EXAMPLESDIR%%/ada_f77/fobj
X@dirrmtry %%EXAMPLESDIR%%/ada_f77/lib
X@dirrmtry %%EXAMPLESDIR%%/ada_f77/obj
X@dirrmtry %%EXAMPLESDIR%%/ada_f77/src
X@dirrmtry %%EXAMPLESDIR%%/ada_f77
X@dirrmtry %%EXAMPLESDIR%%/extended_projects/new_obj
X@dirrmtry %%EXAMPLESDIR%%/extended_projects/new_ada_src
X@dirrmtry %%EXAMPLESDIR%%/extended_projects/new_obj_util
X@dirrmtry %%EXAMPLESDIR%%/extended_projects/new_util_src
X@dirrmtry %%EXAMPLESDIR%%/extended_projects
X@dirrmtry %%EXAMPLESDIR%%/first_steps/ada_src
X@dirrmtry %%EXAMPLESDIR%%/first_steps/c_src
X@dirrmtry %%EXAMPLESDIR%%/first_steps/obj
X@dirrmtry %%EXAMPLESDIR%%/first_steps/obj1
X@dirrmtry %%EXAMPLESDIR%%/first_steps/util_src
X@dirrmtry %%EXAMPLESDIR%%/first_steps
X@dirrmtry %%EXAMPLESDIR%%/libraries/lib
X@dirrmtry %%EXAMPLESDIR%%/libraries/lib2
X@dirrmtry %%EXAMPLESDIR%%/libraries/lib3
X@dirrmtry %%EXAMPLESDIR%%/libraries/lib_src
X@dirrmtry %%EXAMPLESDIR%%/libraries/obj
X@dirrmtry %%EXAMPLESDIR%%/libraries/obj1
X@dirrmtry %%EXAMPLESDIR%%/libraries/obj2
X@dirrmtry %%EXAMPLESDIR%%/libraries
X@dirrmtry %%EXAMPLESDIR%%/matrix/obj
X@dirrmtry %%EXAMPLESDIR%%/matrix/src
X@dirrmtry %%EXAMPLESDIR%%/matrix
X@dirrmtry %%EXAMPLESDIR%%/namings/obj-case1
X@dirrmtry %%EXAMPLESDIR%%/namings/obj-case2
X@dirrmtry %%EXAMPLESDIR%%/namings/obj-case3
X@dirrmtry %%EXAMPLESDIR%%/namings/src1
X@dirrmtry %%EXAMPLESDIR%%/namings
X@dirrmtry %%EXAMPLESDIR%%/ppc-elf/objs
X@dirrmtry %%EXAMPLESDIR%%/ppc-elf/srcs
X@dirrmtry %%EXAMPLESDIR%%/ppc-elf
X@dirrmtry %%EXAMPLESDIR%%/scenarios/obj
X@dirrmtry %%EXAMPLESDIR%%/scenarios/obj1
X@dirrmtry %%EXAMPLESDIR%%/scenarios
X@dirrmtry %%EXAMPLESDIR%%/subsystems/ada_src
X@dirrmtry %%EXAMPLESDIR%%/subsystems/obj
X@dirrmtry %%EXAMPLESDIR%%/subsystems/obj1
X@dirrmtry %%EXAMPLESDIR%%/subsystems/obj_util
X@dirrmtry %%EXAMPLESDIR%%/subsystems/c_src
X@dirrmtry %%EXAMPLESDIR%%/subsystems/util_src
X@dirrmtry %%EXAMPLESDIR%%/subsystems
X@dirrmtry %%EXAMPLESDIR%%
X@dirrmtry libexec/gprbuild
X@dirrmtry share/gpr
X@dirrmtry share/gprconfig
e1e02df5489d1017cdf478b76611fd2f
echo c - devel/gprbuild/files
mkdir -p devel/gprbuild/files > /dev/null 2>&1
echo x - devel/gprbuild/files/patch-Makefile.in
sed 's/^X//' >devel/gprbuild/files/patch-Makefile.in << 'd454bfd79c782a6c69745e2a488ab00a'
X$NetBSD: patch-Makefile.in,v 1.1 2012/07/08 20:08:42 marino Exp $
X
X--- Makefile.in.orig 2012-01-04 15:36:14.000000000 +0000
X+++ Makefile.in
X@@ -19,7 +19,7 @@ EXEXT=
X endif
X CP=cp -p
X MKDIR=mkdir -p
X-BUILD=debug
X+BUILD=production
X
X prefix=@prefix@
X srcdir=@srcdir@
X@@ -124,37 +124,35 @@ bootstrap-clean:
X -XBUILD_TOOL=gprbuild
X
X install: install.data install.bin
X- -${MKDIR} ${datadir}/gpr
X- $(RM) -r ${datadir}/examples/gprbuild
X- -${MKDIR} ${datadir}/examples/gprbuild
X- ${CP} -r examples/* ${datadir}/examples/gprbuild
X- ${RM} -r ${datadir}/doc/gprbuild
X- -${MKDIR} ${datadir}/doc/gprbuild
X+ -${MKDIR} ${DESTDIR}${datadir}/gpr
X+ -${MKDIR} ${DESTDIR}${datadir}/examples/gprbuild
X+ ${CP} -r examples/* ${DESTDIR}${datadir}/examples/gprbuild
X+ -${MKDIR} ${DESTDIR}${datadir}/doc/gprbuild
X for format in html txt pdf info; do \
X if [ -d doc/$$format ] ; then \
X- ${MKDIR} ${datadir}/doc/gprbuild/$$format; \
X- ${CP} doc/$$format/* ${datadir}/doc/gprbuild/$$format; \
X+ ${MKDIR} ${DESTDIR}${datadir}/doc/gprbuild/$$format; \
X+ ${CP} doc/$$format/* ${DESTDIR}${datadir}/doc/gprbuild/$$format; \
X if [ $$format = html ] ; then \
X- ${CP} doc/*.png ${datadir}/doc/gprbuild/html; \
X+ ${CP} doc/*.png ${DESTDIR}${datadir}/doc/gprbuild/html; \
X sed -e "s/<doc_path>.*//" doc/gprbuild_gps.xml \
X- > ${datadir}/doc/gprbuild/html/gps_index.xml; \
X+ > ${DESTDIR}${datadir}/doc/gprbuild/html/gps_index.xml; \
X fi; \
X fi; \
X done
X
X install.data: force
X- -${MKDIR} ${datadir}/gprconfig
X- ${CP} share/gprconfig/*.xml ${datadir}/gprconfig
X- ${CP} share/gprconfig/gprconfig.xsd ${datadir}/gprconfig
X+ -${MKDIR} ${DESTDIR}${datadir}/gprconfig
X+ ${INSTALL_DATA} share/gprconfig/*.xml ${DESTDIR}${datadir}/gprconfig
X+ ${INSTALL_DATA} share/gprconfig/gprconfig.xsd ${DESTDIR}${datadir}/gprconfig
X
X install.bin: force
X- -${MKDIR} ${bindir}
X- ${INSTALL_PROGRAM} gprconfig${EXEXT} ${bindir}
X- ${INSTALL_PROGRAM} gprbuild${EXEXT} ${bindir}
X- ${INSTALL_PROGRAM} gprclean${EXEXT} ${bindir}
X- -${MKDIR} ${libexecdir}/gprbuild
X- ${INSTALL_PROGRAM} gprbind${EXEXT} ${libexecdir}/gprbuild/
X- ${INSTALL_PROGRAM} gprlib${EXEXT} ${libexecdir}/gprbuild/
X+ -${MKDIR} ${DESTDIR}${bindir}
X+ ${INSTALL_PROGRAM} gprconfig${EXEXT} ${DESTDIR}${bindir}
X+ ${INSTALL_PROGRAM} gprbuild${EXEXT} ${DESTDIR}${bindir}
X+ ${INSTALL_PROGRAM} gprclean${EXEXT} ${DESTDIR}${bindir}
X+ -${MKDIR} ${DESTDIR}${libexecdir}/gprbuild
X+ ${INSTALL_PROGRAM} gprbind${EXEXT} ${DESTDIR}${libexecdir}/gprbuild/
X+ ${INSTALL_PROGRAM} gprlib${EXEXT} ${DESTDIR}${libexecdir}/gprbuild/
X
X $(objdir)/gprbuild_dummies.o: src/gprbuild_dummies.c
X gcc -c -o $@ $<
d454bfd79c782a6c69745e2a488ab00a
echo x - devel/gprbuild/files/patch-gprbuild.gpr
sed 's/^X//' >devel/gprbuild/files/patch-gprbuild.gpr << '6f7de6dfc624bd19b87045bb007e764d'
X$NetBSD: patch-gprbuild.gpr,v 1.1 2012/07/08 20:08:42 marino Exp $
X
X--- gprbuild.gpr.orig 2012-05-10 13:59:06.000000000 +0000
X+++ gprbuild.gpr
X@@ -80,7 +80,7 @@ project Gprbuild is
X ("-pg", "-g");
X when "production" =>
X for Default_Switches ("Ada") use common_switches &
X- ("-O2", "-gnatpn", "-gnatws");
X+ ("-g", "-O2", "-gnatpn", "-gnatws");
X end case;
X end Compiler;
X
6f7de6dfc624bd19b87045bb007e764d
echo x - devel/gprbuild/files/patch-share_gprconfig_compilers.xml
sed 's/^X//' >devel/gprbuild/files/patch-share_gprconfig_compilers.xml << '87dfb529c5f7d81519eb11286f78bc93'
X$NetBSD: patch-share_gprconfig_compilers.xml,v 1.1 2012/07/08 20:08:42 marino Exp $
X
X--- share/gprconfig/compilers.xml.orig 2012-03-28 13:32:23.000000000 +0000
X+++ share/gprconfig/compilers.xml
X@@ -418,16 +418,15 @@
X </version>
X <languages>Ada</languages>
X <variable name="gcc_version">
X- <external>${PREFIX}gcc -v</external>
X+ <external>${PREFIX}ada -v</external>
X <grep regexp="^gcc \S+ (\S+)" group="1"></grep>
X </variable>
X <runtimes default="default,kernel,native">
X- <directory group="default" >\.\./lib/gcc(-lib)?/$TARGET/$gcc_version/adalib/</directory>
X- <directory group="default" contents="^rts-">\.\./lib/gcc(-lib)?/$TARGET/$gcc_version/ada_object_path</directory>
X- <directory group="2" >\.\./lib/gcc(-lib)?/$TARGET/$gcc_version/rts-(.*)/adalib/</directory>
X+ <directory group="default">\.\./lib/gcc/$TARGET/$gcc_version/adalib</directory>
X+ <directory group="0">@AUXPREFIX@/lib/gcc/$TARGET/$gcc_version/adalib</directory>
X </runtimes>
X <target>
X- <external>${PREFIX}gcc -dumpmachine</external>
X+ <external>${PREFIX}ada -dumpmachine</external>
X <grep regexp="[^\r\n]+"></grep>
X </target>
X </compiler_description>
87dfb529c5f7d81519eb11286f78bc93
echo x - devel/gprbuild/files/patch-share_gprconfig_gnat.xml
sed 's/^X//' >devel/gprbuild/files/patch-share_gprconfig_gnat.xml << 'f96b0af2b074eda65a6b4b688b3478eb'
X$NetBSD: patch-share_gprconfig_gnat.xml,v 1.1 2012/07/08 20:08:42 marino Exp $
X
X--- share/gprconfig/gnat.xml.orig 2012-03-30 17:17:06.000000000 +0000
X+++ share/gprconfig/gnat.xml
X@@ -63,7 +63,7 @@
X </config>
X </configuration>
X
X- <!-- GNAT -->
X+ <!-- GNAT (tailored to lang/gcc-aux) -->
X <configuration>
X &filter_gnat;
X <config>
X@@ -75,7 +75,7 @@
X end Naming;
X
X package Compiler is
X- for Driver ("Ada") use "${PATH(ada)}${PREFIX(ada)}gcc";
X+ for Driver ("Ada") use "${PATH(ada)}${PREFIX(ada)}ada";
X for Language_Kind ("Ada") use "unit_based";
X for Dependency_Kind ("Ada") use "ALI_File";
X for Leading_Required_Switches ("Ada") use
f96b0af2b074eda65a6b4b688b3478eb
echo x - devel/gprbuild/files/patch-share_gprconfig_linker.xml
sed 's/^X//' >devel/gprbuild/files/patch-share_gprconfig_linker.xml << '65ce7f702736cea08696bac9d9a6c34f'
X$NetBSD: patch-share_gprconfig_linker.xml,v 1.1 2012/07/08 20:08:42 marino Exp $
X
X--- share/gprconfig/linker.xml.orig 2012-04-11 21:09:08.000000000 +0000
X+++ share/gprconfig/linker.xml
X@@ -437,11 +437,14 @@
X </config>
X </configuration>
X
X- <!-- linux, freebsd and Irix-->
X+ <!-- linux, bsd and Irix-->
X <configuration>
X <targets>
X <target name="^.*linux.*$" />
X <target name="^.*freebsd.*$" />
X+ <target name="^.*dragonfly.*$" />
X+ <target name="^.*openbsd.*$" />
X+ <target name="^.*netbsd.*$" />
X <target name="^.*irix.*$" />
X </targets>
X <config>
X@@ -487,10 +490,13 @@
X </config>
X </configuration>
X
X- <!-- freebsd -->
X+ <!-- bsd -->
X <configuration>
X <targets>
X <target name="^.*freebsd.*$" />
X+ <target name="^.*dragonfly.*$" />
X+ <target name="^.*openbsd.*$" />
X+ <target name="^.*netbsd.*$" />
X </targets>
X <config>
X for Run_Path_Option use ("-Wl,-rpath,");
X@@ -781,6 +787,9 @@
X <target name="^.*mingw.*$" />
X <target name="^.*linux.*$" />
X <target name="^.*freebsd.*$" />
X+ <target name="^.*dragonfly.*$" />
X+ <target name="^.*openbsd.*$" />
X+ <target name="^.*netbsd.*$" />
X </targets>
X <compilers negate="true">
X <compiler language="C++" />
X@@ -820,6 +829,9 @@
X <target name="^.*mingw.*$" />
X <target name="^.*linux.*$" />
X <target name="^.*freebsd.*$" />
X+ <target name="^.*dragonfly.*$" />
X+ <target name="^.*openbsd.*$" />
X+ <target name="^.*netbsd.*$" />
X </targets>
X <compilers negate="true">
X <compiler language="C++" />
X@@ -859,6 +871,9 @@
X <target name="^.*mingw.*$" />
X <target name="^.*linux.*$" />
X <target name="^.*freebsd.*$" />
X+ <target name="^.*dragonfly.*$" />
X+ <target name="^.*openbsd.*$" />
X+ <target name="^.*netbsd.*$" />
X </targets>
X <compilers>
X <compiler language="C++" />
65ce7f702736cea08696bac9d9a6c34f
echo x - devel/gprbuild/files/patch-share_gprconfig_targetset.xml
sed 's/^X//' >devel/gprbuild/files/patch-share_gprconfig_targetset.xml << '9c25438f323afa55785b93632fd01517'
X$NetBSD: patch-share_gprconfig_targetset.xml,v 1.1 2012/07/08 20:08:42 marino Exp $
X
X--- share/gprconfig/targetset.xml.orig 2011-10-20 17:41:48.000000000 +0000
X+++ share/gprconfig/targetset.xml
X@@ -52,8 +52,8 @@
X
X <!-- x86-solaris -->
X <targetset>
X- <target>x86-solaris</target>
X- <target>i.86-(pc-)?solaris.*</target>
X+ <target>i.86-.*-solaris.*</target>
X+ <target>x86_64-.*-solaris.*</target>
X </targetset>
X
X <!-- x86-windows (mingw) -->
X@@ -144,10 +144,29 @@
X
X <!-- Freebsd -->
X <targetset>
X- <target>x86-freebsd</target>
X <target>i.86-.*freebsd.*</target>
X+ <target>x86_64-.*-freebsd.*</target>
X </targetset>
X
X+ <!-- DragonFlyBSD -->
X+ <targetset>
X+ <target>i.86-.*-dragonfly.*</target>
X+ <target>x86_64-.*-dragonfly.*</target>
X+ </targetset>
X+
X+ <!-- NetBSD -->
X+ <targetset>
X+ <target>i.86-.*-netbsd.*</target>
X+ <target>x86_64-.*-netbsd.*</target>
X+ </targetset>
X+
X+ <!-- OpenBSD -->
X+ <targetset>
X+ <target>i.86-.*-openbsd.*</target>
X+ <target>x86_64-.*-openbsd.*</target>
X+ </targetset>
X+
X+
X <!-- Cross Ports -->
X <!-- *********** -->
X
9c25438f323afa55785b93632fd01517
echo x - devel/gprbuild/files/patch-src_gprlib.adb
sed 's/^X//' >devel/gprbuild/files/patch-src_gprlib.adb << '95f977427977972e7913dee7771d60d4'
X$NetBSD: patch-src_gprlib.adb,v 1.1 2012/07/08 20:08:42 marino Exp $
X
X--- src/gprlib.adb.orig 2012-05-10 13:59:05.000000000 +0000
X+++ src/gprlib.adb
X@@ -390,6 +390,11 @@ procedure Gprlib is
X
X Separate_Run_Path_Options : Boolean := False;
X
X+ Rpath_Disabled : Boolean := False;
X+ -- If -R is passed through the library options for the linker, it will
X+ -- prevent the implemented libraries portion of the rpath switch from
X+ -- being built, even if the linker is capable of supporting rpath.
X+
X Rpath : String_List_Access := null;
X -- Allocated only if Path Option is supported
X
X@@ -1009,7 +1014,12 @@ begin
X Use_GNAT_Lib := False;
X end if;
X
X- Library_Options_Table.Append (new String'(Line (1 .. Last)));
X+ if Line (1 .. Last) = "-R" then
X+ Rpath_Disabled := True;
X+ else
X+ Library_Options_Table.Append
X+ (new String'(Line (1 .. Last)));
X+ end if;
X
X when Library_Path =>
X Osint.Fail ("library path should not be specified");
X@@ -2127,7 +2137,7 @@ begin
X Library_Switches_Table.Append
X (new String'("-L" & Imported_Library_Directories.Table (J).all));
X
X- if Path_Option /= null then
X+ if not Rpath_Disabled and then Path_Option /= null then
X Add_Rpath (Imported_Library_Directories.Table (J));
X end if;
X
95f977427977972e7913dee7771d60d4
exit
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201304251438.r3PEcj0u007029>