ayankov/Botan
SHA256
1
0
Fork 0
forked from pool/Botan
Code Pull Requests Activity

Accepting request 131010 from openSUSE:Factory:ARM

Browse Source 
- don't fiddle with march settings, we want the distro defaults
  (fixes build on ARM)

OBS-URL: https://build.opensuse.org/request/show/131010
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/Botan?expand=0&rev=33
This commit is contained in:
Ismail Dönmez 2012-08-16 11:36:27 +00:00 committed by Git OBS Bridge
parent 6be638a831
commit f94b14708a
3 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Botan.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Aug 16 09:06:44 UTC 2012 - dmueller@suse.com
- don't fiddle with march settings, we want the distro defaults
(fixes build on ARM)
-------------------------------------------------------------------
Tue Feb 7 08:04:05 UTC 2012 - coolo@suse.com

10
Botan.spec
View File

@ -15,6 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%define version_suffix 1_10-0
%define short_version 1.10
@ -33,8 +34,11 @@ Patch2: Botan-fix_install_paths.patch
Patch4: Botan-no-buildtime.patch
Patch5: Botan-qt_thread_support.patch
Patch6: Botan-fix_pkgconfig.patch
Patch7: dont-set-mach-value.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: zlib, bzip2 >= 1.0.2, gmp >= 4.1
Requires: bzip2 >= 1.0.2
Requires: gmp >= 4.1
Requires: zlib
BuildRequires: bzip2 >= 1.0.2
BuildRequires: gcc-c++
BuildRequires: gmp-devel
@ -65,7 +69,8 @@ supported, including RSA, DSA, DES, AES, MD5, and SHA-1.
%package -n libbotan-devel
Summary: Development files for Botan
Group: Development/Libraries/C and C++
Requires: gmp-devel libbz2-devel
Requires: gmp-devel
Requires: libbz2-devel
Provides: Botan-devel = %{version}
Obsoletes: Botan-devel < %{version}
Requires: libbotan-%{version_suffix} = %{version}
@ -84,6 +89,7 @@ programs that use the Botan library.
%patch4
%patch5
%patch6
%patch7
%build
export RPM_OPT_FLAGS

13
dont-set-mach-value.diff Normal file
View File

@ -0,0 +1,13 @@
We don't want any fiddling with -march, our flags via %optflags are always right
--- configure.py
+++ configure.py
@@ -1081,7 +1081,7 @@
options.cpu, options.debug_build),
'lib_opt': cc.library_opt_flags(options),
- 'mach_opt': cc.mach_opts(options.arch, options.cpu),
+ 'mach_opt': '',
'check_opt': '' if options.no_optimizations else cc.check_opt_flags,
'lang_flags': cc.lang_flags + options.extra_flags,
'warn_flags': warning_flags(cc.warning_flags,