[PATCH] lang/gcc -- Fix build on freebsd-current
diff -ur gcc-4.6.2.orig/boehm-gc/configure gcc-4.6.2/boehm-gc/configure
--- gcc-4.6.2.orig/boehm-gc/configure 2011-10-26 02:30:24.0 -0700
+++ gcc-4.6.2/boehm-gc/configure2011-12-16 11:19:53.0 -0800
@@ -10520,7 +10520,7 @@
objformat=`/usr/bin/objformat`
else
case $host_os in
-freebsd[123]*) objformat=aout ;;
+freebsd[23]*) objformat=aout ;;
*) objformat=elf ;;
esac
fi
@@ -12428,7 +12428,7 @@
esac
;;
- freebsd[12]*)
+ freebsd2*)
# C++ shared libraries reported to be fairly broken before
# switch to ELF
ld_shlibs_CXX=no
@@ -14203,7 +14203,7 @@
objformat=`/usr/bin/objformat`
else
case $host_os in
-freebsd[123]*) objformat=aout ;;
+freebsd[23]*) objformat=aout ;;
*) objformat=elf ;;
esac
fi
diff -ur gcc-4.6.2.orig/configure gcc-4.6.2/configure
--- gcc-4.6.2.orig/configure2011-06-27 13:54:59.0 -0700
+++ gcc-4.6.2/configure 2011-12-16 11:19:03.0 -0800
@@ -3126,7 +3126,7 @@
noconfigdirs="$noconfigdirs sim target-rda"
noconfigdirs="$noconfigdirs ${libgcj}"
;;
- *-*-freebsd[12] | *-*-freebsd[12].* | *-*-freebsd*aout*)
+ *-*-freebsd2 | *-*-freebsd2.* | *-*-freebsd*aout*)
noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}"
;;
*-*-freebsd*)
diff -ur gcc-4.6.2.orig/gcc/config.gcc gcc-4.6.2/gcc/config.gcc
--- gcc-4.6.2.orig/gcc/config.gcc 2011-07-22 09:44:50.0 -0700
+++ gcc-4.6.2/gcc/config.gcc2011-12-16 11:19:24.0 -0800
@@ -272,7 +272,7 @@
| pdp11-*-bsd \
| sparc-hal-solaris2* \
| thumb-*-* \
- | *-*-freebsd[12] | *-*-freebsd[12].* \
+ | *-*-freebsd2 | *-*-freebsd2.* \
| *-*-freebsd*aout* \
| *-*-linux*aout* \
| *-*-linux*coff* \
diff -ur gcc-4.6.2.orig/gcc/configure gcc-4.6.2/gcc/configure
--- gcc-4.6.2.orig/gcc/configure2011-10-12 11:07:25.0 -0700
+++ gcc-4.6.2/gcc/configure 2011-12-16 11:19:40.0 -0800
@@ -16653,7 +16653,7 @@
objformat=`/usr/bin/objformat`
else
case $host_os in
-freebsd[123]*) objformat=aout ;;
+freebsd[23]*) objformat=aout ;;
*) objformat=elf ;;
esac
fi
@@ -18537,7 +18537,7 @@
esac
;;
- freebsd[12]*)
+ freebsd2*)
# C++ shared libraries reported to be fairly broken before
# switch to ELF
ld_shlibs_CXX=no
@@ -20312,7 +20312,7 @@
objformat=`/usr/bin/objformat`
else
case $host_os in
-freebsd[123]*) objformat=aout ;;
+freebsd[23]*) objformat=aout ;;
*) objformat=elf ;;
esac
fi
diff -ur gcc-4.6.2.orig/libffi/configure gcc-4.6.2/libffi/configure
--- gcc-4.6.2.orig/libffi/configure 2011-10-26 02:30:24.0 -0700
+++ gcc-4.6.2/libffi/configure 2011-12-16 11:16:32.0 -0800
@@ -9914,7 +9914,7 @@
objformat=`/usr/bin/objformat`
else
case $host_os in
-freebsd[123]*) objformat=aout ;;
+freebsd[23]*) objformat=aout ;;
*) objformat=elf ;;
esac
fi
diff -ur gcc-4.6.2.orig/libgcc/config.host gcc-4.6.2/libgcc/config.host
--- gcc-4.6.2.orig/libgcc/config.host 2011-03-13 23:06:23.0 -0700
+++ gcc-4.6.2/libgcc/config.host2011-12-16 11:16:26.0 -0800
@@ -145,7 +145,7 @@
asm_hidden_op=.private_extern
tmake_file="t-darwin ${cpu_type}/t-darwin t-slibgcc-darwin"
;;
-*-*-freebsd[12] | *-*-freebsd[12].* | *-*-freebsd*aout*)
+*-*-freebsd2 | *-*-freebsd2.* | *-*-freebsd*aout*)
# This is the place-holder for the generic a.out configuration
# of FreeBSD. No actual configuration resides here since
# there was only ever a bare-bones ix86 configuration for
diff -ur gcc-4.6.2.orig/libgfortran/configure gcc-4.6.2/libgfortran/configure
--- gcc-4.6.2.orig/libgfortran/configure2011-10-26 02:30:24.0
-0700
+++ gcc-4.6.2/libgfortran/configure 2011-12-16 11:17:48.0 -0800
@@ -11242,7 +11242,7 @@
objformat=`/usr/bin/objformat`
else
case $host_os in
-freebsd[123]*) objformat=aout ;;
+freebsd[23]*) objformat=aout ;;
*) objformat=elf ;;
esac
fi
@@ -14870,7 +14870,7 @@
objformat=`/usr/bin/objformat`
else
case $host_os in
-freebsd[123]*) objformat=aout ;;
+freebsd[23]*) objformat=aout ;;
*) objformat=elf ;;
esac
fi
diff -ur gcc-4.6.2.orig/libgo/configure gcc-4.6.2/libgo/configure
--- gcc-4.6.2.orig/libgo/configure 2011-02-20 20:17:20.0 -0800
+++ gcc-4.6.2/libgo/configure 2011-12-16 11:17:25.0 -0800
@@ -10046,7 +10046,7 @@
objformat=`/usr/bin/objformat`
else
case $host_os in
-freebsd[123]*) objformat=aout ;;
+freebsd[23]*) objformat=aout ;;
*) objformat=elf ;;
esac
fi
diff -ur gcc-4.6.2.orig/libgomp/configure gcc-4.6.2/libgomp/configure
--- gcc-4.6.2.orig/libgomp/configure2011-10-
Re: [PATCH] lang/gcc -- Fix build on freebsd-current
Hi, Actually you can add a dot (.) to these matches, e.g. freebsd[123]* -> freebsd[123].*, etc... Have you contacted the maintainer (ger...@freebsd.org) by the way? Cheers, -- Xin LI https://www.delphij.net/ FreeBSD - The Power to Serve! Live free or die ___ freebsd-ports@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-ports To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org"
Re: [PATCH] lang/gcc -- Fix build on freebsd-current
On Fri, Dec 16, 2011 at 06:09:08PM -0800, Xin LI wrote: > Actually you can add a dot (.) to these matches, e.g. freebsd[123]* -> > freebsd[123].*, etc... Have you contacted the maintainer > (ger...@freebsd.org) by the way? My guess? We should rip out the [123] and [23] strings entirely. If anyone is running ports on FreeBSD 1, they have more problems than they can count right now. I can personally guarantee that ports don't work on 4.x (I ripped out the compat code several years ago that dealt with gross old make(1) bugs, etc.) and I think that means not 3.x either. In any case, the official claim is that the Ports Collection only supports 789 as first- class citizens right now, not anything older. mcl ___ freebsd-ports@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-ports To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org"
Re: [PATCH] lang/gcc -- Fix build on freebsd-current
On Fri, Dec 16, 2011 at 06:09:08PM -0800, Xin LI wrote: > > Actually you can add a dot (.) to these matches, e.g. freebsd[123]* -> > freebsd[123].*, etc... Have you contacted the maintainer > (ger...@freebsd.org) by the way? > There are probably a few different ways to workaround the problem. This is my 15 minute effort to get lang/gcc to build. gerald@ has indicated in another email thread that he'll probably backport GCC trunk's official patch. That's too much effort and too far out into the future for my immediate needs. -- Steve ___ freebsd-ports@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-ports To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org"
Re: [PATCH] lang/gcc -- Fix build on freebsd-current
> > Actually you can add a dot (.) to these matches, e.g. freebsd[123]* -> > > freebsd[123].*, etc... Have you contacted the maintainer > > (gerald at FreeBSD.org) by the way? > > My guess? We should rip out the [123] and [23] strings entirely. If > anyone is running ports on FreeBSD 1, they have more problems than they > can count right now. > > I can personally guarantee that ports don't work on 4.x (I ripped out > the compat code several years ago that dealt with gross old make(1) > bugs, etc.) and I think that means not 3.x either. In any case, the > official claim is that the Ports Collection only supports 789 as first- > class citizens right now, not anything older. Fixes have already been implemented upstream, at Gerald's request, and are in lang/gcc46. But these fixes were introduced after the last stable release of gcc 4.6, which corresponds to lang/gcc. When a new version of gcc 4.6 is released, and the port is updated accordingly, it will include the fixes. In the meantime, I think Gerald was waiting for Martin to incorporate the patch to adjust the run-autotools-fixup target in ports/Mk/bsd.port.mk so that the target repairs ports like lang/gcc that use non-default *WRKSRC, by expanding the search in that target to WRKDIR. There hasn't been any further word on that for about a month-and-a-half -- presumably Martin is either busy with other work or is still trying to adjust the patch to fix some other problems. But you can make such a change on your own system. b. ___ freebsd-ports@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-ports To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org"
Re: [PATCH] lang/gcc -- Fix build on freebsd-current
On Fri, Dec 16, 2011 at 09:15:06PM -0600, Mark Linimon wrote: > On Fri, Dec 16, 2011 at 06:09:08PM -0800, Xin LI wrote: > > Actually you can add a dot (.) to these matches, e.g. freebsd[123]* -> > > freebsd[123].*, etc... Have you contacted the maintainer > > (ger...@freebsd.org) by the way? > > My guess? We should rip out the [123] and [23] strings entirely. If > anyone is running ports on FreeBSD 1, they have more problems than they > can count right now. > > I can personally guarantee that ports don't work on 4.x (I ripped out > the compat code several years ago that dealt with gross old make(1) > bugs, etc.) and I think that means not 3.x either. In any case, the > official claim is that the Ports Collection only supports 789 as first- > class citizens right now, not anything older. > gerald@ has indicated that he'll do something with the official GCC way to deal with 1. versus 10. This patch is a stop gap for others, who like me, will run into a broken lang/gcc while we wait for a better solution. -- Steve ___ freebsd-ports@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-ports To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org"
Re: [PATCH] lang/gcc -- Fix build on freebsd-current
On Sat, 17 Dec 2011, b. f. wrote: > Fixes have already been implemented upstream, at Gerald's request, and > are in lang/gcc46. But these fixes were introduced after the last > stable release of gcc 4.6, which corresponds to lang/gcc. When a new > version of gcc 4.6 is released, and the port is updated accordingly, > it will include the fixes. In the meantime, I think Gerald was > waiting for Martin to incorporate the patch to adjust the > run-autotools-fixup target in ports/Mk/bsd.port.mk As usual, Brendan is right on target. :-) If you guys would like to test the attached patch for lang/gcc, it does allow that port to build on a FreeBSD 10 system for me, and if I get independent confirmation in the next three days it'll be in before holiday season. GeraldIndex: files/patch-freebsd10 === RCS file: files/patch-freebsd10 diff -N files/patch-freebsd10 0a1,873 > Upstream SVN commit 181536. > > Index: libtool.m4 > === > --- libtool.m4(revision 181535) > +++ libtool.m4(revision 181536) > @@ -2273,7 +2273,7 @@ > objformat=`/usr/bin/objformat` >else > case $host_os in > -freebsd[[123]]*) objformat=aout ;; > +freebsd[[23]].*) objformat=aout ;; > *) objformat=elf ;; > esac >fi > @@ -2291,7 +2291,7 @@ >esac >shlibpath_var=LD_LIBRARY_PATH >case $host_os in > - freebsd2*) > + freebsd2.*) > shlibpath_overrides_runpath=yes > ;; >freebsd3.[[01]]* | freebsdelf3.[[01]]*) > @@ -4804,7 +4804,7 @@ >;; > > # Unfortunately, older versions of FreeBSD 2 do not have this feature. > -freebsd2*) > +freebsd2.*) >_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs > $deplibs $linker_flags' >_LT_TAGVAR(hardcode_direct, $1)=yes >_LT_TAGVAR(hardcode_minus_L, $1)=yes > @@ -5751,7 +5751,7 @@ > esac > ;; > > - freebsd[[12]]*) > + freebsd2.*) > # C++ shared libraries reported to be fairly broken before > # switch to ELF > _LT_TAGVAR(ld_shlibs, $1)=no > Index: libgomp/configure > === > --- libgomp/configure (revision 181535) > +++ libgomp/configure (revision 181536) > @@ -9317,7 +9317,7 @@ >;; > > # Unfortunately, older versions of FreeBSD 2 do not have this feature. > -freebsd2*) > +freebsd2.*) >archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' >hardcode_direct=yes >hardcode_minus_L=yes > @@ -10230,7 +10230,7 @@ > objformat=`/usr/bin/objformat` >else > case $host_os in > -freebsd[123]*) objformat=aout ;; > +freebsd[23].*) objformat=aout ;; > *) objformat=elf ;; > esac >fi > @@ -10248,7 +10248,7 @@ >esac >shlibpath_var=LD_LIBRARY_PATH >case $host_os in > - freebsd2*) > + freebsd2.*) > shlibpath_overrides_runpath=yes > ;; >freebsd3.[01]* | freebsdelf3.[01]*) > @@ -13164,7 +13164,7 @@ >;; > > # Unfortunately, older versions of FreeBSD 2 do not have this feature. > -freebsd2*) > +freebsd2.*) >archive_cmds_FC='$LD -Bshareable -o $lib $libobjs $deplibs > $linker_flags' >hardcode_direct_FC=yes >hardcode_minus_L_FC=yes > @@ -13869,7 +13869,7 @@ > objformat=`/usr/bin/objformat` >else > case $host_os in > -freebsd[123]*) objformat=aout ;; > +freebsd[23].*) objformat=aout ;; > *) objformat=elf ;; > esac >fi > @@ -13887,7 +13887,7 @@ >esac >shlibpath_var=LD_LIBRARY_PATH >case $host_os in > - freebsd2*) > + freebsd2.*) > shlibpath_overrides_runpath=yes > ;; >freebsd3.[01]* | freebsdelf3.[01]*) > Index: libgomp/ChangeLog > === > --- libgomp/ChangeLog (revision 181535) > +++ libgomp/ChangeLog (revision 181536) > @@ -1,3 +1,7 @@ > +2011-11-20 Andreas Tobler > + > + * configure: Regenerate. > + > 2011-10-26 Release Manager > > * GCC 4.6.2 released. > Index: libquadmath/configure > === > --- libquadmath/configure (revision 181535) > +++ libquadmath/configure (revision 181536) > @@ -8727,7 +8727,7 @@ >;; > > # Unfortunately, older versions of FreeBSD 2 do not have this feature. > -freebsd2*) > +freebsd2.*) >archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' >hardcode_direct=yes >hardcode_minus_L=yes > @@ -9643,7 +9643,7 @@ > objformat=`/usr/bin/objformat` >else > case $host_os in > -freebsd[123]*) objformat=aout ;; > +freebsd[23].*) objformat=aout ;; > *) objformat=elf ;; > esac >fi > @@ -9661,7 +9661,7 @@ >esac >shlibpath_var=LD_LIBRARY_PATH >case $host_os in > - freebsd2
Re: [PATCH] lang/gcc -- Fix build on freebsd-current
On Mon, Dec 19, 2011 at 04:09:02PM +0900, Gerald Pfeifer wrote: > > As usual, Brendan is right on target. :-) If you guys would like > to test the attached patch for lang/gcc, it does allow that port > to build on a FreeBSD 10 system for me, and if I get independent > confirmation in the next three days it'll be in before holiday > season. Not sure why you need confirmation before committing if it works for you, because anything has to be better than the current state. > > Index: libgomp/ChangeLog > > === > > --- libgomp/ChangeLog (revision 181535) > > +++ libgomp/ChangeLog (revision 181536) > > @@ -1,3 +1,7 @@ > > +2011-11-20 Andreas Tobler > > + > > + * configure: Regenerate. > > + > > 2011-10-26 Release Manager > > > > * GCC 4.6.2 released. Why? Given that the typical build is 'make && make install && make clean', patching ChangeLog seems rather odd. The same question applies to the other ChangeLog diffs that I've removed. -- Steve ___ freebsd-ports@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-ports To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org"
Re: [PATCH] lang/gcc -- Fix build on freebsd-current
On Mon, 19 Dec 2011, Steve Kargl wrote: > Not sure why you need confirmation before committing if it works for > you, because anything has to be better than the current state. Well, I prefer not having to follow up with further patches later (and luckily my full testing uncovered another small issue). > Why? Given that the typical build is 'make && make install && make clean', > patching ChangeLog seems rather odd. The same question applies to the > other ChangeLog diffs that I've removed. I was going for the full upstream changeset, consuming that directly. Based on your feedback I just noted the upstream revision ids and omitted the ChangeLog patches. Thanks, Gerald ___ freebsd-ports@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-ports To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org"
