rpms/pkgconfig/devel pkg-config-lib64-excludes.patch, NONE, 1.1 pkgconfig.spec, 1.45, 1.46
Colin Walters (walters)
fedora-extras-commits at redhat.com
Fri Jun 6 19:10:46 UTC 2008
Author: walters
Update of /cvs/pkgs/rpms/pkgconfig/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12914
Modified Files:
pkgconfig.spec
Added Files:
pkg-config-lib64-excludes.patch
Log Message:
* Fri Jun 06 2008 Colin Walters <walters at redhat.com> - 1:0.23-3
- Readd the requires.private fix that was dropped prematurely
pkg-config-lib64-excludes.patch:
--- NEW FILE pkg-config-lib64-excludes.patch ---
=== modified file 'pkg.c'
--- pkg.c 2008-03-23 20:39:07 +0000
+++ pkg.c 2008-06-06 18:49:58 +0000
@@ -936,31 +936,44 @@
g_slist_foreach (system_directories, (GFunc) g_free, NULL);
g_slist_free (system_directories);
+
+ system_directories = g_slist_prepend (NULL, "/usr/lib");
#ifdef PREFER_LIB64
-#define SYSTEM_LIBDIR "/usr/lib64"
-#else
-#define SYSTEM_LIBDIR "/usr/lib"
+ system_directories = g_slist_prepend (system_directories, "/usr/lib64");
#endif
count = 0;
iter = pkg->L_libs;
while (iter != NULL)
{
- if (strcmp (iter->data, "-L" SYSTEM_LIBDIR) == 0 ||
- strcmp (iter->data, "-L " SYSTEM_LIBDIR) == 0)
+ GSList *subiter = system_directories;
+ while (subiter != NULL)
{
- debug_spew ("Package %s has -L" SYSTEM_LIBDIR " in Libs\n",
- pkg->name);
- if (g_getenv ("PKG_CONFIG_ALLOW_SYSTEM_LIBS") == NULL)
- {
- iter->data = NULL;
- ++count;
- debug_spew ("Removing -L" SYSTEM_LIBDIR " from libs for %s\n", pkg->key);
+ gboolean is_system = FALSE;
+ const char *linker_arg = iter->data;
+ const char *system_libpath = subiter->data;
+ if (strncmp (linker_arg, "-L ", 3) == 0 &&
+ strcmp (linker_arg + 3, system_libpath) == 0)
+ is_system = TRUE;
+ else if (strncmp (linker_arg, "-L", 2) == 0 &&
+ strcmp (linker_arg + 2, system_libpath) == 0)
+ is_system = TRUE;
+ if (is_system)
+ {
+ debug_spew ("Package %s has -L %s in Libs\n",
+ pkg->name, system_libpath);
+ if (g_getenv ("PKG_CONFIG_ALLOW_SYSTEM_LIBS") == NULL)
+ {
+ iter->data = NULL;
+ ++count;
+ debug_spew ("Removing -L %s from libs for %s\n", system_libpath, pkg->key);
+ break;
+ }
}
+ subiter = subiter->next;
}
-
iter = iter->next;
}
-#undef SYSTEM_LIBDIR
+ g_slist_free (system_directories);
while (count)
{
Index: pkgconfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pkgconfig/devel/pkgconfig.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- pkgconfig.spec 31 Jan 2008 04:05:01 -0000 1.45
+++ pkgconfig.spec 6 Jun 2008 19:09:00 -0000 1.46
@@ -1,7 +1,7 @@
Summary: A tool for determining compilation options
Name: pkgconfig
Version: 0.23
-Release: 2%{?dist}
+Release: 3%{?dist}
Epoch: 1
License: GPLv2+
URL: http://pkgconfig.freedesktop.org
@@ -13,6 +13,8 @@
Patch2: pkg-config-0.21-compat-loop.patch
# https://bugs.freedesktop.org/show_bug.cgi?id=4738
Patch3: pkg-config-0.21-requires-private-fix.patch
+# https://bugs.freedesktop.org/show_bug.cgi?id=16095
+Patch4: pkg-config-lib64-excludes.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -26,6 +28,7 @@
%patch1 -p1 -b .reqprov
%patch2 -p1 -b .compat-loop
%patch3 -p1 -b .requires-private-fix
+%patch4 -p0 -b .lib64
%build
%configure --disable-shared --with-pc-path=%{_libdir}/pkgconfig:%{_datadir}/pkgconfig
@@ -50,6 +53,9 @@
%{_datadir}/aclocal/*
%changelog
+* Fri Jun 06 2008 Colin Walters <walters at redhat.com> - 1:0.23-3
+- Readd the requires.private fix that was dropped prematurely
+
* Wed Jan 30 2008 Matthias Clasen <mclasen at redhat.com> - 1:0.23-2
- Readd the requires.private fix that was dropped prematurely
More information about the scm-commits
mailing list