mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-22 08:58:47 +00:00
Code Issues Releases Activity

Don't warn about non-existing {X11,LOCAL}BASE/libdata/pkgconfig.

Browse Source 
Prompted by:	olgeni, ade
This commit is contained in:
Maxim Sobolev 2001-05-15 10:07:28 +00:00
parent bd25dc0cf2
commit e6b8a5f53d
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=42614
2 changed files with 58 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
devel/pkg-config/files/patch-pkg.c
View File

@ -1,14 +1,37 @@
$FreeBSD$
--- pkg.c 2001/04/29 11:38:41 1.1
+++ pkg.c 2001/04/29 11:39:06
@@ -97,6 +97,8 @@
--- pkg.c.orig Wed Jan 3 11:34:49 2001
+++ pkg.c Tue May 15 11:48:04 2001
@@ -40,7 +40,7 @@
* locations, ignoring duplicates
*/
static void
-scan_dir (const char *dirname)
+scan_dir (const char *dirname, void *quiet)
{
DIR *dir = opendir (dirname);
struct dirent *dent;
@@ -51,8 +51,9 @@
if (!dir)
{
- fprintf (stderr, "Warning: cannot open directory '%s' in package search path: %s\n",
- dirname, g_strerror (errno));
+ if (!quiet)
+ fprintf (stderr, "Warning: cannot open directory '%s' in package search path: %s\n",
+ dirname, g_strerror (errno));
return;
}
@@ -96,7 +97,9 @@
locations = g_hash_table_new (g_str_hash, g_str_equal);
g_slist_foreach (search_dirs, (GFunc)scan_dir, NULL);
scan_dir (PKGLIBDIR);
+ scan_dir (XPKGLIBDIR);
+ scan_dir (LPKGLIBDIR);
- scan_dir (PKGLIBDIR);
+ scan_dir (PKGLIBDIR, (void *)0);
+ scan_dir (XPKGLIBDIR, (void *)1);
+ scan_dir (LPKGLIBDIR, (void *)1);
}
}

35
devel/pkgconfig/files/patch-pkg.c
View File

@ -1,14 +1,37 @@
$FreeBSD$
--- pkg.c 2001/04/29 11:38:41 1.1
+++ pkg.c 2001/04/29 11:39:06
@@ -97,6 +97,8 @@
--- pkg.c.orig Wed Jan 3 11:34:49 2001
+++ pkg.c Tue May 15 11:48:04 2001
@@ -40,7 +40,7 @@
* locations, ignoring duplicates
*/
static void
-scan_dir (const char *dirname)
+scan_dir (const char *dirname, void *quiet)
{
DIR *dir = opendir (dirname);
struct dirent *dent;
@@ -51,8 +51,9 @@
if (!dir)
{
- fprintf (stderr, "Warning: cannot open directory '%s' in package search path: %s\n",
- dirname, g_strerror (errno));
+ if (!quiet)
+ fprintf (stderr, "Warning: cannot open directory '%s' in package search path: %s\n",
+ dirname, g_strerror (errno));
return;
}
@@ -96,7 +97,9 @@
locations = g_hash_table_new (g_str_hash, g_str_equal);
g_slist_foreach (search_dirs, (GFunc)scan_dir, NULL);
scan_dir (PKGLIBDIR);
+ scan_dir (XPKGLIBDIR);
+ scan_dir (LPKGLIBDIR);
- scan_dir (PKGLIBDIR);
+ scan_dir (PKGLIBDIR, (void *)0);
+ scan_dir (XPKGLIBDIR, (void *)1);
+ scan_dir (LPKGLIBDIR, (void *)1);
}
}