epienbro pushed to mingw-filesystem (f21). "Don't set LIB_INSTALL_DIR any more in the CMake macros as it breaks CPack (RHBZ #1152696)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Sat Apr 11 18:52:32 UTC 2015
>From 2031da5ebbd4b03e5bbdc4c83dc337a651e90e14 Mon Sep 17 00:00:00 2001
From: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Fri, 10 Apr 2015 22:56:26 +0200
Subject: Don't set LIB_INSTALL_DIR any more in the CMake macros as it breaks
CPack (RHBZ #1152696)
diff --git a/macros.mingw32 b/macros.mingw32
index 644085f..4a87dcf 100644
--- a/macros.mingw32
+++ b/macros.mingw32
@@ -131,7 +131,6 @@
PATH=%{_prefix}/%{mingw32_target}/bin:$PATH %__cmake \\\
-DCMAKE_TOOLCHAIN_FILE=/usr/share/mingw/toolchain-mingw32.cmake \\\
-DBUILD_SHARED_LIBS:BOOL=ON \\\
- -DLIB_INSTALL_DIR:PATH=%{mingw32_libdir} \\\
-DSYSCONF_INSTALL_DIR:PATH=%{mingw32_sysconfdir} \\\
-DSHARE_INSTALL_PREFIX:PATH=%{mingw32_datadir} \\\
-DCMAKE_INSTALL_PREFIX:PATH=%{mingw32_prefix} \\\
diff --git a/macros.mingw64 b/macros.mingw64
index c1d7893..8d18768 100644
--- a/macros.mingw64
+++ b/macros.mingw64
@@ -131,7 +131,6 @@
PATH=%{_prefix}/%{mingw64_target}/bin:$PATH %__cmake \\\
-DCMAKE_TOOLCHAIN_FILE=/usr/share/mingw/toolchain-mingw64.cmake \\\
-DBUILD_SHARED_LIBS:BOOL=ON \\\
- -DLIB_INSTALL_DIR:PATH=%{mingw64_libdir} \\\
-DSYSCONF_INSTALL_DIR:PATH=%{mingw64_sysconfdir} \\\
-DSHARE_INSTALL_PREFIX:PATH=%{mingw64_datadir} \\\
-DCMAKE_INSTALL_PREFIX:PATH=%{mingw64_prefix} \\\
diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 5f2b18a..f645a88 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -327,6 +327,9 @@ install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/mingw/
* When using the CMake wrappers, prevent CFLAGS and CXXFLAGS
from being set unless they're already set in the current
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 at lists.fedoraproject.org>
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/mingw-filesystem.git/commit/?h=f21&id=2031da5ebbd4b03e5bbdc4c83dc337a651e90e14
More information about the scm-commits
mailing list