diff options
author | marino <marino@FreeBSD.org> | 2015-04-21 04:00:00 +0800 |
---|---|---|
committer | marino <marino@FreeBSD.org> | 2015-04-21 04:00:00 +0800 |
commit | 5efe9492146ef0e61d7dd3b2d82fb7d678fd7032 (patch) | |
tree | aead13c36653b2947ab40c58640bf198a04d15d4 /lang/gcc-aux | |
parent | 52a1090deea666f7fda9d08fb4c4d460de7ebf2f (diff) | |
download | freebsd-ports-gnome-5efe9492146ef0e61d7dd3b2d82fb7d678fd7032.tar.gz freebsd-ports-gnome-5efe9492146ef0e61d7dd3b2d82fb7d678fd7032.tar.zst freebsd-ports-gnome-5efe9492146ef0e61d7dd3b2d82fb7d678fd7032.zip |
devel/gps: Restore missing project properties switches
The project properties were missing several tabs in the "switches"
sections, but it wasn't immediately obvious why. It turns out that this
was caused by a missing generated file (gnat_switches.py). Restoring
that file along with having PATH set to the Ada compiler restored the
missing tabs.
The trick is that the generated file needs a texi file that is not present
in the distfile. The texi file was discarded by gnat_util (and its parent
gccX), so the solution is change gnat_util to install the file at its own
DOCDIR. Pregeneration of the gnat_switches.py is a bad idea IMO, so we
stick with the intended generation.
while here, install gps as gps_exe and create a wrapper named "gps" that
will define ADA_PROJECT_PATH and a PATH component to the Ada compiler if
they aren't already defined. GPS malfunctions a bit if it can't find the
compiler or standard library project files. Using a wrapper is nice for
new users that don't realize environmental changes are needed.
I also changed the install scripts to use BSD_INSTALL_* macros which
eliminated the need to use the install-strip INSTALL_TARGET.
Finally -- it seems that the ADAXX trick to pull in gcc-aux's versioning
for the PORTREVISION stopped working recently although the PORTVERSION
still worked. There's a new catch-22 where <pre> was needed to evaluate
USES=ada, but if <pre> is called, PORTREVISION value is frozen. Failure
to use <pre> resulted in an inclusion failure. The only fix available
was to recreate the ada.mk logic. Since gnatdroid is still hardcoded to
gcc-aux, only gnat_util was affected (discovered when poudriere failed
to rebuild it).
Diffstat (limited to 'lang/gcc-aux')
-rw-r--r-- | lang/gcc-aux/Makefile.version | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lang/gcc-aux/Makefile.version b/lang/gcc-aux/Makefile.version index de3ce8ba20cd..1bdd1a73dec5 100644 --- a/lang/gcc-aux/Makefile.version +++ b/lang/gcc-aux/Makefile.version @@ -5,8 +5,7 @@ GCC_POINT= 2 GCC_VERSION= ${GCC_BRANCH}.${GCC_POINT} SNAPSHOT= 20141023 MAIN_PR= 1 -UTIL_PR= 1 -ARMV5_PR= 0 +UTIL_PR= 2 ARMV7_PR= 0 # Snapshot naming pattern |