[mingw-filesystem] Only set the environment variable PKG_CONFIG_LIBDIR in the cmake macros
Erik van Pienbroek
epienbro at fedoraproject.org
Sun Jun 2 15:32:30 UTC 2013
commit 6f9eccdae6c84cf8ed84fa2c3984e28283f40b3e
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Sun Jun 2 17:31:30 2013 +0200
Only set the environment variable PKG_CONFIG_LIBDIR in the cmake macros
- Only set the environment variable PKG_CONFIG_LIBDIR when
using the macros %mingw32_cmake, %mingw32_cmake_kde4,
%mingw64_cmake or %mingw64_cmake_kde4
- Fixes FTBFS of the mingw-matahari package
macros.mingw32 | 2 ++
macros.mingw64 | 2 ++
mingw-filesystem.spec | 8 +++++++-
3 files changed, 11 insertions(+), 1 deletions(-)
---
diff --git a/macros.mingw32 b/macros.mingw32
index 249eb06..36a7ac4 100644
--- a/macros.mingw32
+++ b/macros.mingw32
@@ -123,6 +123,7 @@
infodir=%{mingw32_infodir}
%mingw32_cmake %{mingw32_env} ; \
+ PKG_CONFIG_LIBDIR="%{mingw32_libdir}/pkgconfig:%{mingw32_datadir}/pkgconfig"; export PKG_CONFIG_LIBDIR; \
if test -f CMakeLists.txt; then __mingw32_topdir=.; \\\
elif test -f ../CMakeLists.txt; then __mingw32_topdir=..; \\\
else __mingw32_topdir=""; fi; \\\
@@ -142,6 +143,7 @@
"$@" $__mingw32_topdir
%mingw32_cmake_kde4 %{mingw32_env} ; \
+ PKG_CONFIG_LIBDIR="%{mingw32_libdir}/pkgconfig:%{mingw32_datadir}/pkgconfig"; export PKG_CONFIG_LIBDIR; \
if test -f CMakeLists.txt; then __mingw32_topdir=.; \\\
elif test -f ../CMakeLists.txt; then __mingw32_topdir=..; \\\
else __mingw32_topdir=""; fi; \\\
diff --git a/macros.mingw64 b/macros.mingw64
index 587405d..e91aae7 100644
--- a/macros.mingw64
+++ b/macros.mingw64
@@ -123,6 +123,7 @@
infodir=%{mingw64_infodir}
%mingw64_cmake %{mingw64_env} ; \
+ PKG_CONFIG_LIBDIR="%{mingw64_libdir}/pkgconfig:%{mingw64_datadir}/pkgconfig"; export PKG_CONFIG_LIBDIR; \
if test -f CMakeLists.txt; then __mingw64_topdir=.; \\\
elif test -f ../CMakeLists.txt; then __mingw64_topdir=..; \\\
else __mingw64_topdir=""; fi; \\\
@@ -142,6 +143,7 @@
"$@" $__mingw64_topdir
%mingw64_cmake_kde4 %{mingw64_env} ; \
+ PKG_CONFIG_LIBDIR="%{mingw64_libdir}/pkgconfig:%{mingw64_datadir}/pkgconfig"; export PKG_CONFIG_LIBDIR; \
if test -f CMakeLists.txt; then __mingw64_topdir=.; \\\
elif test -f ../CMakeLists.txt; then __mingw64_topdir=..; \\\
else __mingw64_topdir=""; fi; \\\
diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 7df0fe7..3a387f3 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -2,7 +2,7 @@
Name: mingw-filesystem
Version: 98
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: MinGW cross compiler base filesystem and environment
Group: Development/Libraries
@@ -248,6 +248,12 @@ install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/mingw/
%changelog
+* Sun Jun 2 2013 Erik van Pienbroek <epienbro at fedoraproject.org> - 98-2
+- Only set the environment variable PKG_CONFIG_LIBDIR when
+ using the macros %%mingw32_cmake, %%mingw32_cmake_kde4,
+ %%mingw64_cmake or %%mingw64_cmake_kde4
+- Fixes FTBFS of the mingw-matahari package
+
* Sun May 12 2013 Erik van Pienbroek <epienbro at fedoraproject.org> - 98-1
- Removed the use of the environment variable PKG_CONFIG_LIBDIR
While building binaries the tool {i686,x86_64}-w64-mingw32-pkg-config
More information about the scm-commits
mailing list