From owner-cvs-all Thu Jun 13 21:16: 1 2002 Delivered-To: cvs-all@freebsd.org Received: from gyros.marcuscom.com (rdu57-17-158.nc.rr.com [66.57.17.158]) by hub.freebsd.org (Postfix) with ESMTP id 7A0FB37B408; Thu, 13 Jun 2002 21:15:31 -0700 (PDT) Received: from gyros.marcuscom.com (localhost [127.0.0.1]) by gyros.marcuscom.com (8.12.3/8.12.3) with ESMTP id g5E4FH2o059277; Fri, 14 Jun 2002 00:15:17 -0400 (EDT) (envelope-from marcus@FreeBSD.org) Received: (from marcus@localhost) by gyros.marcuscom.com (8.12.3/8.12.3/Submit) id g5E4FHMN059276; Fri, 14 Jun 2002 00:15:17 -0400 (EDT) X-Authentication-Warning: gyros.marcuscom.com: marcus set sender to marcus@FreeBSD.org using -f Subject: Re: pkg-config generating bogus -I lines From: Joe Marcus Clarke To: Doug Barton Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org, sobomax@FreeBSD.org In-Reply-To: <20020613181722.G62909-100000@zoot.corp.yahoo.com> References: <20020613181722.G62909-100000@zoot.corp.yahoo.com> Content-Type: text/plain Content-Transfer-Encoding: 7bit X-Mailer: Ximian Evolution 1.0.5 Date: 14 Jun 2002 00:15:17 -0400 Message-Id: <1024028117.355.9.camel@gyros.marcuscom.com> Mime-Version: 1.0 Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Thu, 2002-06-13 at 21:45, Doug Barton wrote: > On Thu, 13 Jun 2002, Doug Barton wrote: > > > On Thu, 13 Jun 2002, Joe Marcus Clarke wrote: > > > > > Correct the name of the gdk library in the gdk pkgconfig file. This > > > should get xscreensaver building correctly without needing to delete > > > pkgconfig. > > > > glib also needs this fix. I actually patched my .pc files by hand with the > > same stuff you had in your patchfiles. When all 3 files were updated, > > xscreensaver compiles cleanly with pkg-config installed. > > Sorry, I spoke too soon. pkg-config is generating bogus -I lines. The > xscreensaver configure program calls it as "pkg-config --cflags gtk+". > That gives the following output: I have made some patches to fix this, however, your latest patches fail to build right after acknowledging the libwarning. Changing: @(/usr/bin/dialog --textbox ${MASTERDIR}/pkg-libwarning 15 70 || 1) to @(/usr/bin/dialog --textbox ${MASTERDIR}/pkg-libwarning 15 70 || /usr/bin/true) fixes the problem. I will test the build with my patches, then commit. I won't touch xscreensaver, though. Joe > > -I/usr/local/include/glib12/glib-1.2 -I/usr/local/lib/glib/include > -I/usr/X11R6/include/gtk12/gtk-1.2 -I/usr/local/include > -I/usr/X11R6/include > > Note, the glib and gtk lines have the version number appended to the > string. Here are my .pc files: > > prefix=/usr/X11R6 > exec_prefix=${prefix} > libdir=${exec_prefix}/lib > includedir=/usr/X11R6/include/gtk12 > > Name: GDK > Description: GIMP Drawing Kit > Version: 1.2.10 > Requires: glib > Libs: -L${libdir} -L/usr/X11R6/lib -lgdk12 -lintl -lxpg4 -lXext -lX11 > -lm > Cflags: -I${includedir}/gtk-1.2 -I/usr/local/include -I/usr/X11R6/include > > ---- > > prefix=/usr/X11R6 > exec_prefix=${prefix} > libdir=${exec_prefix}/lib > includedir=/usr/X11R6/include/gtk12 > Name: GTK+ > Description: GIMP Tool Kit > Version: 1.2.10 > Requires: gdk > Libs: -L${libdir} -lgtk12 > Cflags: > > --- > > prefix=/usr/local > exec_prefix=${prefix} > libdir=${exec_prefix}/lib > includedir=/usr/local/include/glib12 > > Name: GLib > Description: C Utility Library > Version: 1.2.10 > Libs: -L${libdir} -lglib12 > Cflags: -I${includedir}/glib-1.2 -I${libdir}/glib/include > > > Changing 'Cflags:' to be simply: > > Cflags: -I${includedir} > > in each case seems to have done the trick. At very least, the erroneous > version strings should be patched out of the .pc.in files for gdk.pc.in > and glib.pc.in. > > Doug > > -- > "We have known freedom's price. We have shown freedom's power. > And in this great conflict, ... we will see freedom's victory." > - George W. Bush, President of the United States > State of the Union, January 28, 2002 > > Do YOU Yahoo!? > > > > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message