diff --git a/.cvsignore b/.cvsignore index 11c6f1f..3a7cbdb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -pkgconfig-0.12.0.tar.gz +pkgconfig-0.14.0.tar.gz diff --git a/pkgconfig-0.14.0-lib64.patch b/pkgconfig-0.14.0-lib64.patch new file mode 100644 index 0000000..60a8f17 --- /dev/null +++ b/pkgconfig-0.14.0-lib64.patch @@ -0,0 +1,52 @@ +--- pkgconfig-0.14.0/configure.in 2002-10-10 17:17:08.000000000 -0400 ++++ pkgconfig-0.14.0/configure.in 2003-02-10 21:47:52.000000000 -0500 +@@ -20,6 +20,11 @@ + + AM_CONDITIONAL(USE_INSTALLED_GLIB, test x$native_win32 = xyes) + ++case "$libdir" in ++*lib64) AC_DEFINE(PREFER_LIB64,1,[Define if your native architecture defines libdir to be $prefix/lib64 instead of $prefix/lib.]) ;; ++*) : ;; ++esac ++ + if test x$native_win32 = xyes; then + # On Win32, use the normal installed GLib. Yes, this is a circular + # dependency. But then, only experienced hackers that presumably can +--- pkgconfig-0.14.0/pkg.c 2002-10-10 17:14:59.000000000 -0400 ++++ pkgconfig-0.14.0/pkg.c 2003-02-10 21:42:24.000000000 -0500 +@@ -842,25 +842,31 @@ + g_slist_foreach (system_directories, (GFunc) g_free, NULL); + g_slist_free (system_directories); + ++#ifdef PREFER_LIB64 ++ #define system_libs "/usr/lib64" ++#else ++ #define system_libs "/usr/lib" ++#endif + count = 0; + iter = pkg->L_libs; + while (iter != NULL) + { +- if (strcmp (iter->data, "-L/usr/lib") == 0 || +- strcmp (iter->data, "-L /usr/lib") == 0) ++ if (strcmp (iter->data, "-L" system_libs) == 0 || ++ strcmp (iter->data, "-L " system_libs) == 0) + { +- debug_spew ("Package %s has -L/usr/lib in Libs\n", ++ debug_spew ("Package %s has -L" system_libs " in Libs\n", + pkg->name); + if (g_getenv ("PKG_CONFIG_ALLOW_SYSTEM_LIBS") == NULL) + { + iter->data = NULL; + ++count; +- debug_spew ("Removing -L/usr/lib from libs for %s\n", pkg->key); ++ debug_spew ("Removing -L" system_libs " from libs for %s\n", pkg->key); + } + } + + iter = iter->next; + } ++#undef system_libs + + while (count) + { diff --git a/pkgconfig.spec b/pkgconfig.spec index 81075e4..4a473f7 100644 --- a/pkgconfig.spec +++ b/pkgconfig.spec @@ -1,11 +1,13 @@ Summary: A tool for determining compilation options. Name: pkgconfig -Version: 0.12.0 +Version: 0.14.0 Release: 3 Epoch: 1 License: GPL Group: Development/Tools Source: http://www.freedesktop.org/software/pkgconfig/releases/%{name}-%{version}.tar.gz +BuildPrereq: autoconf213 +Patch: pkgconfig-0.14.0-lib64.patch BuildRoot: %{_tmppath}/%{name}-root %description @@ -15,6 +17,9 @@ compiler and linker flags. %prep %setup -q +%patch -p1 -b .lib64 +autoheader-2.13 +autoconf-2.13 %build %configure @@ -23,8 +28,8 @@ make %install rm -rf $RPM_BUILD_ROOT %makeinstall -mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/pkgconfig -strip $RPM_BUILD_ROOT%{_prefix}/bin/* +mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig +strip $RPM_BUILD_ROOT%{_bindir}/* %clean rm -rf $RPM_BUILD_ROOT @@ -37,6 +42,22 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/aclocal/* %changelog +* Mon Feb 10 2003 Nalin Dahyabhai +- suppress /usr/lib64 (instead of /usr/lib) from LIBS by default on multilib + arches where the default is to use lib64 + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Fri Nov 8 2002 Havoc Pennington +- 0.14 + +* Tue Oct 8 2002 Havoc Pennington +- use libdir, so we do move .pc files to /usr/lib64 + +* Tue Oct 8 2002 Havoc Pennington +- use prefix/lib not libdir, so we don't move .pc files to /usr/lib64 + * Fri Jun 21 2002 Tim Powers - automated rebuild diff --git a/sources b/sources index ca1e6eb..403edea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c583e1de0c46948b1a0c9cf523b3aa92 pkgconfig-0.12.0.tar.gz +317a7c4003536cb64f4c64ff64f51dc8 pkgconfig-0.14.0.tar.gz