[mingw-filesystem: 15/73] Unset PKG_CONFIG_PATH because /usr/lib/rpm/macros sets it (Erik van Pienbroek).

Kalev Lember kalev at fedoraproject.org
Thu Feb 23 19:13:53 UTC 2012


commit 2e732f340c07987345cb1ed6b41e527355b09393
Author: Richard W.M. Jones <rjones at fedoraproject.org>
Date:   Sun Feb 1 23:15:40 2009 +0000

    Unset PKG_CONFIG_PATH because /usr/lib/rpm/macros sets it (Erik van
        Pienbroek).

 mingw32-filesystem.spec |    6 +++++-
 mingw32-macros.mingw32  |    1 +
 2 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec
index ca9105f..7bcb066 100644
--- a/mingw32-filesystem.spec
+++ b/mingw32-filesystem.spec
@@ -1,7 +1,7 @@
 %define debug_package %{nil}
 
 Name:           mingw32-filesystem
-Version:        45
+Version:        46
 Release:        1%{?dist}
 Summary:        MinGW base filesystem and environment
 
@@ -153,6 +153,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Feb  1 2009 Richard W.M. Jones <rjones at redhat.com> - 46-1
+- Unset PKG_CONFIG_PATH because /usr/lib/rpm/macros sets it (Erik van
+  Pienbroek).
+
 * 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.
diff --git a/mingw32-macros.mingw32 b/mingw32-macros.mingw32
index 5be5230..58cc2b4 100644
--- a/mingw32-macros.mingw32
+++ b/mingw32-macros.mingw32
@@ -55,6 +55,7 @@
 
 %_mingw32_env HOST_CC=gcc; export HOST_CC; \
   PKG_CONFIG_LIBDIR="%{_mingw32_libdir}/pkgconfig"; export PKG_CONFIG_LIBDIR; \
+  unset PKG_CONFIG_PATH; \
   _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 scm-commits mailing list