rpms/mingw32-filesystem/devel mingw32-filesystem.spec, 1.12, 1.13 mingw32-macros.mingw32, 1.7, 1.8

[Richard W.M. Jones]

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-filesystem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3422

Modified Files:
    mingw32-filesystem.spec mingw32-macros.mingw32 
Log Message:
- Use PKG_CONFIG_LIBDIR instead of PKG_CONFIG_PATH so that native pkgconfig
  is never searched.

Index: mingw32-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-filesystem/devel/mingw32-filesystem.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mingw32-filesystem.spec	26 Jan 2009 17:21:27 -0000	1.12
+++ mingw32-filesystem.spec	30 Jan 2009 09:38:05 -0000	1.13
@@ -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  - 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  - 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
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mingw32-macros.mingw32	24 Jan 2009 18:11:43 -0000	1.7
+++ mingw32-macros.mingw32	30 Jan 2009 09:38:05 -0000	1.8
@@ -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_"`; \

[Farkas Levente]

Richard W.M. Jones wrote:
> Author: rjones
>
> Update of /cvs/pkgs/rpms/mingw32-filesystem/devel
> In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3422
>
> Modified Files:
>    mingw32-filesystem.spec mingw32-macros.mingw32 
> Log Message:
> Use PKG_CONFIG_LIBDIR instead of PKG_CONFIG_PATH so that native pkgconfig
> is never searched.
> Index: mingw32-filesystem.spec
>
> RCS file: /cvs/pkgs/rpms/mingw32-filesystem/devel/mingw32-filesystem.spec,v
> retrieving revision 1.12
> retrieving revision 1.13
> diff -u -r1.12 -r1.13
> --- mingw32-filesystem.spec	26 Jan 2009 17:21:27 -0000	1.12
> +++ mingw32-filesystem.spec	30 Jan 2009 09:38:05 -0000	1.13
> @@ -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  - 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  - 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
> retrieving revision 1.8
> diff -u -r1.7 -r1.8
> --- mingw32-macros.mingw32	24 Jan 2009 18:11:43 -0000	1.7
> +++ mingw32-macros.mingw32	30 Jan 2009 09:38:05 -0000	1.8
> @@ -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_"`; \

is it sure? in man pkg-config:
-----------------
       PKG_CONFIG_PATH
              A colon-separated (on Windows, semicolon-separated) list
of directories to search for .pc files.  The default directory will
always be searched after searching the path; the
              default is libdir/pkgconfig:datadir/pkgconfig where libdir
is the libdir where pkg-config and datadir is the datadir where
pkg-config was installed.
...
       PKG_CONFIG_LIBDIR
              Replaces the default pkg-config search directory.
-----------------
so it seems to me it should have to be
PKG_CONFIG_LIBDIR="%{_mingw32_libdir}
isn't it?

[Richard W.M. Jones]

On Fri, Jan 30, 2009 at 11:01:22AM +0100, Farkas Levente wrote:
>    PKG_CONFIG_LIBDIR
>           Replaces the default pkg-config search directory.
>
> so it seems to me it should have to be
> PKG_CONFIG_LIBDIR="%{_mingw32_libdir}
> isn't it?

I think the documentation is wrong:

$ ls /usr/i686-pc-mingw32/sys-root/mingw/lib/pkgconfig/cairo-win32.pc 
/usr/i686-pc-mingw32/sys-root/mingw/lib/pkgconfig/cairo-win32.pc
$ PKG_CONFIG_LIBDIR=/usr/i686-pc-mingw32/sys-root/mingw/lib \
  pkg-config --exists cairo-win32 && echo yes
$ PKG_CONFIG_LIBDIR=/usr/i686-pc-mingw32/sys-root/mingw/lib/pkgconfig \
  pkg-config --exists cairo-win32 && echo yes
yes

Anyway, if the path is wrong in mingw32-filesystem we'll soon get some
very serious build errors.  I'm about to add two new packages to
Fedora so we'll see ...

Rich.