[kactivities] horrible hack to allow build on el6

Rex Dieter rdieter at fedoraproject.org
Thu Mar 21 18:15:45 UTC 2013


commit 28bc22caeda24d86137db1f34299e2a952be2050
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Mar 21 13:15:04 2013 -0500

    horrible hack to allow build on el6

 kactivities.spec |   26 ++++++++++++++++++++++++++
 1 files changed, 26 insertions(+), 0 deletions(-)
---
diff --git a/kactivities.spec b/kactivities.spec
index c15fa3c..e3aa561 100644
--- a/kactivities.spec
+++ b/kactivities.spec
@@ -16,6 +16,12 @@ Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: nepomuk-core-devel >= %{version}
 
+%if 0%{?rhel} == 6
+# see http://people.centos.org/tru/devtools-1.1/
+BuildRequires: devtoolset-1.1-gcc-c++
+%global devtoolset 1
+%endif
+
 Requires: kdelibs4%{?_isa}%{?_kde4_version: >= %{_kde4_version}}
 
 # libkactivities moved from kdelibs, but turns out there's no actual conflicts
@@ -51,10 +57,30 @@ popd
 
 make %{?_smp_mflags} -C %{_target_platform}
 
+%if 0%{?devtoolset:1}
+# build missing pieces with separate compiler
+PATH=`scl enable devtoolset-1.1 'echo "$PATH"'`; export PATH
+
+CXXFLAGS=`echo $RPM_OPT_FLAGS | sed 's|-g |-gdwarf-3 -gstrict-dwarf |g'`
+
+mkdir -p %{_target_platform}-devtoolset
+pushd  %{_target_platform}-devtoolset
+%{cmake_kde4} ..
+popd
+
+make %{?_smp_mflags} -C %{_target_platform}-devtoolset/src/service
+make %{?_smp_mflags} -C %{_target_platform}-devtoolset/src/workspace
+%endif
+
 
 %install
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
+%if 0%{?devtoolset:1}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}-devtoolset/src/service
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}-devtoolset/src/workspace
+%endif
+
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig


More information about the scm-commits mailing list