packages: xz/xz.spec - disable asm on ac (too old gcc) http://mail-index....

glen glen at pld-linux.org
Wed Jun 2 18:15:51 CEST 2010


Author: glen                         Date: Wed Jun  2 16:15:51 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- disable asm on ac (too old gcc)
  http://mail-index.netbsd.org/pkgsrc-changes/2009/12/14/msg033618.html

---- Files affected:
packages/xz:
   xz.spec (1.57 -> 1.58) 

---- Diffs:

================================================================
Index: packages/xz/xz.spec
diff -u packages/xz/xz.spec:1.57 packages/xz/xz.spec:1.58
--- packages/xz/xz.spec:1.57	Sat May  1 16:28:01 2010
+++ packages/xz/xz.spec	Wed Jun  2 18:15:46 2010
@@ -2,28 +2,37 @@
 #
 # Conditional build:
 %bcond_without	tests	# don't perform make check
-#
-%define	snap	beta
+%bcond_without	asm		# asm optimizations
+
+%if "%{pld_release}" == "ac"
+%undefine	with_asm
+%endif
+
+%define		subver	beta
+%define		rel		2
 Summary:	LZMA Encoder/Decoder
 Summary(pl.UTF-8):	Koder/Dekoder LZMA
 Name:		xz
 Version:	4.999.9
-Release:	0.%{snap}.2
+Release:	0.%{subver}.%{rel}
 Epoch:		1
 License:	LGPL v2.1+, helper scripts on GPL v2+
 Group:		Applications/Archiving
-Source0:	http://tukaani.org/xz/%{name}-%{version}%{snap}.tar.gz
+Source0:	http://tukaani.org/xz/%{name}-%{version}%{subver}.tar.gz
 # Source0-md5:	f2073579b6da2fe35d453adee1aaf1b2
 URL:		http://tukaani.org/xz/
+%{?with_asm:BuildRequires:	gcc >= 5:3.4}
+BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpmbuild(macros) >= 1.402
 BuildRequires:	sed >= 4.0
-Suggests:	mktemp
-Conflicts:	rpm < 4.4.9
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
+Suggests:	mktemp
 Provides:	lzma = %{epoch}:%{version}-%{release}
 Obsoletes:	lzma < 1:4.999.6
+Conflicts:	rpm < 4.4.9
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+
 %description
 LZMA is default and general compression method of 7z format in 7-Zip
 program. LZMA provides high compression ratio and very fast
@@ -102,11 +111,11 @@
 Biblioteka statyczna LZMA.
 
 %prep
-%setup -q -n %{name}-%{version}%{snap}
+%setup -q -n %{name}-%{version}%{subver}
 
 %build
-%configure
-
+%configure \
+	%{!?with_asm:--disable-assembler}
 %{__make}
 
 %{?with_tests:%{__make} check}
@@ -165,6 +174,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.58  2010/06/02 16:15:46  glen
+- disable asm on ac (too old gcc)
+  http://mail-index.netbsd.org/pkgsrc-changes/2009/12/14/msg033618.html
+
 Revision 1.57  2010/05/01 14:28:01  shadzik
 - rel .2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xz/xz.spec?r1=1.57&r2=1.58&f=u



More information about the pld-cvs-commit mailing list