pool/glibc
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 115297 from home:a_jaeger:my-factory-packages

Browse Source 
Check for armv7hl as well.

OBS-URL: https://build.opensuse.org/request/show/115297
OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=175
This commit is contained in:
Andreas Jaeger 2012-04-25 10:41:00 +00:00 committed by Git OBS Bridge
parent df64b57568
commit 15be052ab7
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
glibc.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Apr 25 10:40:20 UTC 2012 - aj@suse.de
- Also check for armv7hl.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Apr 25 08:47:22 UTC 2012 - adrian@suse.de Wed Apr 25 08:47:22 UTC 2012 - adrian@suse.de

8
glibc.spec
View File

@ -546,7 +546,7 @@ rm nscd/s-stamp
%endif %endif
%patch2001 -p1 %patch2001 -p1
%ifarch armv7l %ifarch armv7l armv7hl
%patch2002 -p1 %patch2002 -p1
%endif %endif
%patch2003 -p1 %patch2003 -p1
@ -619,6 +619,8 @@ BuildFlags="%{optflags} -U_FORTIFY_SOURCE"
BuildFlags="$(echo $BuildFlags | sed -e 's#-fstack-protector##' -e 's#-ffortify=[0-9]*##')" BuildFlags="$(echo $BuildFlags | sed -e 's#-fstack-protector##' -e 's#-ffortify=[0-9]*##')"
BuildCC="%__cc" BuildCC="%__cc"
BuildCCplus="%__cxx" BuildCCplus="%__cxx"
BuildCC="gcc-4.6"
BuildCCplus="g++-4.6"
add_ons=",libidn" add_ons=",libidn"
PARALLEL="%{?_smp_mflags}" PARALLEL="%{?_smp_mflags}"
# #
@ -1024,7 +1026,7 @@ mkdir -p %{buildroot}/lib/systemd/system
install -m 644 %{SOURCE21} %{buildroot}/lib/systemd/system install -m 644 %{SOURCE21} %{buildroot}/lib/systemd/system
install -m 644 %{SOURCE22} %{buildroot}/lib/systemd/system install -m 644 %{SOURCE22} %{buildroot}/lib/systemd/system
%ifarch armv7l %ifarch armv7l armv7hl
# Provide compatibility link # Provide compatibility link
ln -s ld-%{version}.so %{buildroot}/lib/ld-linux.so.3 ln -s ld-%{version}.so %{buildroot}/lib/ld-linux.so.3
%endif %endif
@ -1104,7 +1106,7 @@ exit 0
# Each architecture has a different name for the dynamic linker: # Each architecture has a different name for the dynamic linker:
%ifarch %arm %ifarch %arm
%ifarch armv7l %ifarch armv7l armv7hl
/%{_lib}/ld-linux-armhf.so.3 /%{_lib}/ld-linux-armhf.so.3
# Keep compatibility link # Keep compatibility link
/%{_lib}/ld-linux.so.3 /%{_lib}/ld-linux.so.3