pkgsrc-Bugs archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Re: pkg/47252: upgrade pkgsrc/lang/gcc47 to 4.7.2
Updated cvs diff attached including reset of PKGREVISION and a proposed
hacks.mk added to resolve a bug with building gcc-go on solaris.
I will respond in another post about the anomalies found so far in
gcc47-libs...
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/lang/gcc47/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile 20 Nov 2012 23:13:11 -0000 1.11
+++ Makefile 30 Nov 2012 07:04:50 -0000
@@ -8,7 +8,7 @@ PKGNAME= ${GCC_PKGNAME}-${GCC_DIST_VERS
## When bumping the PKGREVISION of this package the PKGREVISION of
## lang/gcc47-libs needs to be bump to be at least 1 more than the
## PKGREVISION of this package!
-PKGREVISION= 6
+PKGREVISION=
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC_DIST_VERSION}/}
EXTRACT_SUFX= .tar.bz2
@@ -87,15 +87,9 @@ CONFIGURE_ARGS+= --without-gnu-ld --with
. else
CONFIGURE_ARGS+= --without-gnu-ld --with-ld=/usr/ccs/bin/ld
. endif
-. if exists(/usr/sfw/bin/gas)
-CONFIGURE_ARGS+= --with-gnu-as --with-as=/usr/sfw/bin/gas
-. elif exists(/usr/ccs/bin/as)
-CONFIGURE_ARGS+= --without-gnu-as --with-as=/usr/ccs/bin/as
-. else
BUILDLINK_DEPMETHOD.binutils= full
. include "../../devel/binutils/buildlink3.mk"
CONFIGURE_ARGS+= --with-gnu-as --with-as=${PREFIX}/bin/gas
-. endif
.endif
pre-configure:
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/lang/gcc47/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo 16 Nov 2012 01:03:54 -0000 1.11
+++ distinfo 30 Nov 2012 07:04:50 -0000
@@ -3,9 +3,9 @@ $NetBSD: distinfo,v 1.11 2012/11/16 01:0
SHA1 (ecj-4.5.jar) = 58c1d79c64c8cd718550f32a932ccfde8d1e6449
RMD160 (ecj-4.5.jar) = d3f4da657f086b6423f74e93f001132f4855368a
Size (ecj-4.5.jar) = 1470676 bytes
-SHA1 (gcc-4.7.0.tar.bz2) = 03b8241477a9f8a34f6efe7273d92b9b6dd9fe82
-RMD160 (gcc-4.7.0.tar.bz2) = 4ed660b281cdb9bcf98f5c2cf2da105c71db5be4
-Size (gcc-4.7.0.tar.bz2) = 82518546 bytes
+SHA1 (gcc-4.7.2.tar.bz2) = a464ba0f26eef24c29bcd1e7489421117fb9ee35
+RMD160 (gcc-4.7.2.tar.bz2) = fc281ade14b47d2a9c2ced4f7082c74bfbae31c1
+Size (gcc-4.7.2.tar.bz2) = 82884636 bytes
SHA1 (patch-configure) = 51c0978c60baddd90ef7e512445fdef913c04e6c
SHA1 (patch-gcc_Makefile.in) = 1cf954d214a1d4a3fd4fece1f577f11b511e20ed
SHA1 (patch-gcc_config.gcc) = efa4ecabd71bdec14d5dd1f8bb836116c7a9d6e9
@@ -24,7 +24,7 @@ SHA1 (patch-libgcc_config_i386_dragonfly
SHA1 (patch-libgcc_crtstuff.c) = 88500ea895cd683608f8f2b7177149f11947e3b4
SHA1 (patch-libgcc_unwind-dw2-fde-dip.c) =
2a0b8c6d2f86d985506578b4e74947d3fb1766a5
SHA1 (patch-libgfortran_configure) = b3bbc7d9201073a1bed0b7e10141465bab52c8be
-SHA1 (patch-libgo_Makefile.in) = c06e3f0deb9f906d2c158262cffdc3fb7af95602
+SHA1 (patch-libgo_Makefile.in) = 612987541f745c7be6835ce7fb7119884db294c3
SHA1 (patch-libjava_boehm.cc) = b18bc9d410a62543583c77e011f50b86f41ca18a
SHA1 (patch-libjava_configure) = 48ea2baffe87e09dda8133d286bd9b1bfe4c3f8a
SHA1 (patch-libjava_contrib_rebuild-gcj-db.in) =
bb01d738fc7db05046ae37e8ade32574de1d8297
@@ -34,6 +34,5 @@ SHA1 (patch-libstdc++-v3_config_os_bsd_d
SHA1 (patch-libstdc++-v3_config_os_bsd_dragonfly_ctype__configure__char.cc) =
d5649f42b61ff3c27d60e813cc844b820525aee4
SHA1 (patch-libstdc++-v3_config_os_bsd_dragonfly_ctype__inline.h) =
fecd20146d8e0bdebb073c8d64886e36293416fd
SHA1 (patch-libstdc++-v3_config_os_bsd_dragonfly_os__defines.h) =
9a45ecb4309c50ca90008b2fc7d3b44d002698b4
-SHA1 (patch-libstdc++-v3_config_os_bsd_netbsd_ctype__base.h) =
94879703659b960c7b61122b4b4173e01cec1afc
SHA1 (patch-libstdc++-v3_configure) = 4846c93afac42e4fdd20141234d601517cab7175
SHA1 (patch-libstdc++-v3_configure.host) =
7426ea4a9735e5f886f4a3ffb4a9ba62734178c4
Index: hacks.mk
===================================================================
RCS file: hacks.mk
diff -N hacks.mk
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ hacks.mk 30 Nov 2012 07:04:50 -0000
@@ -0,0 +1,14 @@
+.if !defined(GCC47_HACKS_MK)
+GCC47_HACKS_MK= defined
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+. if !empty(PKG_OPTIONS:Mgcc-go)
+###
+### workaround until https://www.illumos.org/issues/3263
+###
+MAKE_ENV+= ac_cv_func_dl_iterate_phdr=no
+. endif
+.endif
+.endif # GCC47_HACKS_MK
Index: version.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/gcc47/version.mk,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 version.mk
--- version.mk 16 Apr 2012 04:27:18 -0000 1.1.1.1
+++ version.mk 30 Nov 2012 07:04:50 -0000
@@ -1,2 +1,2 @@
# $NetBSD: version.mk,v 1.1.1.1 2012/04/16 04:27:18 sbd Exp $
-GCC_DIST_VERSION:= 4.7.0
+GCC_DIST_VERSION:= 4.7.2
Index: patches/patch-libgo_Makefile.in
===================================================================
RCS file: /cvsroot/pkgsrc/lang/gcc47/patches/patch-libgo_Makefile.in,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-libgo_Makefile.in
--- patches/patch-libgo_Makefile.in 16 Apr 2012 04:27:18 -0000 1.1.1.1
+++ patches/patch-libgo_Makefile.in 30 Nov 2012 07:04:50 -0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-libgo_Makefile.in,v 1.1.1.1 2012/04/16 04:27:18 sbd Exp $
+$NetBSD$
proc.c will not compile with inline-functions (implied by -O3)
so add -fno-inline-functions to it's cflags.
---- libgo/Makefile.in.orig 2012-03-10 19:03:09.000000000 +0000
+--- libgo/Makefile.in.orig 2012-08-06 14:34:27.000000000 +0000
+++ libgo/Makefile.in
-@@ -3028,7 +3028,7 @@ msize.lo: runtime/msize.c
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS)
--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS)
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msize.lo `test -f 'runtime/msize.c' ||
echo '$(srcdir)/'`runtime/msize.c
+@@ -3051,7 +3051,7 @@ print.lo: runtime/print.c
+ @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS)
--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS)
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o print.lo `test -f 'runtime/print.c' ||
echo '$(srcdir)/'`runtime/print.c
proc.lo: runtime/proc.c
-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS)
--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS)
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT proc.lo -MD -MP -MF $(DEPDIR)/proc.Tpo
-c -o proc.lo `test -f 'runtime/proc.c' || echo '$(srcdir)/'`runtime/proc.c
Index: patches/patch-libstdc++-v3_config_os_bsd_netbsd_ctype__base.h
===================================================================
RCS file: patches/patch-libstdc++-v3_config_os_bsd_netbsd_ctype__base.h
diff -N patches/patch-libstdc++-v3_config_os_bsd_netbsd_ctype__base.h
--- patches/patch-libstdc++-v3_config_os_bsd_netbsd_ctype__base.h 8 Jun
2012 15:42:29 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-libstdc++-v3_config_os_bsd_netbsd_ctype__base.h,v 1.1
2012/06/08 15:42:29 joerg Exp $
-
---- libstdc++-v3/config/os/bsd/netbsd/ctype_base.h.orig 2012-06-05
12:36:50.000000000 +0000
-+++ libstdc++-v3/config/os/bsd/netbsd/ctype_base.h
-@@ -30,8 +30,6 @@
- // Full details can be found from the CVS files at:
- // anoncvs%anoncvs.netbsd.org@localhost:/cvsroot/basesrc/include/ctype.h
- // See www.netbsd.org for details of access.
--
--#include <sys/param.h>
-
- namespace std _GLIBCXX_VISIBILITY(default)
- {
-@@ -47,7 +45,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
- // on the mask type. Because of this, we don't use an enum.
- typedef unsigned char mask;
-
--#if __NetBSD_Version__ < 599004100
-+#if !defined(_CTYPE_U)
- static const mask upper = _U;
- static const mask lower = _L;
- static const mask alpha = _U | _L;
Home |
Main Index |
Thread Index |
Old Index