On Mon, 12 Nov 2012 22:11:44 +0000, Nigel Taylor wrote:
> On 11/12/12 19:48, Stuart Henderson wrote:
> > <big cc list trimmed, everyone interested in this should be on ports@,
> > right?>
> >
> > On 2012/11/12 13:25, Amit Kulkarni wrote:
> >> cd /usr/ports/openbsd-wip && git pull
> >>
> >> mv /usr/ports/databases/strigi /usr/ports/databases/strigi.old
> >> mv /usr/ports/multimedia/phonon /usr/ports/multimedia/phonon.old
> >
> > these two aren't linked to the build yet, so these might as well
> > just get updated in cvs.
> >
> >> mv /usr/ports/graphics/dcmtk /usr/ports/graphics/dcmtk.old
> >> mv /usr/ports/graphics/opencv /usr/ports/graphics/opencv.old
> >
> > nothing depends on these, if they work ok then these should be fairly
> > straightforward to update too.
> >
> >> mv /usr/ports/graphics/liblqr /usr/ports/graphics/liblqr.old
> >
> > does liquid-rescale work OK with the newer version?
> >
> >> mv /usr/ports/lang/g77 /usr/ports/lang/g77.old
> >
> > what's the status of this? have the various ports in-tree
> > which depend on g77 been tested with it?
>
>
> >
> > So how about CVS diffs for these so they can be tested/committed?
> > openbsd-wip is fine as a shared tree for development work, but
> > when it comes time to try and get these things in, the usual
> > process with sending out diffs is the way forward (in manageable
> > pieces please, i.e. unless a bunch of things must all be updated
> > at the same time to avoid breakage <like the rdf things> then
> > work on getting one or two in, then move on to the next things;
> > a flood of diffs all at once will usually just get ignored as
> > people are too overloaded ;)
> >
> >
>
> g77 diff was posted to ports@ before 22/09, then put into openbsd-wip so
> it wasn't lost, waiting on comments. A new diff is attached, because it
> includes additional changes since the original post to ports@, includes
> the change for mip64el also posted to ports@ 22/10.
>
> I have been building ports with this in place both for amd64 and i386.
> It is only a fix for runtime /regress dependencies and being able to run
> regression tests.
>
> As far as kde4 is concerned as long as libf2c is installed at runtime
> the existing g77 in the ports tree should work, apart from mips64el.
>
>
>
> Index: Makefile
> ===================================================================
> RCS file: /home/cvs/ports/lang/g77/Makefile,v
> retrieving revision 1.18
> diff -u -p -r1.18 Makefile
> --- Makefile 1 Sep 2012 00:00:32 -0000 1.18
> +++ Makefile 10 Nov 2012 11:22:11 -0000
> @@ -1,16 +1,17 @@
> # $OpenBSD: Makefile,v 1.18 2012/09/01 00:00:32 pascal Exp $
>
> -NOT_FOR_ARCHS = ${GCC2_ARCHS}
> +ONLY_FOR_ARCHS = ${GCC4_ARCHS}
>
> V = 3.3.5
> PKGNAME = g77-$V
> -REVISION = 5
> +REVISION = 6
> EPOCH = 0
> DISTFILES = g77-openbsd.tgz
>
> CONFIG = ${MACHINE_ARCH}-unknown-openbsd${OSREV}
> SUBST_VARS += CONFIG V
> SYSV = 4.2.1
> +SYSLIBPATH = `cc -v 2>&1| sed -n -e
> '/gcc-lib/s%^[^/]*\(/.*\)/[^/]*%\1%p'`
>
> COMMENT = GNU fortran 77 compiler
> CATEGORIES = lang math
> @@ -21,6 +22,10 @@ PERMIT_PACKAGE_CDROM = Yes
> PERMIT_DISTFILES_FTP = Yes
> PERMIT_PACKAGE_FTP = Yes
>
> +RUN_DEPENDS = devel/libf2c
> +REGRESS_DEPENDS = devel/dejagnu \
> + devel/libf2c
> +
> WRKDIST = ${WRKDIR}/g77
> CONFIGURE_SCRIPT = ${WRKDIST}/gcc/configure
>
> @@ -67,12 +72,16 @@ ALL_TARGET = all doc
> INSTALL_TARGET = install-common f77.install-info f77.install-normal
>
> post-install:
> - ln -sf /usr/lib/gcc-lib/${CONFIG}/${SYSV}/libgcc.a
> ${PREFIX}/lib/gcc-lib/${CONFIG}/$V/libgcc.a
> - ln -s /usr/lib/gcc-lib/${CONFIG}/${SYSV}/cc1
> ${PREFIX}/lib/gcc-lib/${CONFIG}/$V/cc1
> + ln -sf ${SYSLIBPATH}/libgcc.a
> ${PREFIX}/lib/gcc-lib/${CONFIG}/$V/libgcc.a
> + ln -s ${SYSLIBPATH}/cc1 ${PREFIX}/lib/gcc-lib/${CONFIG}/$V/cc1
> ${INSTALL_MAN} ${WRKBUILD}/f/g77.1 ${PREFIX}/man/man1/g77.1
> cd ${PREFIX}/man/man1 && ln -f g77.1 f77.1
> cd ${PREFIX}/bin && ln -f g77 f77
>
> WANTLIB = c iberty
> +
> +pre-regress:
> + ln -sf ${SYSLIBPATH}/libgcc.a ${WRKBUILD}/libgcc.a
> + ln -s ${SYSLIBPATH}/cc1 ${WRKBUILD}/cc1
>
> .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /home/cvs/ports/lang/g77/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 distinfo
> --- distinfo 24 May 2010 22:43:57 -0000 1.1.1.1
> +++ distinfo 9 Nov 2012 14:53:08 -0000
> @@ -1,5 +1,2 @@
> -MD5 (g77-openbsd.tgz) = RkFBHVXXRFefnZJtD7CzNw==
> -RMD160 (g77-openbsd.tgz) = FxIFG017fw7XNFqBbZ5u62FMXjc=
> -SHA1 (g77-openbsd.tgz) = c5SUxU68KXKPI9JuX1zP3tginiU=
> SHA256 (g77-openbsd.tgz) = QMSj29yw1B9Oa8OwyliN72S3RF1OPXT8wDG1X+KJhEo=
> SIZE (g77-openbsd.tgz) = 14445321
> Index: patches/patch-gcc_config_gcc
> ===================================================================
> RCS file: /home/cvs/ports/lang/g77/patches/patch-gcc_config_gcc,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-gcc_config_gcc
> --- patches/patch-gcc_config_gcc 1 Sep 2012 00:00:32 -0000 1.1
> +++ patches/patch-gcc_config_gcc 22 Oct 2012 16:32:38 -0000
> @@ -1,6 +1,6 @@
> $OpenBSD: patch-gcc_config_gcc,v 1.1 2012/09/01 00:00:32 pascal Exp $
> ---- gcc/config.gcc.orig Sat May 22 18:18:42 2010
> -+++ gcc/config.gcc Fri Aug 31 18:22:31 2012
> +--- gcc/config.gcc.orig Sat May 22 12:18:42 2010
> ++++ gcc/config.gcc Sun Oct 21 20:48:05 2012
> @@ -1184,6 +1184,7 @@ i[34567]86-*-openbsd*)
> gnu_ld=yes
> ;;
> @@ -9,15 +9,6 @@ $OpenBSD: patch-gcc_config_gcc,v 1.1 201
> tm_file="i386/biarch64.h i386/i386.h i386/unix.h i386/att.h dbxelf.h
> elfos.h openbsd.h openbsd-libpthread.h i386/x86-64.h i386/openbsd64.h"
> tm_file="${tm_file} exec-stack.h"
> tmake_file="t-libc-ok t-openbsd i386/t-openbsd"
> -@@ -1935,7 +1936,7 @@ mips*-*-linux*) # Linux
> MIPS, either endian.
> - tmake_file="t-slibgcc-elf-ver t-linux mips/t-linux"
> - ;;
> - mips*-*-openbsd*)
> -- target_cpu_default="MASK_GAS|MASK_ABICALLS"
> -+ target_cpu_default="MASK_GAS|MASK_ABICALLS PIE_DEFAULT=1"
> - tm_file="elfos.h ${tm_file}"
> - case $machine in
> - mips64*-*)
> @@ -2460,6 +2461,7 @@ sparc-*-openbsd*)
> use_collect2=yes
> ;;
>
Oops, my bad. How about this one:
Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/g77/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- Makefile 1 Sep 2012 00:00:32 -0000 1.18
+++ Makefile 13 Nov 2012 12:53:35 -0000
@@ -1,16 +1,17 @@
# $OpenBSD: Makefile,v 1.18 2012/09/01 00:00:32 pascal Exp $
-NOT_FOR_ARCHS = ${GCC2_ARCHS}
+ONLY_FOR_ARCHS = ${GCC4_ARCHS}
V = 3.3.5
PKGNAME = g77-$V
-REVISION = 5
+REVISION = 6
EPOCH = 0
DISTFILES = g77-openbsd.tgz
CONFIG = ${MACHINE_ARCH}-unknown-openbsd${OSREV}
SUBST_VARS += CONFIG V
SYSV = 4.2.1
+SYSLIBPATH = `cc -v 2>&1| sed -n -e
'/gcc-lib/s%^[^/]*\(/.*\)/[^/]*%\1%p'`
COMMENT = GNU fortran 77 compiler
CATEGORIES = lang math
@@ -21,6 +22,10 @@ PERMIT_PACKAGE_CDROM = Yes
PERMIT_DISTFILES_FTP = Yes
PERMIT_PACKAGE_FTP = Yes
+RUN_DEPENDS = devel/libf2c
+REGRESS_DEPENDS = devel/dejagnu \
+ devel/libf2c
+
WRKDIST = ${WRKDIR}/g77
CONFIGURE_SCRIPT = ${WRKDIST}/gcc/configure
@@ -67,12 +72,16 @@ ALL_TARGET = all doc
INSTALL_TARGET = install-common f77.install-info f77.install-normal
post-install:
- ln -sf /usr/lib/gcc-lib/${CONFIG}/${SYSV}/libgcc.a
${PREFIX}/lib/gcc-lib/${CONFIG}/$V/libgcc.a
- ln -s /usr/lib/gcc-lib/${CONFIG}/${SYSV}/cc1
${PREFIX}/lib/gcc-lib/${CONFIG}/$V/cc1
+ ln -sf ${SYSLIBPATH}/libgcc.a
${PREFIX}/lib/gcc-lib/${CONFIG}/$V/libgcc.a
+ ln -s ${SYSLIBPATH}/cc1 ${PREFIX}/lib/gcc-lib/${CONFIG}/$V/cc1
${INSTALL_MAN} ${WRKBUILD}/f/g77.1 ${PREFIX}/man/man1/g77.1
cd ${PREFIX}/man/man1 && ln -f g77.1 f77.1
cd ${PREFIX}/bin && ln -f g77 f77
WANTLIB = c iberty
+
+pre-regress:
+ ln -sf ${SYSLIBPATH}/libgcc.a ${WRKBUILD}/libgcc.a
+ ln -s ${SYSLIBPATH}/cc1 ${WRKBUILD}/cc1
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/lang/g77/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 24 May 2010 22:43:57 -0000 1.1.1.1
+++ distinfo 13 Nov 2012 12:53:35 -0000
@@ -1,5 +1,2 @@
-MD5 (g77-openbsd.tgz) = RkFBHVXXRFefnZJtD7CzNw==
-RMD160 (g77-openbsd.tgz) = FxIFG017fw7XNFqBbZ5u62FMXjc=
-SHA1 (g77-openbsd.tgz) = c5SUxU68KXKPI9JuX1zP3tginiU=
SHA256 (g77-openbsd.tgz) = QMSj29yw1B9Oa8OwyliN72S3RF1OPXT8wDG1X+KJhEo=
SIZE (g77-openbsd.tgz) = 14445321
Index: patches/patch-gcc_config_gcc
===================================================================
RCS file: /cvs/ports/lang/g77/patches/patch-gcc_config_gcc,v
retrieving revision 1.1
diff -u -p -r1.1 patch-gcc_config_gcc
--- patches/patch-gcc_config_gcc 1 Sep 2012 00:00:32 -0000 1.1
+++ patches/patch-gcc_config_gcc 13 Nov 2012 12:53:35 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-gcc_config_gcc,v 1.1 2012/09/01 00:00:32 pascal Exp $
--- gcc/config.gcc.orig Sat May 22 18:18:42 2010
-+++ gcc/config.gcc Fri Aug 31 18:22:31 2012
++++ gcc/config.gcc Tue Nov 13 13:52:33 2012
@@ -1184,6 +1184,7 @@ i[34567]86-*-openbsd*)
gnu_ld=yes
;;
@@ -9,16 +9,15 @@ $OpenBSD: patch-gcc_config_gcc,v 1.1 201
tm_file="i386/biarch64.h i386/i386.h i386/unix.h i386/att.h dbxelf.h
elfos.h openbsd.h openbsd-libpthread.h i386/x86-64.h i386/openbsd64.h"
tm_file="${tm_file} exec-stack.h"
tmake_file="t-libc-ok t-openbsd i386/t-openbsd"
-@@ -1935,7 +1936,7 @@ mips*-*-linux*) # Linux MIPS,
either endian.
- tmake_file="t-slibgcc-elf-ver t-linux mips/t-linux"
+@@ -1936,6 +1937,7 @@ mips*-*-linux*) # Linux MIPS,
either endian.
;;
mips*-*-openbsd*)
-- target_cpu_default="MASK_GAS|MASK_ABICALLS"
-+ target_cpu_default="MASK_GAS|MASK_ABICALLS PIE_DEFAULT=1"
+ target_cpu_default="MASK_GAS|MASK_ABICALLS"
++ tm_defines="${tm_defines} PIE_DEFAULT=1"
tm_file="elfos.h ${tm_file}"
case $machine in
mips64*-*)
-@@ -2460,6 +2461,7 @@ sparc-*-openbsd*)
+@@ -2460,6 +2462,7 @@ sparc-*-openbsd*)
use_collect2=yes
;;
sparc64-*-openbsd*)
