Skip to content

Commit

Permalink
Long awaited, finally update the default version of GCC in the Ports
Browse files Browse the repository at this point in the history
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
  • Loading branch information
gerald authored and gerald committed Nov 20, 2016
1 parent d60178e commit 402295d
Show file tree
Hide file tree
Showing 12 changed files with 48 additions and 433 deletions.
4 changes: 2 additions & 2 deletions Mk/bsd.default-versions.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
8 changes: 4 additions & 4 deletions lang/gcc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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= [email protected]
COMMENT= GNU Compiler Collection 4.8
COMMENT= GNU Compiler Collection 4.9

LICENSE= GPLv3 GPLv3RLE
LICENSE_COMB= multi
Expand All @@ -23,7 +22,7 @@ RUN_DEPENDS+= ${LOCALBASE}/bin/as:devel/binutils
BUILD_DEPENDS+= runtest:misc/dejagnu
.endif

CONFLICTS= gcc48*
CONFLICTS= gcc49*
CPE_VENDOR= gnu

# DISTVERSION relates to downloads, GCC_VERSION and SUFFIX to names
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions lang/gcc/distinfo
Original file line number Diff line number Diff line change
@@ -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
19 changes: 9 additions & 10 deletions lang/gcc/files/java-patch-hier
Original file line number Diff line number Diff line change
@@ -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)
24 changes: 0 additions & 24 deletions lang/gcc/files/patch-arm-libcpp

This file was deleted.

157 changes: 0 additions & 157 deletions lang/gcc/files/patch-stackprotector-gcc

This file was deleted.

11 changes: 0 additions & 11 deletions lang/gcc/files/patch-stackprotector-gcc_c-family

This file was deleted.

39 changes: 0 additions & 39 deletions lang/gcc/files/patch-stackprotector-gcc_doc

This file was deleted.

Loading

0 comments on commit 402295d

Please sign in to comment.