rpms/mingw-filesystem
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Adjusted PKG_CONFIG_LIBDIR to also search in _mingw32_datadir/pkgconfig/

Browse Source 
Right now only mingw32-spice-protocol drops files in share/pkgconfig/,
but there are most likely more packages to come.
This commit is contained in:
Kalev Lember 2011-05-24 10:50:37 +03:00
parent e9ebc7111d
commit 9781763c8b
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
macros.mingw32
View File

@ -72,7 +72,7 @@ package or when debugging this package.\
%{nil} %{nil}
%_mingw32_env HOST_CC=gcc; export HOST_CC; \ %_mingw32_env HOST_CC=gcc; export HOST_CC; \
PKG_CONFIG_LIBDIR="%{_mingw32_libdir}/pkgconfig"; export PKG_CONFIG_LIBDIR; \ PKG_CONFIG_LIBDIR="%{_mingw32_libdir}/pkgconfig:%{_mingw32_datadir}/pkgconfig"; export PKG_CONFIG_LIBDIR; \
unset PKG_CONFIG_PATH; \ unset PKG_CONFIG_PATH; \
_PREFIX="%{_bindir}/%{_mingw32_target}-"; \ _PREFIX="%{_bindir}/%{_mingw32_target}-"; \
for i in `ls -1 ${_PREFIX}* | grep -v 'gcc-'`; do \ for i in `ls -1 ${_PREFIX}* | grep -v 'gcc-'`; do \
@ -97,7 +97,7 @@ package or when debugging this package.\
unset x i unset x i
%_mingw32_pkg_config \ %_mingw32_pkg_config \
PKG_CONFIG_LIBDIR="%{_mingw32_libdir}/pkgconfig" pkg-config PKG_CONFIG_LIBDIR="%{_mingw32_libdir}/pkgconfig:%{_mingw32_datadir}/pkgconfig" pkg-config
%_mingw32_configure %{_mingw32_env} ; \ %_mingw32_configure %{_mingw32_env} ; \
__mingw32_topdir=.; if ! test -x configure; then __mingw32_topdir=..; fi; \\\ __mingw32_topdir=.; if ! test -x configure; then __mingw32_topdir=..; fi; \\\

7
mingw32-filesystem.spec
View File

@ -1,8 +1,8 @@
%define debug_package %{nil} %define debug_package %{nil}
Name: mingw32-filesystem Name: mingw32-filesystem
Version: 68 Version: 69
Release: 3%{?dist} Release: 1%{?dist}
Summary: MinGW base filesystem and environment Summary: MinGW base filesystem and environment
Group: Development/Libraries Group: Development/Libraries
@ -169,6 +169,9 @@ install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/mingw32
%changelog %changelog
* Tue May 24 2011 Kalev Lember <kalev@smartlink.ee> - 69-1
- Adjusted PKG_CONFIG_LIBDIR to also search in _mingw32_datadir/pkgconfig/
* Mon May 23 2011 Kalev Lember <kalev@smartlink.ee> - 68-3 * Mon May 23 2011 Kalev Lember <kalev@smartlink.ee> - 68-3
- Own etc/, share/pkgconfig/, share/xml/ directories - Own etc/, share/pkgconfig/, share/xml/ directories