pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/lang
Module Name: pkgsrc
Committed By: adam
Date: Sat Jan 5 00:39:13 UTC 2019
Modified Files:
pkgsrc/lang/gcc7: Makefile distinfo options.mk version.mk
pkgsrc/lang/gcc7-libs: Makefile buildlink3.mk
pkgsrc/lang/gcc7/patches: patch-libstdc++-v3_libsupc++_new__opa.cc
Log Message:
gcc7[-libs]: updated to 7.4.0
7.4.0:
Bug-fix release.
This [https://gcc.gnu.org/bugzilla/buglist.cgi?bug_status=RESOLVED&resolution=FIXED&target_milestone=7.4] is the list of problem reports (PRs) from GCC's bug tracking system that are known to be
fixed in the 7.4 release. This list might not be complete (that is, it is possible that some PRs that have been fixed are not listed here).
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/lang/gcc7/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/lang/gcc7/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/gcc7/options.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/gcc7/version.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/gcc7-libs/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/gcc7-libs/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 \
pkgsrc/lang/gcc7/patches/patch-libstdc++-v3_libsupc++_new__opa.cc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/lang/gcc7/Makefile
diff -u pkgsrc/lang/gcc7/Makefile:1.21 pkgsrc/lang/gcc7/Makefile:1.22
--- pkgsrc/lang/gcc7/Makefile:1.21 Sat Nov 10 04:24:00 2018
+++ pkgsrc/lang/gcc7/Makefile Sat Jan 5 00:39:13 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2018/11/10 04:24:00 mrg Exp $
+# $NetBSD: Makefile,v 1.22 2019/01/05 00:39:13 adam Exp $
GCC_PKGNAME= gcc7
.include "version.mk"
@@ -8,7 +8,6 @@ PKGNAME= ${GCC_PKGNAME}-${GCC7_DIST_VERS
## When bumping the PKGREVISION of this package the PKGREVISION of
## lang/gcc7-libs needs to be bump to be at least 1 more than the
## PKGREVISION of this package!
-PKGREVISION= 4
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC7_DIST_VERSION}/}
EXTRACT_SUFX= .tar.xz
@@ -20,12 +19,11 @@ COMMENT= The GNU Compiler Collection (GC
LICENSE= gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3
DISTFILES= ${DEFAULT_DISTFILES}
-EXTRACT_ONLY= ${DEFAULT_DISTFILES}
NOT_FOR_PLATFORM= Interix-*-*
USE_LANGUAGES= c c++
-USE_TOOLS+= gmake makeinfo sed:run tar:build
+USE_TOOLS+= gmake makeinfo perl sed:run tar:build
USE_TOOLS.NetBSD+= gsed
GNU_CONFIGURE= yes
@@ -78,14 +76,6 @@ SUBST_SED.fixinc= -e "s,\./fixinc.sh,-c
.include "options.mk"
-## For graphite support.
-.if !empty(PKG_OPTIONS:Mgcc-graphite)
-
-post-extract:
- ${TAR} -jxf ${DISTDIR}/${ISL16}.tar.bz2 -C ${WRKSRC}
- ${MV} ${WRKSRC}/${ISL16} ${WRKSRC}/isl
-.endif
-
.if !empty(MACHINE_PLATFORM:MNetBSD-*-*)
# native SSP conflicts with gcc's libssp
CONFIGURE_ARGS+= --disable-libssp
@@ -136,7 +126,6 @@ CONFIGURE_ARGS+= --with-arch=nocona --wi
CONFIGURE_ARGS+= --with-dwarf2
.endif
-
# ${WRKSRC}/fixincludes/ looks for sed and compiles the path to sed into
# a binary so we need to make sure we give it the installed sed and not
# the tool wrapped one.
@@ -175,14 +164,16 @@ pre-configure:
${RUN} cd ${WRKSRC} && ${MKDIR} ${OBJDIR}
TEST_TARGET= -k check || ${TRUE}
+
pre-test:
${RUN} \
if runtest --version >/dev/null 2>/dev/null ; then \
: ; \
else \
- ${ECHO} "ERROR: Please install devel/dejagnu in order to run the test suite." ; \
- exit 1 ; \
+ ${ECHO} "ERROR: Please install devel/dejagnu in order to run the test suite."; \
+ exit 1; \
fi
+
post-test:
${RUN} cd ${WRKSRC} && cd ${OBJDIR} && \
${SHELL} ${WRKSRC}/contrib/test_summary >${WRKDIR}/test_summary.log
@@ -197,8 +188,8 @@ post-install:
.endif
GENERATE_PLIST+= \
- cd ${DESTDIR}${PREFIX} && \
- ${FIND} ${GCC_SUBPREFIX} \( -type f -o -type l \) -print | ${SORT} ;
+ cd ${DESTDIR}${PREFIX} && \
+ ${FIND} ${GCC_SUBPREFIX} \( -type f -o -type l \) -print | ${SORT};
.include "../../mk/dlopen.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
Index: pkgsrc/lang/gcc7/distinfo
diff -u pkgsrc/lang/gcc7/distinfo:1.13 pkgsrc/lang/gcc7/distinfo:1.14
--- pkgsrc/lang/gcc7/distinfo:1.13 Sat Nov 10 04:24:00 2018
+++ pkgsrc/lang/gcc7/distinfo Sat Jan 5 00:39:13 2019
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.13 2018/11/10 04:24:00 mrg Exp $
+$NetBSD: distinfo,v 1.14 2019/01/05 00:39:13 adam Exp $
-SHA1 (gcc-7.3.0.tar.xz) = 9689b9cae7b2886fdaa08449a26701f095c04e48
-RMD160 (gcc-7.3.0.tar.xz) = 31f6934a0e0c0ca84b6668110f9afdb91c1f9023
-SHA512 (gcc-7.3.0.tar.xz) = ad41a7e4584e40e92cdf860bc0288500fbaf5dfb7e8c3fcabe9eba809c87bcfa85b46c19c19921b0cdf6d05483faede8287bb9ea120c0d1559449a70e602c8d4
-Size (gcc-7.3.0.tar.xz) = 62462388 bytes
-SHA1 (isl-0.16.1.tar.bz2) = c5a2b201bf05229647e73203c0bf2d9679d4d21f
-RMD160 (isl-0.16.1.tar.bz2) = 5a99db3fe0d0a1f6bbac1ed4448f2403495c55b2
-SHA512 (isl-0.16.1.tar.bz2) = c188667a84dc5bdddb4ab7c35f89c91bf15a8171f4fcaf41301cf285fb7328846d9a367c096012fec4cc69d244f0bc9e95d84c09ec097394cd4093076f2a041b
-Size (isl-0.16.1.tar.bz2) = 1626446 bytes
+SHA1 (gcc-7.4.0.tar.xz) = bf09553cfa08ae6e29dfbbd541e5c69c3cbc6c66
+RMD160 (gcc-7.4.0.tar.xz) = 77d3cdafe7df748fa484a300e9513acb3ee2c2e1
+SHA512 (gcc-7.4.0.tar.xz) = 8864d8e4b97c2e1a4f17422f6e68120172ebefeab97b1757734f7185ca68a6b9a89011c6833c03fa454c17b0ac35b15e1d284881e6971035948ac6100f3aa45e
+Size (gcc-7.4.0.tar.xz) = 62601888 bytes
+SHA1 (isl-0.18.tar.bz2) = bbffc5a2b05e4f0c97e882f96c448504491dc4ed
+RMD160 (isl-0.18.tar.bz2) = e876f1049893de5be4a82a63f272f62547d455ca
+SHA512 (isl-0.18.tar.bz2) = 85d0b40f4dbf14cb99d17aa07048cdcab2dc3eb527d2fbb1e84c41b2de5f351025370e57448b63b2b8a8cf8a0843a089c3263f9baee1542d5c2e1cb37ed39d94
+Size (isl-0.18.tar.bz2) = 1658291 bytes
SHA1 (patch-contrib_download__prerequisites) = 86c6c16e0e3e3a0bcb38579a8b4004f603fac1ca
SHA1 (patch-gcc_Makefile.in) = d96a57a098e49a2c5ea6478dd5d22aba584fc1bc
SHA1 (patch-gcc_common_config_arm_arm-common.c) = 7c973cb9554a52f4b85f8fc98708f5e5cce8e8bd
@@ -49,5 +49,5 @@ SHA1 (patch-libsanitizer_configure.tgt)
SHA1 (patch-libstdc++-v3_config_os_bsd_netbsd_ctype__base.h) = 014d442c885b9c51d1a4af05205279c274a9559d
SHA1 (patch-libstdc++-v3_config_os_bsd_netbsd_ctype__configure__char.cc) = 06bba6da02344f76c26eed765a7cb022c035994e
SHA1 (patch-libstdc++-v3_config_os_bsd_netbsd_ctype__inline.h) = 626fc1f9c035ac5cef30a92d525af4e778835ebf
-SHA1 (patch-libstdc++-v3_libsupc++_new__opa.cc) = c23679d5bd18ba82c578eb2909a8055bf37c34cd
+SHA1 (patch-libstdc++-v3_libsupc++_new__opa.cc) = b3897aa6d6d7208c524ebab35998e27663dfb4e8
SHA1 (patch-libstdc++-v3_libsupc++_unwind-cxx.h) = 9784bfa4323f8498b36565d0fea28fce69ffdbb1
Index: pkgsrc/lang/gcc7/options.mk
diff -u pkgsrc/lang/gcc7/options.mk:1.3 pkgsrc/lang/gcc7/options.mk:1.4
--- pkgsrc/lang/gcc7/options.mk:1.3 Wed May 2 18:38:30 2018
+++ pkgsrc/lang/gcc7/options.mk Sat Jan 5 00:39:13 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2018/05/02 18:38:30 minskim Exp $
+# $NetBSD: options.mk,v 1.4 2019/01/05 00:39:13 adam Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.${GCC_PKGNAME}
PKG_SUPPORTED_OPTIONS= nls gcc-inplace-math gcc-c++ gcc-fortran \
@@ -6,15 +6,8 @@ PKG_SUPPORTED_OPTIONS= nls gcc-inplace-m
PKG_SUGGESTED_OPTIONS= gcc-c++ gcc-fortran gcc-objc gcc-objc++ \
gcc-graphite gcc-inplace-math
-.if ${OPSYS} == "NetBSD"
+.if ${OPSYS} == "NetBSD" || ${OPSYS} == "Linux" || ${OPSYS} == "DragonFly" || ${OPSYS} == "Darwin"
PKG_SUGGESTED_OPTIONS+= nls
-.elif ${OPSYS} == "Linux"
-PKG_SUGGESTED_OPTIONS+= nls
-.elif ${OPSYS} == "DragonFly"
-PKG_SUGGESTED_OPTIONS+= nls
-.elif ${OPSYS} == "SunOS"
-PKG_SUGGESTED_OPTIONS+= gcc-inplace-math
-.else
.endif
###
@@ -86,10 +79,11 @@ LIBS.SunOS+= -lgmp
### Graphite Support
###
.if !empty(PKG_OPTIONS:Mgcc-graphite)
-ISL16 = isl-0.16.1
-SITES.${ISL16}.tar.bz2 = ftp://ftp.fu-berlin.de/unix/languages/gcc/infrastructure/
-#SITES.${ISL16}.tar.bz2 = ${MASTER_SITE_GNU:=gcc/infrastructure/}
-DISTFILES += ${ISL16}.tar.bz2
+ISL= isl-0.18
+DISTFILES+= ${ISL}.tar.bz2
+SITES.${ISL}.tar.bz2= ftp://ftp.fu-berlin.de/unix/languages/gcc/infrastructure/
+post-extract:
+ ${LN} -f -s ${WRKDIR}/${ISL} ${WRKSRC}/isl
.endif
###
@@ -97,7 +91,6 @@ DISTFILES += ${ISL16}.tar.bz2
### Ada could be added although there is a bootstrapping issue. See
### ../gcc34-ada for guidance
###
-
.if !empty(PKG_OPTIONS:Mgcc-objc++)
. if empty(PKG_OPTIONS:Mgcc-c++)
PKG_OPTIONS+= gcc-c++
@@ -122,7 +115,6 @@ LANGS+= fortran
.if !empty(PKG_OPTIONS:Mgcc-c++)
LANGS+= c++
-USE_TOOLS+= perl
CONFIGURE_ARGS+= --enable-__cxa_atexit
CONFIGURE_ARGS+= --with-gxx-include-dir=${GCC_PREFIX}/include/c++/
.else
Index: pkgsrc/lang/gcc7/version.mk
diff -u pkgsrc/lang/gcc7/version.mk:1.4 pkgsrc/lang/gcc7/version.mk:1.5
--- pkgsrc/lang/gcc7/version.mk:1.4 Thu Jan 25 23:27:30 2018
+++ pkgsrc/lang/gcc7/version.mk Sat Jan 5 00:39:13 2019
@@ -1,2 +1,2 @@
-# $NetBSD: version.mk,v 1.4 2018/01/25 23:27:30 maya Exp $
-GCC7_DIST_VERSION:=7.3.0
+# $NetBSD: version.mk,v 1.5 2019/01/05 00:39:13 adam Exp $
+GCC7_DIST_VERSION:= 7.4.0
Index: pkgsrc/lang/gcc7-libs/Makefile
diff -u pkgsrc/lang/gcc7-libs/Makefile:1.3 pkgsrc/lang/gcc7-libs/Makefile:1.4
--- pkgsrc/lang/gcc7-libs/Makefile:1.3 Wed Jul 18 22:55:08 2018
+++ pkgsrc/lang/gcc7-libs/Makefile Sat Jan 5 00:39:13 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2018/07/18 22:55:08 maya Exp $
+# $NetBSD: Makefile,v 1.4 2019/01/05 00:39:13 adam Exp $
GCC_PKGNAME= gcc7
.include "../../lang/${GCC_PKGNAME}/version.mk"
@@ -8,8 +8,8 @@ PKGNAME= ${GCC_PKGNAME}-libs-${GCC7_DIST
## The PKGREVISION of this package needs to be at least 1 more than the
## PKGREVISION of the lang/gcc7 package so that with the dependence pattern
-## '{gcc7,gcc7-libs}>=7.3.*' pkg_add will choose gcc7-libs over gcc7.
-PKGREVISION= 4
+## '{gcc7,gcc7-libs}>=7.4.*' pkg_add will choose gcc7-libs over gcc7.
+PKGREVISION= 1
CATEGORIES= lang
MASTER_SITES= # empty
@@ -43,16 +43,16 @@ SHLIB_EXT= so
LIBRARY_FILES= ${WRKDIR}/lib_files
-GENERATE_PLIST+= ${SED} -e 's,^,${LIBGCC_SUBPREFIX}/${GCC_TARGET_MACHINE}/,' \
+GENERATE_PLIST+= ${SED} -e 's,^,${LIBGCC_SUBPREFIX}/${GCC_TARGET_MACHINE}/,' \
${LIBRARY_FILES};
-GENERATE_PLIST+= ${GREP} -q 'lib/' ${LIBRARY_FILES} || \
- ${ECHO} '@pkgdir ${LIBGCC_SUBPREFIX}/${GCC_TARGET_MACHINE}/lib' ;
+GENERATE_PLIST+= ${GREP} -q 'lib/' ${LIBRARY_FILES} || \
+ ${ECHO} '@pkgdir ${LIBGCC_SUBPREFIX}/${GCC_TARGET_MACHINE}/lib';
${LIBRARY_FILES}:
- ${PKG_INFO} -qL '${GCC_PKGNAME}-${GCC7_DIST_VERSION}*' | \
+ ${PKG_INFO} -qL '${GCC_PKGNAME}-${GCC7_DIST_VERSION}*' | \
${SED} -n -e's,^${LIBGCC_PREFIX}/,,' -e'/libexec\//d' \
-e'/libgij/d;/libgcj/d;/libjvm/d' \
- -e'/lib.*\.${SHLIB_EXT}/p' >${LIBRARY_FILES}
+ -e'/lib.*\.${SHLIB_EXT}/p' >${LIBRARY_FILES}
do-install: ${LIBRARY_FILES}
${TEST} -d ${DESTDIR}${LIBGCC_PREFIX}/${GCC_TARGET_MACHINE}/lib || \
Index: pkgsrc/lang/gcc7-libs/buildlink3.mk
diff -u pkgsrc/lang/gcc7-libs/buildlink3.mk:1.1 pkgsrc/lang/gcc7-libs/buildlink3.mk:1.2
--- pkgsrc/lang/gcc7-libs/buildlink3.mk:1.1 Mon May 21 10:05:58 2018
+++ pkgsrc/lang/gcc7-libs/buildlink3.mk Sat Jan 5 00:39:13 2019
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2018/05/21 10:05:58 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2019/01/05 00:39:13 adam Exp $
BUILDLINK_TREE+= gcc7-libs
@@ -6,9 +6,9 @@ BUILDLINK_TREE+= gcc7-libs
GCC7_LIBS_BUILDLINK3_MK:=
.if !empty(USE_PKGSRC_GCC_RUNTIME:M[Yy][Ee][Ss])
-BUILDLINK_API_DEPENDS.gcc7-libs+= gcc7-libs>=7.3.0
+BUILDLINK_API_DEPENDS.gcc7-libs+= gcc7-libs>=7.4.0
.else
-BUILDLINK_API_DEPENDS.gcc7-libs+= {gcc7,gcc7-libs}>=7.3.0
+BUILDLINK_API_DEPENDS.gcc7-libs+= {gcc7,gcc7-libs}>=7.4.0
.endif
BUILDLINK_PKGSRCDIR.gcc7-libs= ../../lang/gcc7-libs
BUILDLINK_DEPMETHOD.gcc7-libs?= full
Index: pkgsrc/lang/gcc7/patches/patch-libstdc++-v3_libsupc++_new__opa.cc
diff -u pkgsrc/lang/gcc7/patches/patch-libstdc++-v3_libsupc++_new__opa.cc:1.2 pkgsrc/lang/gcc7/patches/patch-libstdc++-v3_libsupc++_new__opa.cc:1.3
--- pkgsrc/lang/gcc7/patches/patch-libstdc++-v3_libsupc++_new__opa.cc:1.2 Fri May 12 18:10:56 2017
+++ pkgsrc/lang/gcc7/patches/patch-libstdc++-v3_libsupc++_new__opa.cc Sat Jan 5 00:39:13 2019
@@ -1,10 +1,10 @@
-$NetBSD: patch-libstdc++-v3_libsupc++_new__opa.cc,v 1.2 2017/05/12 18:10:56 jperkin Exp $
+$NetBSD: patch-libstdc++-v3_libsupc++_new__opa.cc,v 1.3 2019/01/05 00:39:13 adam Exp $
Ensure we can find SunOS std::aligned_alloc if using it.
---- libstdc++-v3/libsupc++/new_opa.cc.orig 2017-01-26 14:30:45.000000000 +0000
+--- libstdc++-v3/libsupc++/new_opa.cc.orig 2019-01-04 10:50:16.000000000 +0000
+++ libstdc++-v3/libsupc++/new_opa.cc
-@@ -31,6 +31,10 @@
+@@ -42,6 +42,10 @@ extern "C" void *memalign(std::size_t bo
using std::new_handler;
using std::bad_alloc;
@@ -12,6 +12,6 @@ Ensure we can find SunOS std::aligned_al
+using std::aligned_alloc;
+#endif
+
- #if !_GLIBCXX_HAVE_ALIGNED_ALLOC
- #if _GLIBCXX_HAVE__ALIGNED_MALLOC
- #define aligned_alloc(al,sz) _aligned_malloc(sz,al)
+ namespace __gnu_cxx {
+ #if _GLIBCXX_HAVE_ALIGNED_ALLOC
+ using ::aligned_alloc;
Home |
Main Index |
Thread Index |
Old Index