diff options
| author | Ade Lovett <ade@FreeBSD.org> | 2002-03-12 22:37:52 +0000 |
|---|---|---|
| committer | Ade Lovett <ade@FreeBSD.org> | 2002-03-12 22:37:52 +0000 |
| commit | 77c7e24bc96994d6bae7fbf4b4e1e0b82c512433 (patch) | |
| tree | c8084bafa0fc1e5d868d4e9d7f7a2c35c9ea7cfd /devel/pkgconfig | |
| parent | be7c92bad6a989c6df21f40091902b8a18d795c5 (diff) | |
| download | ports-77c7e24bc96994d6bae7fbf4b4e1e0b82c512433.tar.gz ports-77c7e24bc96994d6bae7fbf4b4e1e0b82c512433.zip | |
On -stable anyway, there is a problem getting "other" libs and cflags from
dependency packages (for example, from gthread-2.0). This prevents ports
like ORbit2 from compiling. It seems to be a pretty serious oversight on the
pkgconfig folks, so I'm going to submit this patch to them.
Basically, this patch adds recursive scanning capabilities to the
other_cflags and other_libs functions.
PR: 35831
Submitted by: Joe Clarke <marcus@marcuscom.com>
Notes
Notes:
svn path=/head/; revision=55956
Diffstat (limited to 'devel/pkgconfig')
| -rw-r--r-- | devel/pkgconfig/Makefile | 1 | ||||
| -rw-r--r-- | devel/pkgconfig/files/patch-pkg.c | 61 |
2 files changed, 51 insertions, 11 deletions
diff --git a/devel/pkgconfig/Makefile b/devel/pkgconfig/Makefile index 13b7c5a5a734..b966b6eaefca 100644 --- a/devel/pkgconfig/Makefile +++ b/devel/pkgconfig/Makefile @@ -7,6 +7,7 @@ PORTNAME= pkgconfig PORTVERSION= 0.11.0 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta2 diff --git a/devel/pkgconfig/files/patch-pkg.c b/devel/pkgconfig/files/patch-pkg.c index 3bf9b3f766bf..1284af1949e2 100644 --- a/devel/pkgconfig/files/patch-pkg.c +++ b/devel/pkgconfig/files/patch-pkg.c @@ -1,19 +1,16 @@ - -$FreeBSD$ - ---- pkg.c.orig Mon May 28 16:02:53 2001 -+++ pkg.c Wed Jul 11 14:42:22 2001 -@@ -71,7 +71,7 @@ +--- pkg.c.orig Thu Feb 7 14:32:13 2002 ++++ pkg.c Tue Mar 12 16:54:50 2002 +@@ -93,7 +93,7 @@ * locations, ignoring duplicates */ static void -scan_dir (const char *dirname) +scan_dir (const char *dirname, void *quiet) { - DIR *dir = opendir (dirname); + DIR *dir; struct dirent *dent; -@@ -82,7 +82,8 @@ - +@@ -113,7 +113,8 @@ + free (dirname_copy); if (!dir) { - debug_spew ("Cannot open directory '%s' in package search path: %s\n", @@ -22,8 +19,8 @@ $FreeBSD$ dirname, g_strerror (errno)); return; } -@@ -141,7 +142,9 @@ - locations = g_hash_table_new (g_str_hash, g_str_equal); +@@ -177,7 +178,9 @@ + path_positions = g_hash_table_new (g_str_hash, g_str_equal); g_slist_foreach (search_dirs, (GFunc)scan_dir, NULL); - scan_dir (PKGLIBDIR); @@ -33,3 +30,45 @@ $FreeBSD$ } } +@@ -901,6 +904,13 @@ + while (tmp != NULL) + { + Package *pkg = tmp->data; ++ GSList *reqs = pkg->requires; ++ ++ if (reqs) ++ { ++ g_string_append (str, packages_get_other_libs(reqs)); ++ g_string_append (str, " "); ++ } + + if (pkg->other_libs) + { +@@ -924,10 +934,13 @@ + char *L_libs; + char *other_libs; + GString *str; ++ GSList *tmp; + char *retval; + + str = g_string_new (""); + ++ tmp = pkgs; ++ + other_libs = packages_get_other_libs (pkgs); + L_libs = packages_get_L_libs (pkgs); + l_libs = packages_get_l_libs (pkgs); +@@ -986,6 +999,13 @@ + while (tmp != NULL) + { + Package *pkg = tmp->data; ++ GSList *reqs = pkg->requires; ++ ++ if (reqs) ++ { ++ g_string_append (str, packages_get_other_cflags(reqs)); ++ g_string_append (str, " "); ++ } + + if (pkg->other_cflags) + { |