head 1.4; access; symbols pkgsrc-2022Q3:1.3.0.48 pkgsrc-2022Q3-base:1.3 pkgsrc-2022Q2:1.3.0.46 pkgsrc-2022Q2-base:1.3 pkgsrc-2022Q1:1.3.0.44 pkgsrc-2022Q1-base:1.3 pkgsrc-2021Q4:1.3.0.42 pkgsrc-2021Q4-base:1.3 pkgsrc-2021Q3:1.3.0.40 pkgsrc-2021Q3-base:1.3 pkgsrc-2021Q2:1.3.0.38 pkgsrc-2021Q2-base:1.3 pkgsrc-2021Q1:1.3.0.36 pkgsrc-2021Q1-base:1.3 pkgsrc-2020Q4:1.3.0.34 pkgsrc-2020Q4-base:1.3 pkgsrc-2020Q3:1.3.0.32 pkgsrc-2020Q3-base:1.3 pkgsrc-2020Q2:1.3.0.28 pkgsrc-2020Q2-base:1.3 pkgsrc-2020Q1:1.3.0.8 pkgsrc-2020Q1-base:1.3 pkgsrc-2019Q4:1.3.0.30 pkgsrc-2019Q4-base:1.3 pkgsrc-2019Q3:1.3.0.26 pkgsrc-2019Q3-base:1.3 pkgsrc-2019Q2:1.3.0.24 pkgsrc-2019Q2-base:1.3 pkgsrc-2019Q1:1.3.0.22 pkgsrc-2019Q1-base:1.3 pkgsrc-2018Q4:1.3.0.20 pkgsrc-2018Q4-base:1.3 pkgsrc-2018Q3:1.3.0.18 pkgsrc-2018Q3-base:1.3 pkgsrc-2018Q2:1.3.0.16 pkgsrc-2018Q2-base:1.3 pkgsrc-2018Q1:1.3.0.14 pkgsrc-2018Q1-base:1.3 pkgsrc-2017Q4:1.3.0.12 pkgsrc-2017Q4-base:1.3 pkgsrc-2017Q3:1.3.0.10 pkgsrc-2017Q3-base:1.3 pkgsrc-2017Q2:1.3.0.6 pkgsrc-2017Q2-base:1.3 pkgsrc-2017Q1:1.3.0.4 pkgsrc-2017Q1-base:1.3 pkgsrc-2016Q4:1.3.0.2 pkgsrc-2016Q4-base:1.3 pkgsrc-2016Q3:1.2.0.20 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.18 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.16 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.14 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.12 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.10 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.8 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.6 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.4 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.2 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.1.0.14 pkgsrc-2014Q1-base:1.1 pkgsrc-2013Q4:1.1.0.12 pkgsrc-2013Q4-base:1.1 pkgsrc-2013Q3:1.1.0.10 pkgsrc-2013Q3-base:1.1 pkgsrc-2013Q2:1.1.0.8 pkgsrc-2013Q2-base:1.1 pkgsrc-2013Q1:1.1.0.6 pkgsrc-2013Q1-base:1.1 pkgsrc-2012Q4:1.1.0.4 pkgsrc-2012Q4-base:1.1 pkgsrc-2012Q3:1.1.0.2 pkgsrc-2012Q3-base:1.1; locks; strict; comment @-- @; 1.4 date 2022.12.25.18.51.55; author wiz; state dead; branches; next 1.3; commitid P6dVyGhIIdXDfY6E; 1.3 date 2016.11.25.20.36.49; author marino; state Exp; branches; next 1.2; commitid OuLe7Bz0COsVdyvz; 1.2 date 2014.04.30.16.28.09; author marino; state Exp; branches; next 1.1; commitid Vni8Ls5Vdi9V3Jyx; 1.1 date 2012.07.08.20.08.42; author marino; state Exp; branches; next ; desc @@ 1.4 log @gprbuild-aux: really remove @ text @$NetBSD: patch-src_gprlib.adb,v 1.3 2016/11/25 20:36:49 marino Exp $ Marino's modification to give Ada programs build with GPRBUILD proper -rpath support --- 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; @ 1.3 log @Upgrade USE_LANGUAGES=ada to use lang/gcc5-aux instead of lang/gcc-aux This large commit accomplishes the following: 1) Switch USE_LANGUAGES=ada to require lang/gcc5-aux (gcc 5.4) instead of lang/gcc-aux (gcc 4.9.2) on gcc.mk 2) Bump affected ports and fix paths as necessary 3) Upgrade devel/gprbuild to the latest release - No longer requires lang/gnat_util - gprslave requires gcc6-aux, so it was disabled for now 4) Fix lang/gnat_util but set PKG_SKIP_REASON - It has no further purpose in the pkgsrc tree - It has no practical purpose outside of the pkgsrc tree - Indicate intent to remove from tree in Jan. 2017 5) Set devel/GPS as failed with PKG_FAIL_REASON - This version of GPS is several years old and at the time they were strongly tied to compiler. - Latest release of GPS require gcc6-aux (not available) and several new and complex dependencies - maintainer (me) has no interest to continue supporting it - Leaving GPS in place until Jan 2017 to give another person chance to upgrade and take over support - Latest version in FreeBSD Ports Collection as a reference point @ text @d1 1 a1 1 $NetBSD: patch-src_gprlib.adb,v 1.2 2014/04/30 16:28:09 marino Exp $ @ 1.2 log @devel/gprbuild-aux: Update version GPL 2012 to GPL 2013 GPRBuild needs to be built with GNAT sources, so it now depends on the new library lang/gnat_util. It installs two new programs: gprinstall and gprslave. This is the latest version published by Adacore. @ text @d1 1 a1 1 $NetBSD$ d6 1 a6 1 --- src/gprlib.adb.orig 2013-04-16 14:36:02.000000000 +0000 d8 1 a8 1 @@@@ -390,6 +390,11 @@@@ procedure Gprlib is d20 1 a20 1 @@@@ -1009,7 +1014,12 @@@@ begin d32 16 a47 3 when Library_Path => Osint.Fail ("library path should not be specified"); @@@@ -2127,7 +2137,7 @@@@ begin @ 1.1 log @devel/gprbuild-aux: Upgrade to version GPL 2012 1) Replace custom tarball with Adacore's GPL 2012 release 2) Update license to GPLv3 3) Remove lang/gnat-aux dependency 4) USE_LANGUAGES+= ada (invokes lang/gcc-aux dependency) 5) Update buildlink3.mk to require GPL 2012 version 6) Restore use of pkgsrc wrappers 7) Add Library_Option "-R" support which ignores all automatically generated rpaths* which point to the WRKOBJDIR. DESTDIR isn't supported by GPRBuild, so this rpath disabling is necessary to avoid references to work directories. * gcc and adalib rpaths are excluded with -R option. 8) This Library_Option "-R" matches the same modification added to lang/gcc-aux and lang/gnat-aux's project handler. 9) This modification is required to fix www/aws rpath issues which appears with recent changes to PKG_DEVELOPER=yes checks. @ text @d3 4 a6 1 --- src/gprlib.adb.orig 2012-05-10 13:59:05.000000000 +0000 @