From 9517bf9dfc012ffd1bbaac12393c347bc567848a8fe33fc0c1223ac142379997 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 3 Dec 2015 09:46:18 +0000 Subject: [PATCH] - With all the cnages we dont need cmake.rules anymore, so try to remove them completely and lets see what fails OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=234 --- cmake.changes | 6 ++++++ cmake.macros | 3 +-- cmake.spec | 6 ------ opensuse_rules.cmake | 6 ------ 4 files changed, 7 insertions(+), 14 deletions(-) delete mode 100644 opensuse_rules.cmake diff --git a/cmake.changes b/cmake.changes index 66497e7..46c6881 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Dec 3 09:40:02 UTC 2015 - tchvatal@suse.com + +- With all the cnages we dont need cmake.rules anymore, so try to + remove them completely and lets see what fails + ------------------------------------------------------------------- Tue Dec 1 20:27:34 UTC 2015 - tchvatal@suse.com diff --git a/cmake.macros b/cmake.macros index 19de682..416c379 100644 --- a/cmake.macros +++ b/cmake.macros @@ -32,8 +32,7 @@ -DBUILD_STATIC_LIBS:BOOL=OFF \\\ -DCMAKE_COLOR_MAKEFILE:BOOL=OFF \\\ -DCMAKE_INSTALL_DO_STRIP:BOOL=OFF \\\ - -DCMAKE_MODULES_INSTALL_DIR=%{_datadir}/cmake/Modules \\\ - -DCMAKE_USER_MAKE_RULES_OVERRIDE="%{_datadir}/cmake/Modules/opensuse_rules.cmake" + -DCMAKE_MODULES_INSTALL_DIR=%{_datadir}/cmake/Modules %make_jobs \ %__make %{?_smp_mflags} VERBOSE=1 diff --git a/cmake.spec b/cmake.spec index 35d61a4..28af20c 100644 --- a/cmake.spec +++ b/cmake.spec @@ -25,7 +25,6 @@ Group: Development/Tools/Building Url: http://www.cmake.org/ Source0: http://www.cmake.org/files/v3.4/%{name}-%{version}.tar.gz Source1: cmake.macros -Source2: opensuse_rules.cmake Source3: cmake.attr Source4: cmake.prov Source5: http://www.cmake.org/files/v3.4/%{name}-%{version}-SHA-256.txt @@ -90,11 +89,6 @@ mkdir -p %{buildroot}%{_libdir}/cmake find %{buildroot}%{_datadir}/cmake -type f -print0 | xargs -0 chmod 644 # rpm macros install -m644 %{SOURCE1} -D %{buildroot}%{_sysconfdir}/rpm/macros.cmake -# buildrules -install -m644 %{SOURCE2} -D %{buildroot}%{_datadir}/cmake/Modules/opensuse_rules.cmake -sed -i \ - -e 's:OPTFLAGS:%{optflags}:g' \ - %{buildroot}%{_datadir}/cmake/Modules/opensuse_rules.cmake # RPM auto provides install -p -m0644 -D %{SOURCE3} %{buildroot}%{_libexecdir}/rpm/fileattrs/cmake.attr diff --git a/opensuse_rules.cmake b/opensuse_rules.cmake deleted file mode 100644 index 8dfe2a0..0000000 --- a/opensuse_rules.cmake +++ /dev/null @@ -1,6 +0,0 @@ -SET (CMAKE_AR /usr/bin/ar CACHE FILEPATH "Archive manager" FORCE) -SET (CMAKE_ASM_COMPILE_OBJECT " OPTFLAGS -o -c " CACHE STRING "ASM compile command" FORCE) -SET (CMAKE_C_COMPILE_OBJECT " -o -c " CACHE STRING "C compile command" FORCE) -SET (CMAKE_CXX_COMPILE_OBJECT " -o -c " CACHE STRING "C++ compile command" FORCE) -SET (CMAKE_RANLIB /usr/bin/ranlib CACHE FILEPATH "Archive index generator" FORCE) -SET (PKG_CONFIG_EXECUTABLE /usr/bin/pkg-config CACHE FILEPATH "pkg-config executable" FORCE)