[packages/flac] - one more fix in x32 patch: despite 32-bit architecture, assume CPU as x86_64; fixes asm optimized

qboosh qboosh at pld-linux.org
Sat Nov 28 20:56:49 CET 2015


commit 0dffde7e18c8560872b687d7b321fef411087a11
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Nov 28 20:57:26 2015 +0100

    - one more fix in x32 patch: despite 32-bit architecture, assume CPU as x86_64; fixes asm optimized code
    - release 6

 flac.spec |  2 +-
 x32.patch | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)
---
diff --git a/flac.spec b/flac.spec
index 7834f4e..0001401 100644
--- a/flac.spec
+++ b/flac.spec
@@ -7,7 +7,7 @@ Summary:	Free Lossless Audio Codec
 Summary(pl.UTF-8):	Free Lossless Audio Codec - Wolnodostępny bezstratny kodek audio
 Name:		flac
 Version:	1.3.1
-Release:	5
+Release:	6
 License:	BSD (libFLAC/libFLAC++), GPL v2+ (programs and plugins)
 Group:		Libraries
 Source0:	http://downloads.xiph.org/releases/flac/%{name}-%{version}.tar.xz
diff --git a/x32.patch b/x32.patch
index b4c05ba..c364c6b 100644
--- a/x32.patch
+++ b/x32.patch
@@ -1,5 +1,29 @@
 --- flac-1.3.1/configure.ac~	2014-12-25 12:11:41.000000000 +0000
 +++ flac-1.3.1/configure.ac	2014-12-25 12:28:28.561894846 +0000
+@@ -105,6 +105,14 @@
+ asm_optimisation=no
+ case "$host_cpu" in
+ 	x86_64)
++		case "$host" in
++			*gnux32)
++				cpu_x86_64=true
++				AC_DEFINE(FLAC__CPU_X86_64)
++				AH_TEMPLATE(FLAC__CPU_X86_64, [define if building for x86_64])
++				asm_optimisation=$asm_opt
++				;;
++			*)
+ 		if test $ac_cv_sizeof_voidp = 4 ; then
+ 			# This must be a 32 bit user space running on 64 bit kernel so treat
+ 			# this as ia32.
+@@ -118,6 +126,8 @@
+ 			AH_TEMPLATE(FLAC__CPU_X86_64, [define if building for x86_64])
+ 			fi
+ 		asm_optimisation=$asm_opt
++				;;
++		esac
+ 		;;
+ 	i*86)
+ 		cpu_ia32=true
 @@ -150,6 +150,7 @@
  	*-*-cygwin|*mingw*) OBJ_FORMAT=win32 ;;
  	*-*-darwin*) OBJ_FORMAT=macho ;;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/flac.git/commitdiff/0dffde7e18c8560872b687d7b321fef411087a11



More information about the pld-cvs-commit mailing list