From 0788c900ceb93bef9bb0ec28288681a9c4bfd51d4823e81ea4b988a9df6e1dc2 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Tue, 31 Jan 2012 09:40:30 +0000 Subject: [PATCH] Accepting request 102087 from openSUSE:Factory:ARM - set abi back to gnueabi for ARM (regression from Jan 12) OBS-URL: https://build.opensuse.org/request/show/102087 OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=158 --- glibc.changes | 5 +++++ glibc.spec | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/glibc.changes b/glibc.changes index 93c823f..9cebbea 100644 --- a/glibc.changes +++ b/glibc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Jan 29 22:47:18 CET 2012 - dmueller@suse.de + +- set abi back to gnueabi for ARM (regression from Jan 12) + ------------------------------------------------------------------- Wed Jan 18 09:29:24 UTC 2012 - aj@suse.de diff --git a/glibc.spec b/glibc.spec index 3bb206f..f013731 100644 --- a/glibc.spec +++ b/glibc.spec @@ -54,7 +54,6 @@ BuildRequires: libstdc++-devel %define powerpc_optimize_cpu_cell 0 %endif # ppc, ppc64 # 2.6.16 is the SLES 10 kernel, use this as oldest supported kernel -# since many SUSE build machines have it %define enablekernel 2.6.16 # ngpt was used in 8.1 and SLES8 Obsoletes: ngpt < 2.2.2 @@ -70,7 +69,7 @@ Obsoletes: glibc-64bit Obsoletes: glibc-32bit %endif Version: 2.15 -Release: 11 +Release: 0 %define git_id 2ba92745c36e %define glibc_ports_ver 2.15 %define ports_git_id 8a70b2dcabbf @@ -472,9 +471,13 @@ nice # We do not want configure to figure out the system its building one # to support a common ground and thus set build and host to the # target_cpu. +%ifarch %arm +%define target %{_target_cpu}-suse-linux-gnueabi +%else %define target %{_target_cpu}-suse-linux +%endif # Adjust glibc version.h -echo "#define CONFHOST \"%{_target_cpu}-suse-linux\"" >> version.h +echo "#define CONFHOST \"%{target}\"" >> version.h echo "#define CVSDATE \"`date -r ChangeLog +%Y%m%d`\"" >> version.h # # Default CFLAGS and Compiler