From 330549628aa3b86a41a3e08248b9003294b6a16db6bf7414860f14000b7e9fbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Sat, 7 Mar 2015 10:51:36 +0000 Subject: [PATCH] Accepting request 289674 from home:scarabeus_iv - Remove full path from compiler to allow ccache override - This might break build if your package breaks $PATH content - Tested on KDE and it build and some misc apps too. If something fails it should be fixed per app basis OBS-URL: https://build.opensuse.org/request/show/289674 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=201 --- cmake.changes | 12 +++++------- cmake.spec | 2 +- opensuse_rules.cmake | 4 ++-- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/cmake.changes b/cmake.changes index aa52113..36adf48 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,13 +1,11 @@ ------------------------------------------------------------------- -Thu Mar 5 20:30:03 UTC 2015 - tchvatal@suse.com +Fri Mar 6 12:47:35 UTC 2015 - tchvatal@suse.com -- Add path back as it breaks some builds when using relative path - -------------------------------------------------------------------- -Thu Mar 5 13:16:59 UTC 2015 - tchvatal@suse.com - -- Try to remove full path from compiler to allow ccache override +- Remove full path from compiler to allow ccache override via path +- This might break build if your package breaks $PATH content +- Tested on KDE and it build and some misc apps too. + If something fails it should be fixed per app basis ------------------------------------------------------------------- Mon Feb 23 09:21:55 UTC 2015 - meissner@suse.com diff --git a/cmake.spec b/cmake.spec index 7b292eb..64507eb 100644 --- a/cmake.spec +++ b/cmake.spec @@ -66,7 +66,7 @@ CMake is a cross-platform, open-source build system %build export CXXFLAGS="%{optflags}" -export CFLAGS="$CXXFLAGS" +export CFLAGS="%{optflags}" ./configure \ --prefix=%{_prefix} \ --datadir=/share/%{name} \ diff --git a/opensuse_rules.cmake b/opensuse_rules.cmake index 9a29bcd..7d5e4aa 100644 --- a/opensuse_rules.cmake +++ b/opensuse_rules.cmake @@ -1,8 +1,8 @@ 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_COMPILER /usr/bin/cc CACHE FILEPATH "C compiler" FORCE) +SET (CMAKE_C_COMPILER cc CACHE FILEPATH "C compiler" FORCE) SET (CMAKE_C_COMPILE_OBJECT " -o -c " CACHE STRING "C compile command" FORCE) -SET (CMAKE_CXX_COMPILER /usr/bin/c++ CACHE FILEPATH "C++ compiler" FORCE) +SET (CMAKE_CXX_COMPILER c++ CACHE FILEPATH "C++ compiler" 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)