From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jul 15 12:00:51 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9661216A4E4 for ; Thu, 15 Jul 2004 12:00:51 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7953B43D2D for ; Thu, 15 Jul 2004 12:00:51 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i6FC0pwE039240 for ; Thu, 15 Jul 2004 12:00:51 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i6FC0p3b039239; Thu, 15 Jul 2004 12:00:51 GMT (envelope-from gnats) Resent-Date: Thu, 15 Jul 2004 12:00:51 GMT Resent-Message-Id: <200407151200.i6FC0p3b039239@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Konstantin Oznobihin Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 821D816A4CE for ; Thu, 15 Jul 2004 11:54:31 +0000 (GMT) Received: from rocky.cc.rsu.ru (rocky.cc.rsu.ru [195.208.252.128]) by mx1.FreeBSD.org (Postfix) with ESMTP id 06EB943D2F for ; Thu, 15 Jul 2004 11:54:30 +0000 (GMT) (envelope-from bork@rocky.cc.rsu.ru) Received: from rocky.cc.rsu.ru (localhost [127.0.0.1]) by rocky.cc.rsu.ru (8.12.10/8.12.10) with ESMTP id i6FBnp9U091779 for ; Thu, 15 Jul 2004 15:49:51 +0400 (MSD) (envelope-from bork@rocky.cc.rsu.ru) Received: (from root@localhost) by rocky.cc.rsu.ru (8.12.10/8.12.10/Submit) id i6FBnpPe091778; Thu, 15 Jul 2004 15:49:51 +0400 (MSD) (envelope-from bork) Message-Id: <200407151149.i6FBnpPe091778@rocky.cc.rsu.ru> Date: Thu, 15 Jul 2004 15:49:51 +0400 (MSD) From: Konstantin Oznobihin To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/69093: [patch] devel/pkgconfig does not search for .pc files in libdir/pkgconfig X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Konstantin Oznobihin List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Jul 2004 12:00:51 -0000 >Number: 69093 >Category: ports >Synopsis: [patch] devel/pkgconfig does not search for .pc files in libdir/pkgconfig >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Thu Jul 15 12:00:50 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Konstantin Oznobihin >Release: FreeBSD 5.2.1-RELEASE-p9 i386 >Organization: Rostov State University >Environment: System: FreeBSD *.cc.rsu.ru 5.2.1-RELEASE-p9 FreeBSD 5.2.1-RELEASE-p9 #0: Fri Jul 2 20:10:08 MSD 2004 /usr/obj/usr/src/sys/athlon-xp.HEAD.2004-06-08 i386 >Description: In pkg-config(1) it is said that the default directory to search for .pc files is libdir/pkgconfig (which I think is ${PREFIX}/lib/pkgconfig) and some ports (e.g. openssl, omniORB) install their .pc files in this directory, but pkg-config searches them in libdata/pkgconfig. >How-To-Repeat: pkg-config --cflags openssl >Fix: Dirty hack based on existing patches for pkgconfig. Added LLIBPKGLIBDIR to Makefile.in and scan_dir (LLIBPKGLIBDIR, (void *)1); to pkg.c --- patch-Makefile.in begins here --- --- Makefile.in Thu Jul 15 15:13:13 2004 +++ Makefile.in Thu Jul 15 15:18:48 2004 @@ -35,7 +35,7 @@ DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ +pkglibdir = $(prefix)/libdata/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = . @@ -90,7 +90,7 @@ bin_PROGRAMS = pkg-config -INCLUDES = -DPKGLIBDIR="\"$(pkglibdir)\"" $(included_glib_includes) +INCLUDES = -DPKGLIBDIR="\"$(pkglibdir)\"" -DXPKGLIBDIR="\"$(X11BASE)/libdata/@PACKAGE@\"" -DLPKGLIBDIR="\"$(LOCALBASE)/libdata/@PACKAGE@\"" -DLLIBPKGLIBDIR="\"$(prefix)/lib/@PACKAGE@\"" $(included_glib_includes) pkg_config_SOURCES = \ pkg.h \ --- patch-Makefile.in ends here --- --- patch-pkg.c begins here --- --- pkg.c Thu Jul 15 15:17:21 2004 +++ pkg.c Thu Jul 15 15:23:00 2004 @@ -113,7 +113,7 @@ * locations, ignoring duplicates */ static void -scan_dir (const char *dirname) +scan_dir (const char *dirname, void *quiet) { DIR *dir; struct dirent *dent; @@ -133,7 +133,8 @@ free (dirname_copy); if (!dir) { - debug_spew ("Cannot open directory '%s' in package search path: %s\n", + if (!quiet) + debug_spew ("Cannot open directory '%s' in package search path: %s\n", dirname, g_strerror (errno)); return; } @@ -202,7 +203,10 @@ path_positions = g_hash_table_new (g_str_hash, g_str_equal); g_slist_foreach (search_dirs, (GFunc)scan_dir, NULL); - scan_dir (pkglibdir); + scan_dir (pkglibdir, (void *)0); + scan_dir (XPKGLIBDIR, (void *)1); + scan_dir (LPKGLIBDIR, (void *)1); + scan_dir (LLIBPKGLIBDIR, (void *)1); } } --- patch-pkg.c ends here --- >Release-Note: >Audit-Trail: >Unformatted: