Attachment 153323 Details for Bug 196712 – v2 of the patchset

[patch] v2 of the patchset

patch-196712-v2 (text/plain), 6.21 KB, created by Gerald Pfeifer on 2015-02-22 17:30:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gerald Pfeifer

Created: 2015-02-22 17:30:40 UTC

Size: 6.21 KB

patch

obsolete

>Index: Mk/bsd.default-versions.mk
>===================================================================
>--- Mk/bsd.default-versions.mk	(revision 379619)
>+++ Mk/bsd.default-versions.mk	(working copy)
>@@ -20,7 +20,7 @@
> 
> APACHE_DEFAULT?=	2.4
> FPC_DEFAULT?=		2.6.4
>-GCC_DEFAULT?=		4.8
>+GCC_DEFAULT?=		4.9
> LUA_DEFAULT?=		5.2
> MYSQL_DEFAULT?=		5.6
> PERL5_DEFAULT?=		5.18
>@@ -34,6 +34,6 @@
> FIREBIRD_DEFAULT?=	2.5
> 
> # Version of lang/gcc.  Do not override!
>-LANG_GCC_IS=		4.8
>+LANG_GCC_IS=		4.9
> 
> .endif
>Index: lang/gcc/Makefile
>===================================================================
>--- lang/gcc/Makefile	(revision 379619)
>+++ lang/gcc/Makefile	(working copy)
>@@ -2,13 +2,13 @@
> # $FreeBSD$
> 
> PORTNAME=	gcc
>-PORTVERSION=	4.8.4
>+PORTVERSION=	4.9.2
> CATEGORIES=	lang java
> MASTER_SITES=	${MASTER_SITE_GCC}
> MASTER_SITE_SUBDIR=	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 +23,7 @@
> BUILD_DEPENDS+=	runtest:${PORTSDIR}/misc/dejagnu
> .endif
> 
>-CONFLICTS=	gcc48*
>+CONFLICTS=	gcc49*
> 
> # DISTVERSION relates to downloads, GCC_VERSION and SUFFIX to names
> # of executables and directories once installed.
>Index: lang/gcc/distinfo
>===================================================================
>--- lang/gcc/distinfo	(revision 379619)
>+++ lang/gcc/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (gcc-4.8.4.tar.bz2) = 4a80aa23798b8e9b5793494b8c976b39b8d9aa2e53cd5ed5534aff662a7f8695
>-SIZE (gcc-4.8.4.tar.bz2) = 86220648
>+SHA256 (gcc-4.9.2.tar.bz2) = 2020c98295856aa13fda0f2f3a4794490757fc24bcca918d52cc8b4917b972dd
>+SIZE (gcc-4.9.2.tar.bz2) = 89939747
>Index: lang/gcc/files/java-patch-hier
>===================================================================
>--- lang/gcc/files/java-patch-hier	(revision 379619)
>+++ lang/gcc/files/java-patch-hier	(working copy)
>@@ -1,13 +1,11 @@
>-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
>+--- 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)
>Index: lang/gcc/files/patch-arm-libcpp
>===================================================================
>--- lang/gcc/files/patch-arm-libcpp	(revision 379619)
>+++ lang/gcc/files/patch-arm-libcpp	(working copy)
>@@ -1,24 +0,0 @@
>-Index: libcpp/configure
>-===================================================================
>---- libcpp/configure	(revision 218760)
>-+++ libcpp/configure	(working copy)
>-@@ -7153,6 +7153,7 @@
>- 	aarch64*-*-* | \
>- 	alpha*-*-* | \
>- 	arm*-*-*eabi* | \
>-+	arm*-*-freebsd* | \
>- 	arm*-*-rtems* | \
>- 	arm*-*-symbianelf* | \
>- 	x86_64-*-* | \
>-Index: libcpp/configure.ac
>-===================================================================
>---- libcpp/configure.ac	(revision 218760)
>-+++ libcpp/configure.ac	(working copy)
>-@@ -185,6 +185,7 @@
>- 	aarch64*-*-* | \
>- 	alpha*-*-* | \
>- 	arm*-*-*eabi* | \
>-+	arm*-*-freebsd* | \
>- 	arm*-*-rtems* | \
>- 	arm*-*-symbianelf* | \
>- 	x86_64-*-* | \
>Index: lang/gcc/files/patch-pr63740-arm
>===================================================================
>--- lang/gcc/files/patch-pr63740-arm	(revision 0)
>+++ lang/gcc/files/patch-pr63740-arm	(working copy)
>@@ -0,0 +1,14 @@
>+--- gcc/lra-lives.c	2014/06/16 09:25:26	211700
>++++ gcc/lra-lives.c	2014/06/16 09:58:34	211701
>+@@ -558,7 +558,11 @@
>+ 	      /* It might be 'inheritance pseudo <- reload pseudo'.  */
>+ 	      || (src_regno >= lra_constraint_new_regno_start
>+ 		  && ((int) REGNO (SET_DEST (set))
>+-		      >= lra_constraint_new_regno_start))))
>++		      >= lra_constraint_new_regno_start)
>++		  /* Remember to skip special cases where src/dest regnos are
>++		     the same, e.g. insn SET pattern has matching constraints
>++		     like =r,0.  */
>++		  && src_regno != (int) REGNO (SET_DEST (set)))))
>+ 	{
>+ 	  int hard_regno = -1, regno = -1;
>
>Property changes on: lang/gcc/files/patch-pr63740-arm
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: lang/gcc/pkg-descr
>===================================================================
>--- lang/gcc/pkg-descr	(revision 379619)
>+++ lang/gcc/pkg-descr	(working copy)
>@@ -1,11 +1,11 @@
> 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
>+It can be used interchangibly with the lang/gcc49 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.
>+lang/gcc5 and later over time.
> 
> WWW: http://gcc.gnu.org/
> 
>Index: lang/gcc/pkg-plist
>===================================================================
>--- lang/gcc/pkg-plist	(revision 379619)
>+++ lang/gcc/pkg-plist	(working copy)
>@@ -47,7 +47,7 @@
> %%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

Actions: View | Diff

Attachments on bug 196712: 151613 | 153323 | 155325 | 155352 | 162416 | 176402