[PATCH] Unset PKG_CONFIG_PATH
Richard W.M. Jones
rjones at redhat.com
Sun Feb 1 23:15:10 UTC 2009
Erik van Pienbroek found that /usr/lib/rpm/macros was setting
$PKG_CONFIG_PATH. This was confusing pkg-config so it was still
finding the system libraries, and our previous change had broken the
mingw32-atk build.
I have added the following patch (from Erik) to fix this.
Rich.
--
Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones
Read my OCaml programming blog: http://camltastic.blogspot.com/
Fedora now supports 68 OCaml packages (the OPEN alternative to F#)
http://cocan.org/getting_started_with_ocaml_on_red_hat_and_fedora
-------------- 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.13
diff -u -r1.13 mingw32-filesystem.spec
--- mingw32-filesystem.spec 30 Jan 2009 09:38:05 -0000 1.13
+++ mingw32-filesystem.spec 1 Feb 2009 23:12:48 -0000
@@ -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 @@
%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.
Index: mingw32-macros.mingw32
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-filesystem/devel/mingw32-macros.mingw32,v
retrieving revision 1.8
diff -u -r1.8 mingw32-macros.mingw32
--- mingw32-macros.mingw32 30 Jan 2009 09:38:05 -0000 1.8
+++ mingw32-macros.mingw32 1 Feb 2009 23:12:48 -0000
@@ -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 mingw
mailing list