pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Upgrade USE_LANGUAGES=ada to use lang/gcc5-aux instead...
details: https://anonhg.NetBSD.org/pkgsrc/rev/23c13505bc35
branches: trunk
changeset: 355220:23c13505bc35
user: marino <marino%pkgsrc.org@localhost>
date: Fri Nov 25 20:36:49 2016 +0000
description:
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
diffstat:
cad/ghdl/Makefile | 3 +-
devel/florist/Makefile | 4 +-
devel/gprbuild-aux/Makefile | 37 +-
devel/gprbuild-aux/PLIST | 122 +---------
devel/gprbuild-aux/distinfo | 23 +-
devel/gprbuild-aux/patches/patch-Makefile.in | 79 ------
devel/gprbuild-aux/patches/patch-gprbuild.gpr | 30 --
devel/gprbuild-aux/patches/patch-share_gprconfig_compilers.xml | 9 +-
devel/gprbuild-aux/patches/patch-share_gprconfig_gnat.xml | 6 +-
devel/gprbuild-aux/patches/patch-share_gprconfig_linker.xml | 25 +-
devel/gprbuild-aux/patches/patch-share_gprconfig_targetset.xml | 23 +-
devel/gprbuild-aux/patches/patch-src_gpr__version.adb | 22 -
devel/gprbuild-aux/patches/patch-src_gprlib.adb | 27 +-
devel/gps/Makefile | 17 +-
lang/gnat_util/Makefile | 9 +-
lang/gnat_util/Makefile.sources | 4 +-
lang/gnat_util/distinfo | 10 +-
mk/compiler/gcc.mk | 16 +-
textproc/xmlada/Makefile | 4 +-
www/aws-demos/Makefile | 8 +-
www/aws/Makefile | 8 +-
x11/gtkada/Makefile | 4 +-
22 files changed, 130 insertions(+), 360 deletions(-)
diffs (truncated from 829 to 300 lines):
diff -r 0a0563b164d9 -r 23c13505bc35 cad/ghdl/Makefile
--- a/cad/ghdl/Makefile Fri Nov 25 18:02:03 2016 +0000
+++ b/cad/ghdl/Makefile Fri Nov 25 20:36:49 2016 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2014/12/11 20:12:36 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2016/11/25 20:36:50 marino Exp $
GCCVER= 4.9.2
DISTNAME= ghdl-0.32rc1
CATEGORIES= cad
+PKGREVISION= 1
MASTER_SITES= ${MASTER_SITE_LOCAL}
EXTRACT_SUFX= .tar.bz2
GCCDISTNAME= gcc-${GCCVER}.tar.bz2
diff -r 0a0563b164d9 -r 23c13505bc35 devel/florist/Makefile
--- a/devel/florist/Makefile Fri Nov 25 18:02:03 2016 +0000
+++ b/devel/florist/Makefile Fri Nov 25 20:36:49 2016 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2016/11/24 00:27:03 marino Exp $
+# $NetBSD: Makefile,v 1.19 2016/11/25 20:36:49 marino Exp $
#
DISTNAME= florist-gpl-2012-src
PKGNAME= florist-gpl-2012
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel
MASTER_SITES= http://downloads.dragonlace.net/src/
EXTRACT_SUFX= .tgz
diff -r 0a0563b164d9 -r 23c13505bc35 devel/gprbuild-aux/Makefile
--- a/devel/gprbuild-aux/Makefile Fri Nov 25 18:02:03 2016 +0000
+++ b/devel/gprbuild-aux/Makefile Fri Nov 25 20:36:49 2016 +0000
@@ -1,38 +1,29 @@
-# $NetBSD: Makefile,v 1.6 2016/11/25 01:05:47 marino Exp $
+# $NetBSD: Makefile,v 1.7 2016/11/25 20:36:49 marino Exp $
#
DISTNAME= gprbuild-aux-${SNAPSHOT}
CATEGORIES= devel
-MASTER_SITES= http://downloads.dragonlace.net/src/
-DISTFILES= gprbuild-gpl-${YEAR}-src.tgz
+MASTER_SITES= https://codeload.github.com/AdaCore/gprbuild/tar.gz/${TAGNAME}?dummy=/
+DISTFILES= gprbuild-${TAGNAME}.tar.gz
MAINTAINER= draco%marino.st@localhost
HOMEPAGE= http://www.adacore.com/home/products/gnatpro/toolsuite/gprbuild/
COMMENT= Adacore multi-language software build tool
LICENSE= gnu-gpl-v3
-SNAPSHOT= 20130416
-YEAR= 2013
-GNU_CONFIGURE= yes
+SNAPSHOT= 20160609
+TAGNAME= 376670f
USE_LANGUAGES= c ada
-USE_TOOLS= gmake
-MAKE_ARGS+= BUILD=production
-MAKE_ARGS+= PROCESSORS=${MAKE_JOBS:U1:Q}
-MAKE_ENV+= ADA_PROJECT_PATH=${PREFIX}/lib/gnat
-CONFIGURE_ENV+= ADA_PROJECT_PATH=${PREFIX}/lib/gnat
-WRKSRC= ${WRKDIR}/gprbuild-${YEAR}-src
+BUILD_MAKE_FLAGS= BUILD=production \
+ PROCESSORS=${MAKE_JOBS:U1:Q}
+MAKE_ENV= ADA_PROJECT_PATH=${PREFIX}/lib/gnat
+WRKSRC= ${WRKDIR}/gprbuild-${TAGNAME}
+BUILD_DIRS= ${WRKSRC}/construction
-SUBST_CLASSES+= xml
-SUBST_STAGE.xml= pre-configure
-SUBST_MESSAGE.xml= Edit compilers.xml to support lang/gcc-aux runtime
-SUBST_FILES.xml= share/gprconfig/compilers.xml
-SUBST_SED.xml= -e "s,@AUXPREFIX@,${PREFIX}/gcc-aux,"
-
-do-build:
- # Recreate the do-build target without the -J parameter
- # It interferes with the PROCESSORS configure argument
- cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} gmake ${MAKE_ARGS} all
+post-patch:
+ ${MKDIR} ${WRKDIR}/trash ${BUILD_DIRS}
+ ${CP} ${FILESDIR}/Makefile.BSD ${BUILD_DIRS}/Makefile
+ ${MV} ${WRKSRC}/share/gprconfig/*.orig ${WRKDIR}/trash
.include "../../textproc/xmlada/buildlink3.mk"
-.include "../../lang/gnat_util/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 0a0563b164d9 -r 23c13505bc35 devel/gprbuild-aux/PLIST
--- a/devel/gprbuild-aux/PLIST Fri Nov 25 18:02:03 2016 +0000
+++ b/devel/gprbuild-aux/PLIST Fri Nov 25 20:36:49 2016 +0000
@@ -1,130 +1,16 @@
-@comment $NetBSD: PLIST,v 1.3 2014/04/30 16:28:09 marino Exp $
+@comment $NetBSD: PLIST,v 1.4 2016/11/25 20:36:49 marino Exp $
bin/gprbuild
bin/gprclean
bin/gprconfig
bin/gprinstall
-bin/gprslave
+bin/gprls
+bin/gprname
libexec/gprbuild/gprbind
libexec/gprbuild/gprlib
-share/doc/gprbuild/html/gnat_style.css
-share/doc/gprbuild/html/gprbuild.css
-share/doc/gprbuild/html/gprbuild_ug.html
-share/doc/gprbuild/html/gps_index.xml
-share/doc/gprbuild/html/important.png
-share/doc/gprbuild/html/note.png
-share/doc/gprbuild/html/tip.png
-share/doc/gprbuild/info/gprbuild_ug.info
-share/doc/gprbuild/pdf/gprbuild_ug.pdf
-share/doc/gprbuild/txt/gprbuild_ug.txt
-share/examples/gprbuild/Makefile
-share/examples/gprbuild/ada_cpp/Makefile
-share/examples/gprbuild/ada_cpp/animals.gpr
-share/examples/gprbuild/ada_cpp/except.gpr
-share/examples/gprbuild/ada_cpp/src1/ada_main.adb
-share/examples/gprbuild/ada_cpp/src1/call_cpp.adb
-share/examples/gprbuild/ada_cpp/src1/call_cpp.ads
-share/examples/gprbuild/ada_cpp/src1/cpp_main.cpp
-share/examples/gprbuild/ada_cpp/src1/cpp_routine.cpp
-share/examples/gprbuild/ada_cpp/src1/cpp_routine.h
-share/examples/gprbuild/ada_cpp/src2/animals.adb
-share/examples/gprbuild/ada_cpp/src2/animals.ads
-share/examples/gprbuild/ada_cpp/src2/animals.h
-share/examples/gprbuild/ada_cpp/src2/animals_c.cc
-share/examples/gprbuild/ada_cpp/src2/animals_interfaces.ads
-share/examples/gprbuild/ada_cpp/src2/main.adb
-share/examples/gprbuild/ada_f77/Makefile
-share/examples/gprbuild/ada_f77/ess.f
-share/examples/gprbuild/ada_f77/fm.gpr
-share/examples/gprbuild/ada_f77/ft.gpr
-share/examples/gprbuild/ada_f77/src/fm-interfac.adb
-share/examples/gprbuild/ada_f77/src/fm-interfac.ads
-share/examples/gprbuild/ada_f77/src/fm-locks.adb
-share/examples/gprbuild/ada_f77/src/fm-locks.ads
-share/examples/gprbuild/ada_f77/src/fm-protected_queue.adb
-share/examples/gprbuild/ada_f77/src/fm-protected_queue.ads
-share/examples/gprbuild/ada_f77/src/fm-system_dependant.adb
-share/examples/gprbuild/ada_f77/src/fm-system_dependant.ads
-share/examples/gprbuild/ada_f77/src/fm-tuple_manager.adb
-share/examples/gprbuild/ada_f77/src/fm-tuple_manager.ads
-share/examples/gprbuild/ada_f77/src/fm-types.ads
-share/examples/gprbuild/ada_f77/src/fm.adb
-share/examples/gprbuild/ada_f77/src/fm.ads
-share/examples/gprbuild/extended_projects/Makefile
-share/examples/gprbuild/extended_projects/new_ada_main.gpr
-share/examples/gprbuild/extended_projects/new_ada_src/ada_main.adb
-share/examples/gprbuild/extended_projects/new_common_subsystem.gpr
-share/examples/gprbuild/extended_projects/new_util_src/c_lib.ads
-share/examples/gprbuild/extended_projects/new_util_src/lib2.c
-share/examples/gprbuild/first_steps/Makefile
-share/examples/gprbuild/first_steps/ada_main.gpr
-share/examples/gprbuild/first_steps/ada_src/ada_main.adb
-share/examples/gprbuild/first_steps/c_main.gpr
-share/examples/gprbuild/first_steps/c_src/c_main.c
-share/examples/gprbuild/first_steps/util_src/ada_lib.adb
-share/examples/gprbuild/first_steps/util_src/ada_lib.ads
-share/examples/gprbuild/first_steps/util_src/c_lib.ads
-share/examples/gprbuild/first_steps/util_src/lib.c
-share/examples/gprbuild/first_steps/util_src/lib.h
-share/examples/gprbuild/libraries/Makefile
-share/examples/gprbuild/libraries/Makefile2
-share/examples/gprbuild/libraries/ada_main.adb
-share/examples/gprbuild/libraries/c_main.c
-share/examples/gprbuild/libraries/dynamic_lib.gpr
-share/examples/gprbuild/libraries/extern_lib.gpr
-share/examples/gprbuild/libraries/lib_src/ada_lib.adb
-share/examples/gprbuild/libraries/lib_src/ada_lib.ads
-share/examples/gprbuild/libraries/lib_src/c_lib.ads
-share/examples/gprbuild/libraries/lib_src/lib.c
-share/examples/gprbuild/libraries/lib_src/lib.h
-share/examples/gprbuild/libraries/main0.gpr
-share/examples/gprbuild/libraries/main1.gpr
-share/examples/gprbuild/libraries/main2.gpr
-share/examples/gprbuild/libraries/main3.gpr
-share/examples/gprbuild/libraries/main4.gpr
-share/examples/gprbuild/libraries/sa_lib.gpr
-share/examples/gprbuild/libraries/static_lib.gpr
-share/examples/gprbuild/matrix/Makefile
-share/examples/gprbuild/matrix/matrix.gpr
-share/examples/gprbuild/matrix/src/initmat.c
-share/examples/gprbuild/matrix/src/main.adb
-share/examples/gprbuild/matrix/src/multmat.f
-share/examples/gprbuild/namings/Makefile
-share/examples/gprbuild/namings/_print2.ada
-share/examples/gprbuild/namings/_print3.adb
-share/examples/gprbuild/namings/main.adb
-share/examples/gprbuild/namings/my_routine.c1
-share/examples/gprbuild/namings/my_routine2.c1
-share/examples/gprbuild/namings/namings.gpr
-share/examples/gprbuild/namings/src1/main.adb
-share/examples/gprbuild/namings/util-case1.ada
-share/examples/gprbuild/namings/util-case2.ada
-share/examples/gprbuild/namings/util.ads
-share/examples/gprbuild/ppc-elf/Makefile
-share/examples/gprbuild/ppc-elf/gdb.run
-share/examples/gprbuild/ppc-elf/hello.gpr
-share/examples/gprbuild/ppc-elf/srcs/c_io.c
-share/examples/gprbuild/ppc-elf/srcs/hello.adb
-share/examples/gprbuild/ppc-elf/srcs/ppc_start.s
-share/examples/gprbuild/ppc-elf/srcs/textio.adb
-share/examples/gprbuild/ppc-elf/srcs/textio.ads
-share/examples/gprbuild/scenarios/Makefile
-share/examples/gprbuild/scenarios/general_lib.gpr
-share/examples/gprbuild/scenarios/main.gpr
-share/examples/gprbuild/subsystems/Makefile
-share/examples/gprbuild/subsystems/ada_main.gpr
-share/examples/gprbuild/subsystems/ada_src/ada_main.adb
-share/examples/gprbuild/subsystems/attribute_sharing.gpr
-share/examples/gprbuild/subsystems/c_main.gpr
-share/examples/gprbuild/subsystems/c_src/c_main.c
-share/examples/gprbuild/subsystems/common_subsystem.gpr
-share/examples/gprbuild/subsystems/util_src/ada_lib.adb
-share/examples/gprbuild/subsystems/util_src/ada_lib.ads
-share/examples/gprbuild/subsystems/util_src/c_lib.ads
-share/examples/gprbuild/subsystems/util_src/lib.c
-share/examples/gprbuild/subsystems/util_src/lib.h
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
diff -r 0a0563b164d9 -r 23c13505bc35 devel/gprbuild-aux/distinfo
--- a/devel/gprbuild-aux/distinfo Fri Nov 25 18:02:03 2016 +0000
+++ b/devel/gprbuild-aux/distinfo Fri Nov 25 20:36:49 2016 +0000
@@ -1,14 +1,11 @@
-$NetBSD: distinfo,v 1.5 2015/11/03 03:27:30 agc Exp $
+$NetBSD: distinfo,v 1.6 2016/11/25 20:36:49 marino Exp $
-SHA1 (gprbuild-gpl-2013-src.tgz) = 71c6278fd19f80ba4574de2696bfb3cbb9be4b70
-RMD160 (gprbuild-gpl-2013-src.tgz) = 8a7b78a84e1d52afc4009dad64ea89e773f1f585
-SHA512 (gprbuild-gpl-2013-src.tgz) = 5b84621770855bdc145eb100c3f61e1aeda6b05edc7c208b11377532619da9c7f9d920db03414aec02cf0e53317c132da99a018015af71434f14e426cf9f4664
-Size (gprbuild-gpl-2013-src.tgz) = 2291685 bytes
-SHA1 (patch-Makefile.in) = adf984726ac1c9cfed3fd57ec969b25d7c059b18
-SHA1 (patch-gprbuild.gpr) = 5ed5b2079c1a5a16595753d9559259ab182dbaa6
-SHA1 (patch-share_gprconfig_compilers.xml) = a4ce52f729ef16c1d3fef94a386fb378b9e67d47
-SHA1 (patch-share_gprconfig_gnat.xml) = b9d25f257f937f6cc2bfca1a260425f6f590a88c
-SHA1 (patch-share_gprconfig_linker.xml) = 86d52185faaf863c9f54ecccd6ec657c46c0a44a
-SHA1 (patch-share_gprconfig_targetset.xml) = 53cdc66ec377de67ca997eaef866eacb8e04b962
-SHA1 (patch-src_gpr__version.adb) = c26bd88dac3672f0701980cf8975d67a305d5a31
-SHA1 (patch-src_gprlib.adb) = 6c5f24664c4dd9d8ee56c8df5cb05155053fa116
+SHA1 (gprbuild-376670f.tar.gz) = debb30f560d3f4ffe80edd47ee06aaab179a259c
+RMD160 (gprbuild-376670f.tar.gz) = 6b38f67ed96bc5d79cb072594e92530be7cb3136
+SHA512 (gprbuild-376670f.tar.gz) = d949ac450800fef4cf48038d613775d9210bc29baf01d03c276a59fce22add56b8e3b3ee0cd9b6353998fd2dc94e835ccf4df77c8559b27cac38cb28d56f4090
+Size (gprbuild-376670f.tar.gz) = 958175 bytes
+SHA1 (patch-share_gprconfig_compilers.xml) = 6046a2930995367448682e97ac06d603d3c9277e
+SHA1 (patch-share_gprconfig_gnat.xml) = e76972e517eeae6a968be5750775a95d9448e870
+SHA1 (patch-share_gprconfig_linker.xml) = f23657bd4f52e9089b59457aa850ded017290ad4
+SHA1 (patch-share_gprconfig_targetset.xml) = 0d760784701f6c0716663cf4fc8acfdce615af76
+SHA1 (patch-src_gprlib.adb) = 663d28aab30ff5d6cd923818952a840025ec57ca
diff -r 0a0563b164d9 -r 23c13505bc35 devel/gprbuild-aux/patches/patch-Makefile.in
--- a/devel/gprbuild-aux/patches/patch-Makefile.in Fri Nov 25 18:02:03 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-$NetBSD: patch-Makefile.in,v 1.2 2014/04/30 16:28:09 marino Exp $
-
-Support DESTDIR
-
---- Makefile.in.orig 2013-03-04 17:43:09.000000000 +0000
-+++ Makefile.in
-@@ -64,7 +64,7 @@ ADA_GEN_SUBDIR=gnat
-
- .PHONY: all distall gprbuild gprconfig gprclean gprinstall \
- copy_gnat_src complete bootstrap
--all: $(xmlada_build_target) $(ADA_GEN_SUBDIR)/stamp-snames
-+all: $(xmlada_build_target)
- ${GNATMAKE} $(xmlada_prj_flags) -Pgprbuild -XBUILD=${BUILD}
-
- distall:
-@@ -124,45 +124,35 @@ bootstrap-clean:
- -XBUILD_TOOL=gprbuild
-
- install: install.data install.bin
-- -${MKDIR} ${datadir}/gpr
-- $(RM) -r ${datadir}/examples/gprbuild
-- -${MKDIR} ${datadir}/examples/gprbuild
-- ${CP} -r examples/* ${datadir}/examples/gprbuild
-- ${RM} -r ${datadir}/doc/gprbuild
-- -${MKDIR} ${datadir}/doc/gprbuild
-+ -${MKDIR} ${DESTDIR}${datadir}/gpr \
-+ ${DESTDIR}${datadir}/examples/gprbuild \
-+ ${DESTDIR}${datadir}/doc/gprbuild
-+ ${CP} -r examples/* ${DESTDIR}${datadir}/examples/gprbuild
- for format in html txt pdf info; do \
- if [ -d doc/$$format ] ; then \
-- ${MKDIR} ${datadir}/doc/gprbuild/$$format; \
-- ${CP} doc/$$format/* ${datadir}/doc/gprbuild/$$format; \
-+ ${MKDIR} ${DESTDIR}${datadir}/doc/gprbuild/$$format; \
-+ ${CP} doc/$$format/* ${DESTDIR}${datadir}/doc/gprbuild/$$format; \
- if [ $$format = html ] ; then \
-- ${CP} doc/*.png ${datadir}/doc/gprbuild/html; \
-+ ${CP} doc/*.png ${DESTDIR}${datadir}/doc/gprbuild/html; \
- sed -e "s/<doc_path>.*//" doc/gprbuild_gps.xml \
-- > ${datadir}/doc/gprbuild/html/gps_index.xml; \
-+ > ${DESTDIR}${datadir}/doc/gprbuild/html/gps_index.xml; \
- fi; \
- fi; \
- done
-
Home |
Main Index |
Thread Index |
Old Index