Suggested patch to use PKG_CONFIG_LIBDIR (was: Re: [PATCH] Ignore the default %libdir/pkgconfig directory)

Richard W.M. Jones rjones at redhat.com
Wed Jan 28 23:56:07 UTC 2009


Suggested patch is attached.

Rich.

-- 
Richard Jones, Emerging Technologies, Red Hat  http://et.redhat.com/~rjones
virt-p2v converts physical machines to virtual machines.  Boot with a
live CD or over the network (PXE) and turn machines into Xen guests.
http://et.redhat.com/~rjones/virt-p2v
-------------- next part --------------
? .build-44-1.fc11.log
? mingw32-filesystem-44
? mingw32-filesystem-44-1.fc11.src.rpm
? noarch
Index: mingw32-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-filesystem/devel/mingw32-filesystem.spec,v
retrieving revision 1.12
diff -u -r1.12 mingw32-filesystem.spec
--- mingw32-filesystem.spec	26 Jan 2009 17:21:27 -0000	1.12
+++ mingw32-filesystem.spec	28 Jan 2009 23:55:29 -0000
@@ -1,7 +1,7 @@
 %define debug_package %{nil}
 
 Name:           mingw32-filesystem
-Version:        44
+Version:        45
 Release:        1%{?dist}
 Summary:        MinGW base filesystem and environment
 
@@ -153,6 +153,10 @@
 
 
 %changelog
+* Wed Jan 28 2009 Richard W.M. Jones <rjones at redhat.com> - 45-1
+- Use PKG_CONFIG_LIBDIR instead of PKG_CONFIG_PATH so that native pkgconfig
+  is never searched.
+
 * Mon Jan 26 2009 Richard W.M. Jones <rjones at redhat.com> - 44-1
 - Install rpmlint overrides file to suppress some rpmlint warnings.
 
Index: mingw32-macros.mingw32
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-filesystem/devel/mingw32-macros.mingw32,v
retrieving revision 1.7
diff -u -r1.7 mingw32-macros.mingw32
--- mingw32-macros.mingw32	24 Jan 2009 18:11:43 -0000	1.7
+++ mingw32-macros.mingw32	28 Jan 2009 23:55:29 -0000
@@ -54,7 +54,7 @@
 %_mingw32_findrequires    /usr/lib/rpm/mingw32-find-requires.sh
 
 %_mingw32_env HOST_CC=gcc; export HOST_CC; \
-  PKG_CONFIG_PATH="%{_mingw32_libdir}/pkgconfig"; export PKG_CONFIG_PATH; \
+  PKG_CONFIG_LIBDIR="%{_mingw32_libdir}/pkgconfig"; export PKG_CONFIG_LIBDIR; \
   _PREFIX="%{_bindir}/%{_mingw32_target}-"; \
   for i in `ls -1 ${_PREFIX}* | grep -v 'gcc-'`; do \
     x=`echo $i|sed "s,${_PREFIX},,"|tr "a-z+-" "A-ZX_"`; \


More information about the mingw mailing list