[klatexformula] the buildsystem sets the proper 64/32-bit compile flags (fixes build on s390)
Dan Horák
sharkcz at fedoraproject.org
Tue Apr 26 08:52:57 UTC 2011
commit 76beef02cde77aa84a86f850dc039b8f426a82e3
Author: Dan Horák <dan at danny.cz>
Date: Tue Apr 26 10:52:45 2011 +0200
the buildsystem sets the proper 64/32-bit compile flags (fixes build on s390)
klatexformula-3.2.3-flags.patch | 17 +++++++++++++++++
klatexformula.spec | 6 ++++++
2 files changed, 23 insertions(+), 0 deletions(-)
---
diff --git a/klatexformula-3.2.3-flags.patch b/klatexformula-3.2.3-flags.patch
new file mode 100644
index 0000000..a1e2130
--- /dev/null
+++ b/klatexformula-3.2.3-flags.patch
@@ -0,0 +1,17 @@
+diff -up klatexformula-3.2.3/CMakeLists.txt.flags klatexformula-3.2.3/CMakeLists.txt
+--- klatexformula-3.2.3/CMakeLists.txt.flags 2011-04-12 15:30:42.000000000 +0200
++++ klatexformula-3.2.3/CMakeLists.txt 2011-04-26 10:42:39.000000000 +0200
+@@ -281,13 +281,6 @@ if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+ else(CMAKE_SIZEOF_VOID_P EQUAL 8)
+ set(KLF_TARGET_ARCH_64 FALSE CACHE BOOL "Build for 64-bit platform")
+ endif(CMAKE_SIZEOF_VOID_P EQUAL 8)
+-if(KLF_TARGET_ARCH_64)
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64")
+- message(STATUS "Compiling for 64-bit architecture (KLF_TARGET_ARCH_64=ON/OFF)")
+-else(KLF_TARGET_ARCH_64)
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
+- message(STATUS "Compiling for 32-bit architecture (KLF_TARGET_ARCH_64=ON/OFF)")
+-endif(KLF_TARGET_ARCH_64)
+ KLFCMakeSetVarChanged(KLF_TARGET_ARCH_64)
+
+ KLFGetCMakeVarChanged(KLF_LIB_SUFFIX) # Also used later in klfinstallpaths.cmake
diff --git a/klatexformula.spec b/klatexformula.spec
index f7141d7..4ddf0c1 100644
--- a/klatexformula.spec
+++ b/klatexformula.spec
@@ -6,6 +6,8 @@ Group: Applications/Publishing
License: GPLv2+
URL: http://klatexformula.sourceforge.net/
Source0: http://downloads.sourceforge.net/klatexformula/%{name}-%{version}.tar.gz
+# the buildsystem sets the proper 64/32-bit compile flags
+Patch0: %{name}-3.2.3-flags.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: kdelibs-devel
BuildRequires: desktop-file-utils
@@ -64,6 +66,7 @@ Development files for the libklfbackend.
%prep
%setup -q
+%patch0 -p1 -b .flags
%build
mkdir -p %{_target_platform}
@@ -154,6 +157,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_includedir}/klfbackend
%changelog
+* Tue Apr 26 2011 Dan Horák <dan[at]danny.cz> - 3.2.3-3
+- the buildsystem sets the proper 64/32-bit compile flags (fixes build on s390)
+
* Wed Apr 13 2011 Alexey Kurov <nucleo at fedoraproject.org> - 3.2.3-2
- require qt4 version used at build time
More information about the scm-commits
mailing list