forked from pool/glibc
Accepting request 86518 from home:uli_suse:branches:Base:System
- cross-build: use %__cc, %__cxx, %_build, %_host - mipsel: install ports, disable FP OBS-URL: https://build.opensuse.org/request/show/86518 OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=115
This commit is contained in:
parent
78afe2b062
commit
efdb495827
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 4 14:10:13 UTC 2011 - uli@suse.com
|
||||
|
||||
- cross-build: use %__cc, %__cxx, %_build, %_host
|
||||
- mipsel: install ports, disable FP
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Sep 30 17:14:04 CEST 2011 - dmueller@suse.de
|
||||
|
||||
|
19
glibc.spec
19
glibc.spec
@ -371,6 +371,7 @@ versions of your software.
|
||||
%ifarch %arm
|
||||
# add glibc-ports for arm
|
||||
%setup -n glibc-%{version} -q -a 2 -a 3 -a 4
|
||||
mv glibc-ports-* ports
|
||||
%else
|
||||
# any other leave out ports
|
||||
%setup -n glibc-%{version} -q -a 3 -a 4
|
||||
@ -491,8 +492,8 @@ echo "#define CVSDATE \"`date -r ChangeLog +%Y%m%d`\"" >> version.h
|
||||
#
|
||||
BuildFlags="%{optflags} -U_FORTIFY_SOURCE"
|
||||
BuildFlags="$(echo $BuildFlags | sed -e 's#-fstack-protector##' -e 's#-ffortify=[0-9]*##')"
|
||||
BuildCC="gcc"
|
||||
BuildCCplus="g++"
|
||||
BuildCC="%__cc"
|
||||
BuildCCplus="%__cxx"
|
||||
add_ons=",libidn"
|
||||
PARALLEL="%{?_smp_mflags}"
|
||||
#
|
||||
@ -540,10 +541,13 @@ PARALLEL="%{?_smp_mflags}"
|
||||
add_ons=$add_ons,noversion
|
||||
%endif
|
||||
%ifarch %arm
|
||||
add_ons=$add_ons,glibc-ports-%{version}
|
||||
add_ons=$add_ons,ports
|
||||
# fails to build otherwise - need to recheck and fix
|
||||
%define enable_stackguard_randomization 0
|
||||
%endif
|
||||
%ifarch mipsel
|
||||
add_ons=$add_ons,ports
|
||||
%endif
|
||||
|
||||
configure_and_build_glibc() {
|
||||
local dirname="$1"; shift
|
||||
@ -559,14 +563,13 @@ configure_and_build_glibc() {
|
||||
%if %{enable_stackguard_randomization}
|
||||
--enable-stackguard-randomization \
|
||||
%endif
|
||||
%ifarch %arm
|
||||
--build=%{_target_cpu}-suse-linux-gnueabi \
|
||||
%else
|
||||
--build=%{_target_cpu}-suse-linux \
|
||||
%endif
|
||||
--build=%{_build} --host=%{_host} \
|
||||
%ifarch ppc ppc64 %{ix86} x86_64
|
||||
--enable-multi-arch \
|
||||
%endif
|
||||
%ifarch mipsel
|
||||
--without-fp \
|
||||
%endif
|
||||
%if %{exp_malloc}
|
||||
--enable-experimental-malloc \
|
||||
%endif
|
||||
|
Loading…
Reference in New Issue
Block a user