[packages/intel-xed] - added default-abi patch (remove -m32/-m64 options from gcc; allows to build x32 library); release

qboosh qboosh at pld-linux.org
Tue Sep 24 16:53:41 CEST 2019


commit 6ab483887c8e6eb8eb8f299cc3859c060fe96835
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue Sep 24 16:56:44 2019 +0200

    - added default-abi patch (remove -m32/-m64 options from gcc; allows to build x32 library); release 2

 intel-xed.spec        |  4 +++-
 xed-default-abi.patch | 14 ++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
---
diff --git a/intel-xed.spec b/intel-xed.spec
index 350b834..6d9e3e9 100644
--- a/intel-xed.spec
+++ b/intel-xed.spec
@@ -2,7 +2,7 @@ Summary:	Intel X86 Encoder Decoder (Intel XED)
 Summary(pl.UTF-8):	Dekoder/koder rozkazów procesorów Intel X86 (Intel XED)
 Name:		intel-xed
 Version:	11.0.1
-Release:	1
+Release:	2
 License:	Apache v2.0
 Group:		Libraries
 #Source0Download: https://github.com/intelxed/xed/releases
@@ -12,6 +12,7 @@ Source0:	https://github.com/intelxed/xed/archive/%{version}/xed-%{version}.tar.g
 %define	mbuild_snap	20190524
 Source1:	https://github.com/intelxed/mbuild/archive/%{mbuild_gitref}/mbuild-%{mbuild_snap}.tar.gz
 # Source1-md5:	ab8443e971e321968390261ddcd4a43f
+Patch0:		xed-default-abi.patch
 URL:		https://github.com/intelxed/xed
 BuildRequires:	python3 >= 1:3
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -37,6 +38,7 @@ Pliki nagłówkowe bibliotek Intel XED.
 %prep
 %setup -q -n xed-%{version} -a1
 %{__mv} mbuild-%{mbuild_gitref} mbuild
+%patch0 -p1
 
 %build
 PYTHONPATH=$(pwd)/mbuild \
diff --git a/xed-default-abi.patch b/xed-default-abi.patch
new file mode 100644
index 0000000..05b33f2
--- /dev/null
+++ b/xed-default-abi.patch
@@ -0,0 +1,14 @@
+--- xed-11.0.1/mbuild/mbuild/build_env.py.orig	2019-05-23 21:36:17.000000000 +0200
++++ xed-11.0.1/mbuild/mbuild/build_env.py	2019-09-24 05:38:27.969582302 +0200
+@@ -100,11 +100,6 @@
+ 
+ def add_gnu_arch_flags(d):
+     """Accept a dictionary, return a string"""
+-    if d['compiler'] in ['gnu','clang'] and d['gcc_version'] != '2.96': # FIXME: iclang?
+-        if d['host_cpu'] == 'x86-64':
+-            return '-m64'
+-        elif d['host_cpu'] == 'ia32':
+-            return '-m32'
+     return ''
+     
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/intel-xed.git/commitdiff/6ab483887c8e6eb8eb8f299cc3859c060fe96835



More information about the pld-cvs-commit mailing list