On Thu, 24 Jan 2019 21:46:20 +0000 Stuart Henderson wrote: > On 2019/01/24 19:45, Charlene Wendling wrote: > > Hi ports, > > > > > http://build-failures.rhaalovely.net//powerpc/2018-12-14/x11/xscreensaver.log > > > http://build-failures.rhaalovely.net//sparc64/2018-12-19/x11/xscreensaver.log > > > > What i'm proposing here is simply let ports-gcc build it on > > ports-gcc archs, instead of using base-gcc. This reduces the > > patchwork that would be needed as well. > > > > It has been tested successfully with: > > > > - macppc+ports-gcc4.9 [0] > > - macppc+ports-gcc8.2 [1] > > - i have tested on amd64 just to be sure ;) > > > > Any comments or feedback? > > Oh that is funny. It fails because it *deliberately* uses --std=c89 to > force build to fail when // comments are used. > > Could you do it this way instead please? Then we don't need to worry > about more creeping in. Tested with gcc on amd64.
Indeed, it's better than patching comments. It builds fine on macppc/ports-gcc-4.9 as well [1]. Charlène. [1] https://clbin.com/jC2pV Index: Makefile =================================================================== RCS file: /cvs/ports/x11/xscreensaver/Makefile,v retrieving revision 1.101 diff -u -p -u -p -r1.101 Makefile --- Makefile 19 Jan 2019 15:02:39 -0000 1.101 +++ Makefile 24 Jan 2019 23:00:13 -0000 @@ -4,10 +4,11 @@ COMMENT= screen saver and locker for th # XXX x11/kde4/artwork plist may need regen if an update adds a new hack. DISTNAME= xscreensaver-5.42 +REVISION= 0 CATEGORIES= x11 -HOMEPAGE= http://www.jwz.org/xscreensaver/ +HOMEPAGE= https://www.jwz.org/xscreensaver/ # BSD PERMIT_PACKAGE_CDROM= Yes @@ -22,6 +23,8 @@ WANTLIB += util xml2 z MASTER_SITES= ${HOMEPAGE} +COMPILER= base-clang ports-gcc + MODULES= textproc/intltool RUN_DEPENDS= devel/desktop-file-utils @@ -40,7 +43,8 @@ RUN_DEPENDS += devel/xdg-utils USE_GMAKE= Yes NO_TEST= Yes -CONFIGURE_STYLE= gnu +CONFIGURE_STYLE= autoconf +AUTOCONF_VERSION= 2.69 CONFIGURE_ARGS= --with-hackdir="${PREFIX}/libexec/xscreensaver" \ --with-x-app-defaults="${PREFIX}/lib/X11/app-defaults" \ --without-pam Index: patches/patch-configure_in =================================================================== RCS file: patches/patch-configure_in diff -N patches/patch-configure_in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-configure_in 24 Jan 2019 23:00:13 -0000 @@ -0,0 +1,13 @@ +$OpenBSD$ +Unbreak the build with ports-gcc and --std=c89 +Index: configure.in +--- configure.in.orig ++++ configure.in +@@ -1227,7 +1227,6 @@ AC_PROG_CC_ANSI + AC_NO_LONG_STRING_WARNINGS + AC_NO_MISPLACED_DECLARATIONS + AC_NO_OBJECTIVE_C +-AC_NO_CPLUSPLUS_COMMENTS_IN_C_CODE + AC_PROG_CPP + AC_C_CONST + AC_C_INLINE
