Date: Tue, 8 Jun 2004 17:36:15 +0200 (CEST) From: Volker Stolz <vs@freebsd.org> To: FreeBSD-gnats-submit@freebsd.org Cc: gnome@freebsd.org Subject: [patch] x11/xscreensaver-gnome breaks in the presence of libutils Message-ID: <200406081536.i58FaFPC037980@menelaos.informatik.rwth-aachen.de>
next in thread | raw e-mail | index | archive | help
>Submitter-Id: current-users
>Originator: Volker Stolz
>Organization: Lehrstuhl für Informatik II
>Confidential: no
>Synopsis: [patch] x11/xscreensaver-gnome breaks in the presence of libutils
>Severity: non-critical
>Priority: low
>Category: ports
>Class: sw-bug
>Release: FreeBSD 4.9-STABLE i386
>Environment:
System: FreeBSD menelaos.informatik.rwth-aachen.de 4.9-STABLE FreeBSD 4.9-STABLE #15: Thu Mar 25 15:34:34 CET 2004 root@menelaos.informatik.rwth-aachen.de:/usr/obj/usr/src/sys/MENELAOS i386
>Description:
The port snaps up a wrong util.h if libutil.h is installed:
gmake[1]: Entering directory `/usr/ports/x11/xscreensaver-gnome/work/xscreensaver-4.16/hacks'
cc -Wall -Wstrict-prototypes -Wnested-externs -std=c89 -U__STRICT_ANSI__ -c -I. -I. -I./../utils -I.. -I/usr/local/include/atk-1.0 -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include -I/usr/local/include/libxml2 -I/usr/local/include -I/usr/X11R6/include/gtk-2.0 -I/usr/X11R6/lib/gtk-2.0/include -I/usr/X11R6/include -I/usr/X11R6/include/pango-1.0 -I/usr/local/include/freetype2 -I/usr/X11R6/include/libglade-2.0 -I/usr/local/include/libxml2 -I/usr/local/include -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include -I/usr/X11R6/include/gtk-2.0 -I/usr/X11R6/include -DSTANDALONE -DHAVE_CONFIG_H -O -pipe -g -I/usr/local/include -I/usr/X11R6/include phosphor.c
In file included from phosphor.c:34:
/usr/local/include/util.h:95: syntax error before `/'
gmake[1]: *** [phosphor.o] Error 1
gmake[1]: Leaving directory `/usr/ports/x11/xscreensaver-gnome/work/xscreensaver-4.16/hacks'
gmake: *** [all] Error 5
*** Error code 2
Stop in /usr/ports/x11/xscreensaver-gnome.
xscreensaver-gnome@menelaos [17:10:37]> pkg_info -W /usr/local/include/util.h
/usr/local/include/util.h was installed by package libutils-1.0.3_1
>How-To-Repeat:
- Install libutils
- Try to build xscreensaver
>Fix:
HAVE_UTIL_H is tested via configure. I think this should read libutil.h,
because that's where forkpty comes from. Note that the following patch
works with both with and without libutils installed. This bug should
be reported upstream, since ./configure ist testing the wrong things
(and will mean that things are a bit out-of-sync in our port:
- with libutils, it will use the correct header-file
- without libutils, the libutil.h will be #ifdef'ed out, but still dtrt)
If nobody objects, I'll commit this and do the reporting.
Index: Makefile
===================================================================
RCS file: /usr/freebsdcvs/cvs-ports/ports/x11/xscreensaver-gnome/Makefile,v
retrieving revision 1.32
diff -u -r1.32 Makefile
--- Makefile 27 May 2004 02:39:04 -0000 1.32
+++ Makefile 8 Jun 2004 15:25:34 -0000
@@ -93,5 +93,7 @@
${WRKSRC}/hacks/glx/klein.c
@${REINPLACE_CMD} -E -e 's|^[[:space:]]*GL_LIBS="${PTHREAD_LIBS}"|#|g' \
${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's|<util.h>|<libutil.h>|' \
+ ${WRKSRC}/hacks/phosphor.c ${WRKSRC}/hacks/apple2-main.c
.include <bsd.port.post.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200406081536.i58FaFPC037980>