Author: glen Date: Thu Jul 29 08:04:45 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- AC-fixes, ccache fixes
---- Files affected:
packages/dietlibc:
dietlibc.spec (1.87 -> 1.88)
---- Diffs:
================================================================
Index: packages/dietlibc/dietlibc.spec
diff -u packages/dietlibc/dietlibc.spec:1.87
packages/dietlibc/dietlibc.spec:1.88
--- packages/dietlibc/dietlibc.spec:1.87 Sun Jul 19 09:31:28 2009
+++ packages/dietlibc/dietlibc.spec Thu Jul 29 10:04:36 2010
@@ -32,10 +32,11 @@
Patch15: %{name}-memalign.patch
Patch16: %{name}-getsubopt.patch
URL: http://www.fefe.de/dietlibc/
+BuildRequires: rpmbuild(macros) >= 1.566
+BuildRequires: sed >= 4.0
%ifarch sparc sparcv9
BuildRequires: sparc32
%endif
-BuildRequires: dos2unix
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define dietprefix %{_prefix}/lib/dietlibc
@@ -81,7 +82,7 @@
%prep
%setup -q
-dos2unix arm/md5asm.S
+%undos arm/md5asm.S
%patch0 -p1
%patch1 -p1
%patch2 -p1
@@ -99,18 +100,23 @@
%patch15 -p1
%patch16 -p1
+%if "%{cc_version}" < "3.4"
+%{__sed} -i -e '/CFLAGS/ s/-Wextra//' Makefile
+%endif
+
%build
export OPTFLAGS="%{rpmcflags}%{?with_ssp: -fno-stack-protector}
-fno-strict-aliasing"
%ifarch sparc sparcv9
sparc32 \
%endif
+CC="%{__cc}"
%{__make} -j1 all \
prefix=%{dietprefix} \
- CC="%{__cc}"
+ CC="${CC#*ccache }"
%ifarch %{ix86}
%{__make} -j1 dyn \
prefix=%{dietprefix} \
- CC="%{__cc}"
+ CC="${CC#*ccache }"
%endif
%install
@@ -167,6 +173,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.88 2010/07/29 08:04:36 glen
+- AC-fixes, ccache fixes
+
Revision 1.87 2009/07/19 07:31:28 arekm
- release 2
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dietlibc/dietlibc.spec?r1=1.87&r2=1.88&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
