epienbro pushed to mingw-filesystem (f22). "Removed the cmake rpath references as mingw doesn't support rpath"
notifications at fedoraproject.org
notifications at fedoraproject.org
Sat Apr 11 18:53:10 UTC 2015
>From 5da13e552687d9db0dcf8b56bfda82885ff70dcf Mon Sep 17 00:00:00 2001
From: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Fri, 10 Apr 2015 19:26:18 +0200
Subject: Removed the cmake rpath references as mingw doesn't support rpath
diff --git a/macros.mingw32 b/macros.mingw32
index 2d73fe9..5a55519 100644
--- a/macros.mingw32
+++ b/macros.mingw32
@@ -129,7 +129,6 @@
-DCMAKE_TOOLCHAIN_FILE=/usr/share/mingw/toolchain-mingw32.cmake \\\
-DCMAKE_VERBOSE_MAKEFILE=ON \\\
-DBUILD_SHARED_LIBS:BOOL=ON \\\
- %{?_cmake_skip_rpath} \\\
-DLIB_INSTALL_DIR:PATH=%{mingw32_libdir} \\\
-DSYSCONF_INSTALL_DIR:PATH=%{mingw32_sysconfdir} \\\
-DSHARE_INSTALL_PREFIX:PATH=%{mingw32_datadir} \\\
diff --git a/macros.mingw64 b/macros.mingw64
index 58b2cc1..106bfe0 100644
--- a/macros.mingw64
+++ b/macros.mingw64
@@ -129,7 +129,6 @@
-DCMAKE_TOOLCHAIN_FILE=/usr/share/mingw/toolchain-mingw64.cmake \\\
-DCMAKE_VERBOSE_MAKEFILE=ON \\\
-DBUILD_SHARED_LIBS:BOOL=ON \\\
- %{?_cmake_skip_rpath} \\\
-DLIB_INSTALL_DIR:PATH=%{mingw64_libdir} \\\
-DSYSCONF_INSTALL_DIR:PATH=%{mingw64_sysconfdir} \\\
-DSHARE_INSTALL_PREFIX:PATH=%{mingw64_datadir} \\\
diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 6a2cd73..372fb5c 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -319,6 +319,7 @@ install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/mingw/
it was unused and broken anyway
* Made the RPM macros mingw32_cmake, mingw32_cmake_kde4,
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 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=f22&id=5da13e552687d9db0dcf8b56bfda82885ff70dcf
More information about the scm-commits
mailing list