Date: Sun, 20 Nov 2016 09:15:19 +0000 (UTC) From: Gerald Pfeifer <gerald@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r426565 - in head: Mk lang/gcc lang/gcc/files Message-ID: <201611200915.uAK9FJp9069796@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gerald Date: Sun Nov 20 09:15:19 2016 New Revision: 426565 URL: https://svnweb.freebsd.org/changeset/ports/426565 Log: Long awaited, finally update the default version of GCC in the Ports Collection as well as the lang/gcc port from GCC 4.8.5 to GCC 4.9.4! See http://gcc.gnu.org/gcc-4.9/changes.html for an extensive list of changes and http://gcc.gnu.org/gcc-4.9/porting_to.html for information on how to port to that new version (if necessary). files/java-patch-hier required adjustments, gcc/files/patch-arm-libcpp is not needed any longer (merged upstream), and we're also loosing the local Stack Protector patches/backports. PR: 196712 Tested by: antoine (-exp runs) Supported by: antoine, kwm, and others Added: head/lang/gcc/files/patch-x86-64-fix-m16 (contents, props changed) Deleted: head/lang/gcc/files/patch-arm-libcpp head/lang/gcc/files/patch-stackprotector-gcc head/lang/gcc/files/patch-stackprotector-gcc_c-family head/lang/gcc/files/patch-stackprotector-gcc_doc head/lang/gcc/files/patch-stackprotector-gcc_testsuite Modified: head/Mk/bsd.default-versions.mk head/lang/gcc/Makefile head/lang/gcc/distinfo head/lang/gcc/files/java-patch-hier head/lang/gcc/pkg-descr head/lang/gcc/pkg-plist Modified: head/Mk/bsd.default-versions.mk ============================================================================== --- head/Mk/bsd.default-versions.mk Sun Nov 20 09:00:21 2016 (r426564) +++ head/Mk/bsd.default-versions.mk Sun Nov 20 09:15:19 2016 (r426565) @@ -38,7 +38,7 @@ FIREBIRD_DEFAULT?= 2.5 # Possible values: 3.0.0 FPC_DEFAULT?= 3.0.0 # Possible values: 4.6, 4.7, 4.8, 4.9, 5 -GCC_DEFAULT?= 4.8 +GCC_DEFAULT?= 4.9 # Possible values: 7, 8, 9, agpl GHOSTSCRIPT_DEFAULT?= agpl # Possible values: f10, c6, c6_64, c7, c7_64 @@ -134,6 +134,6 @@ TCLTK_DEFAULT?= 8.6 VARNISH_DEFAULT?= 4 # Version of lang/gcc. Do not override! -LANG_GCC_IS= 4.8 +LANG_GCC_IS= 4.9 .endif Modified: head/lang/gcc/Makefile ============================================================================== --- head/lang/gcc/Makefile Sun Nov 20 09:00:21 2016 (r426564) +++ head/lang/gcc/Makefile Sun Nov 20 09:15:19 2016 (r426565) @@ -2,13 +2,12 @@ # $FreeBSD$ PORTNAME= gcc -PORTVERSION= 4.8.5 -PORTREVISION= 2 +PORTVERSION= 4.9.4 CATEGORIES= lang java MASTER_SITES= GCC/releases/gcc-${DISTVERSION} MAINTAINER= gerald@FreeBSD.org -COMMENT= GNU Compiler Collection 4.8 +COMMENT= GNU Compiler Collection 4.9 LICENSE= GPLv3 GPLv3RLE LICENSE_COMB= multi @@ -23,7 +22,7 @@ RUN_DEPENDS+= ${LOCALBASE}/bin/as:devel/ BUILD_DEPENDS+= runtest:misc/dejagnu .endif -CONFLICTS= gcc48* +CONFLICTS= gcc49* CPE_VENDOR= gnu # DISTVERSION relates to downloads, GCC_VERSION and SUFFIX to names @@ -40,6 +39,7 @@ SSP_UNSAFE= yes OPTIONS_DEFINE= BOOTSTRAP OPTIONS_DEFINE_i386= JAVA OPTIONS_DEFINE_amd64= JAVA +OPTIONS_DEFINE_powerpc64= JAVA OPTIONS_DEFAULT_i386= JAVA OPTIONS_DEFAULT_amd64= JAVA OPTIONS_DEFAULT_powerpc64= BOOTSTRAP Modified: head/lang/gcc/distinfo ============================================================================== --- head/lang/gcc/distinfo Sun Nov 20 09:00:21 2016 (r426564) +++ head/lang/gcc/distinfo Sun Nov 20 09:15:19 2016 (r426565) @@ -1,3 +1,3 @@ -TIMESTAMP = 1471124229 -SHA256 (gcc-4.8.5.tar.bz2) = 22fb1e7e0f68a63cee631d85b20461d1ea6bda162f03096350e38c8d427ecf23 -SIZE (gcc-4.8.5.tar.bz2) = 86165587 +TIMESTAMP = 1478034530 +SHA256 (gcc-4.9.4.tar.bz2) = 6c11d292cd01b294f9f84c9a59c230d80e9e4a47e5c6355f046bb36d4f358092 +SIZE (gcc-4.9.4.tar.bz2) = 90097606 Modified: head/lang/gcc/files/java-patch-hier ============================================================================== --- head/lang/gcc/files/java-patch-hier Sun Nov 20 09:00:21 2016 (r426564) +++ head/lang/gcc/files/java-patch-hier Sun Nov 20 09:15:19 2016 (r426565) @@ -1,13 +1,12 @@ -Index: libjava/Makefile.in -=================================================================== ---- libjava/Makefile.in (revision 117734) -+++ libjava/Makefile.in (working copy) -@@ -712,7 +712,7 @@ - $(am__append_2) $(am__append_3) - toolexecmainlib_DATA = libgcj.spec +--- UTC +--- libjava/Makefile.in 2013-05-26 22:33:07.000000000 +0000 ++++ libjava/Makefile.in 2013-05-31 21:19:23.000000000 +0000 +@@ -941,7 +941,7 @@ + @BUILD_SUBLIBS_FALSE@LIBJAVA_CORE_EXTRA = + @BUILD_SUBLIBS_TRUE@LIBJAVA_CORE_EXTRA = @LIBGCJ_SUBLIB_CORE_EXTRA_DEPS@ dbexec_LTLIBRARIES = libjvm.la --pkgconfigdir = $(libdir)/pkgconfig +-pkgconfigdir = $(toolexeclibdir)/pkgconfig +pkgconfigdir = $(prefix)/libdata/pkgconfig jardir = $(datadir)/java - jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar - @JAVA_HOME_SET_FALSE@JAVA_HOME_DIR = $(prefix) + jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar \ + $(am__append_5) Added: head/lang/gcc/files/patch-x86-64-fix-m16 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/gcc/files/patch-x86-64-fix-m16 Sun Nov 20 09:15:19 2016 (r426565) @@ -0,0 +1,25 @@ +At the moment the -m16 option only passes the "--32" parameter to the +assembler on glibc OSes, while on other OSes the assembler is called +without any specific flag. This is wrong and causes the assembler to +fail. Fix it by adding support for the -m16 option to x86-64.h. + +2016-07-06 Roger Pau Monné <roger.pau@citrix.com> + + * x86-64.h: append --32 to the assembler options when -m16 is used + even on non-glibc OSes. + +This should be backported to all stable branches up to 4.9 (when -m16 was +introduced). + +--- UTC +--- gcc/config/i386/x86-64.h ++++ gcc/config/i386/x86-64.h +@@ -49,7 +49,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + #define WCHAR_TYPE_SIZE 32 + + #undef ASM_SPEC +-#define ASM_SPEC "%{m32:--32} %{m64:--64} %{mx32:--x32}" ++#define ASM_SPEC "%{m16|m32:--32} %{m64:--64} %{mx32:--x32}" + + #undef ASM_OUTPUT_ALIGNED_BSS + #define ASM_OUTPUT_ALIGNED_BSS(FILE, DECL, NAME, SIZE, ALIGN) \ Modified: head/lang/gcc/pkg-descr ============================================================================== --- head/lang/gcc/pkg-descr Sun Nov 20 09:00:21 2016 (r426564) +++ head/lang/gcc/pkg-descr Sun Nov 20 09:15:19 2016 (r426565) @@ -1,11 +1,9 @@ GCC, the GNU Compiler Collection, supports a number of languages. This -port installs the C, C++, Fortran and Java front ends as gcc48, g++48, -gfortran48, and gcj48, respectively. +port installs the C, C++, Fortran and Java front ends as gcc49, g++49, +gfortran49, and gcj49, respectively. -It can be used interchangibly with the lang/gcc48 port which tracks -weekly upstream snapshots whereas this port will be updated less -frequently, mostly in sync with upstream releases, and will move to -lang/gcc49 and later over time. +It can be used interchangibly with the lang/gcc49 port, which tracks +GCC 4.9 releases, and will move to lang/gcc5 and later over time. WWW: http://gcc.gnu.org/ Modified: head/lang/gcc/pkg-plist ============================================================================== --- head/lang/gcc/pkg-plist Sun Nov 20 09:00:21 2016 (r426564) +++ head/lang/gcc/pkg-plist Sun Nov 20 09:15:19 2016 (r426565) @@ -50,7 +50,7 @@ share/gcc-%%GCC_VERSION%%/python/libstdc %%JAVA%%bin/gtnameserv%%SUFFIX%% %%JAVA%%bin/jcf-dump%%SUFFIX%% %%JAVA%%bin/jv-convert%%SUFFIX%% -%%JAVA%%libdata/pkgconfig/libgcj-4.8.pc +%%JAVA%%libdata/pkgconfig/libgcj-4.9.pc %%JAVA%%man/man1/aot-compile%%SUFFIX%%.1.gz %%JAVA%%man/man1/gappletviewer%%SUFFIX%%.1.gz %%JAVA%%man/man1/gc-analyze%%SUFFIX%%.1.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611200915.uAK9FJp9069796>