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

Only set the environment variable PKG_CONFIG_LIBDIR in the cmake macros

Browse Source 
- 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
This commit is contained in:
Erik van Pienbroek 2013-06-02 17:31:30 +02:00
parent a737f03ae2
commit 6f9eccdae6
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
macros.mingw32
View File

@ -123,6 +123,7 @@
infodir=%{mingw32_infodir} infodir=%{mingw32_infodir}
%mingw32_cmake %{mingw32_env} ; \ %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=.; \\\ if test -f CMakeLists.txt; then __mingw32_topdir=.; \\\
elif test -f ../CMakeLists.txt; then __mingw32_topdir=..; \\\ elif test -f ../CMakeLists.txt; then __mingw32_topdir=..; \\\
else __mingw32_topdir=""; fi; \\\ else __mingw32_topdir=""; fi; \\\
@ -142,6 +143,7 @@
"$@" $__mingw32_topdir "$@" $__mingw32_topdir
%mingw32_cmake_kde4 %{mingw32_env} ; \ %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=.; \\\ if test -f CMakeLists.txt; then __mingw32_topdir=.; \\\
elif test -f ../CMakeLists.txt; then __mingw32_topdir=..; \\\ elif test -f ../CMakeLists.txt; then __mingw32_topdir=..; \\\
else __mingw32_topdir=""; fi; \\\ else __mingw32_topdir=""; fi; \\\

2
macros.mingw64
View File

@ -123,6 +123,7 @@
infodir=%{mingw64_infodir} infodir=%{mingw64_infodir}
%mingw64_cmake %{mingw64_env} ; \ %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=.; \\\ if test -f CMakeLists.txt; then __mingw64_topdir=.; \\\
elif test -f ../CMakeLists.txt; then __mingw64_topdir=..; \\\ elif test -f ../CMakeLists.txt; then __mingw64_topdir=..; \\\
else __mingw64_topdir=""; fi; \\\ else __mingw64_topdir=""; fi; \\\
@ -142,6 +143,7 @@
"$@" $__mingw64_topdir "$@" $__mingw64_topdir
%mingw64_cmake_kde4 %{mingw64_env} ; \ %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=.; \\\ if test -f CMakeLists.txt; then __mingw64_topdir=.; \\\
elif test -f ../CMakeLists.txt; then __mingw64_topdir=..; \\\ elif test -f ../CMakeLists.txt; then __mingw64_topdir=..; \\\
else __mingw64_topdir=""; fi; \\\ else __mingw64_topdir=""; fi; \\\

8
mingw-filesystem.spec
View File

@ -2,7 +2,7 @@
Name: mingw-filesystem Name: mingw-filesystem
Version: 98 Version: 98
Release: 1%{?dist} Release: 2%{?dist}
Summary: MinGW cross compiler base filesystem and environment Summary: MinGW cross compiler base filesystem and environment
Group: Development/Libraries Group: Development/Libraries
@ -248,6 +248,12 @@ install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/mingw/
%changelog %changelog
* Sun Jun 2 2013 Erik van Pienbroek <epienbro@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@fedoraproject.org> - 98-1 * Sun May 12 2013 Erik van Pienbroek <epienbro@fedoraproject.org> - 98-1
- Removed the use of the environment variable PKG_CONFIG_LIBDIR - Removed the use of the environment variable PKG_CONFIG_LIBDIR
While building binaries the tool {i686,x86_64}-w64-mingw32-pkg-config While building binaries the tool {i686,x86_64}-w64-mingw32-pkg-config