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

Removed the cmake rpath references as mingw doesn't support rpath

Browse Source
This commit is contained in:
Erik van Pienbroek 2015-04-10 19:26:18 +02:00
parent a1d54d46a0
commit 5da13e5526
3 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
macros.mingw32
View File

@ -129,7 +129,6 @@
-DCMAKE_TOOLCHAIN_FILE=/usr/share/mingw/toolchain-mingw32.cmake \\\ -DCMAKE_TOOLCHAIN_FILE=/usr/share/mingw/toolchain-mingw32.cmake \\\
-DCMAKE_VERBOSE_MAKEFILE=ON \\\ -DCMAKE_VERBOSE_MAKEFILE=ON \\\
-DBUILD_SHARED_LIBS:BOOL=ON \\\ -DBUILD_SHARED_LIBS:BOOL=ON \\\
%{?_cmake_skip_rpath} \\\
-DLIB_INSTALL_DIR:PATH=%{mingw32_libdir} \\\ -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} \\\

1
macros.mingw64
View File

@ -129,7 +129,6 @@
-DCMAKE_TOOLCHAIN_FILE=/usr/share/mingw/toolchain-mingw64.cmake \\\ -DCMAKE_TOOLCHAIN_FILE=/usr/share/mingw/toolchain-mingw64.cmake \\\
-DCMAKE_VERBOSE_MAKEFILE=ON \\\ -DCMAKE_VERBOSE_MAKEFILE=ON \\\
-DBUILD_SHARED_LIBS:BOOL=ON \\\ -DBUILD_SHARED_LIBS:BOOL=ON \\\
%{?_cmake_skip_rpath} \\\
-DLIB_INSTALL_DIR:PATH=%{mingw64_libdir} \\\ -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} \\\

1
mingw-filesystem.spec
View File

@ -319,6 +319,7 @@ install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/mingw/
it was unused and broken anyway it was unused and broken anyway
* Made the RPM macros mingw32_cmake, mingw32_cmake_kde4, * Made the RPM macros mingw32_cmake, mingw32_cmake_kde4,
mingw64_cmake and mingw64_cmake_kde4 more generic mingw64_cmake and mingw64_cmake_kde4 more generic
* Removed the rpath references as mingw doesn't support rpath
* 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