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

Don't set LIB_INSTALL_DIR any more in the CMake macros as it breaks CPack (RHBZ #1152696)

Browse Source
This commit is contained in:
Erik van Pienbroek 2015-04-10 22:56:26 +02:00
parent 7daa010253
commit 2031da5ebb
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
macros.mingw32
View File

@ -131,7 +131,6 @@
PATH=%{_prefix}/%{mingw32_target}/bin:$PATH %__cmake \\\ PATH=%{_prefix}/%{mingw32_target}/bin:$PATH %__cmake \\\
-DCMAKE_TOOLCHAIN_FILE=/usr/share/mingw/toolchain-mingw32.cmake \\\ -DCMAKE_TOOLCHAIN_FILE=/usr/share/mingw/toolchain-mingw32.cmake \\\
-DBUILD_SHARED_LIBS:BOOL=ON \\\ -DBUILD_SHARED_LIBS:BOOL=ON \\\
-DLIB_INSTALL_DIR:PATH=%{mingw32_libdir} \\\
-DSYSCONF_INSTALL_DIR:PATH=%{mingw32_sysconfdir} \\\ -DSYSCONF_INSTALL_DIR:PATH=%{mingw32_sysconfdir} \\\
-DSHARE_INSTALL_PREFIX:PATH=%{mingw32_datadir} \\\ -DSHARE_INSTALL_PREFIX:PATH=%{mingw32_datadir} \\\
-DCMAKE_INSTALL_PREFIX:PATH=%{mingw32_prefix} \\\ -DCMAKE_INSTALL_PREFIX:PATH=%{mingw32_prefix} \\\

1
macros.mingw64
View File

@ -131,7 +131,6 @@
PATH=%{_prefix}/%{mingw64_target}/bin:$PATH %__cmake \\\ PATH=%{_prefix}/%{mingw64_target}/bin:$PATH %__cmake \\\
-DCMAKE_TOOLCHAIN_FILE=/usr/share/mingw/toolchain-mingw64.cmake \\\ -DCMAKE_TOOLCHAIN_FILE=/usr/share/mingw/toolchain-mingw64.cmake \\\
-DBUILD_SHARED_LIBS:BOOL=ON \\\ -DBUILD_SHARED_LIBS:BOOL=ON \\\
-DLIB_INSTALL_DIR:PATH=%{mingw64_libdir} \\\
-DSYSCONF_INSTALL_DIR:PATH=%{mingw64_sysconfdir} \\\ -DSYSCONF_INSTALL_DIR:PATH=%{mingw64_sysconfdir} \\\
-DSHARE_INSTALL_PREFIX:PATH=%{mingw64_datadir} \\\ -DSHARE_INSTALL_PREFIX:PATH=%{mingw64_datadir} \\\
-DCMAKE_INSTALL_PREFIX:PATH=%{mingw64_prefix} \\\ -DCMAKE_INSTALL_PREFIX:PATH=%{mingw64_prefix} \\\

3
mingw-filesystem.spec
View File

@ -327,6 +327,9 @@ install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/mingw/
* When using the CMake wrappers, prevent CFLAGS and CXXFLAGS * When using the CMake wrappers, prevent CFLAGS and CXXFLAGS
from being set unless they're already set in the current from being set unless they're already set in the current
environment (RHBZ #1136069) environment (RHBZ #1136069)
* Don't set LIB_INSTALL_DIR any more in the CMake macros
as it breaks CPack and isn't needed by any of the
Fedora MinGW packages (RHBZ #1152696)
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild