Accepting request 455650 from home:gary_lin:branches:Base:System
Amend the spec file to specify the gcc version for SLE11SP4 OBS-URL: https://build.opensuse.org/request/show/455650 OBS-URL: https://build.opensuse.org/package/show/Base:System/efivar?expand=0&rev=24
This commit is contained in:
parent
64823aaa08
commit
6fb2dfaf50
@ -1,8 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 9 04:38:03 UTC 2017 - glin@suse.com
|
||||
Thu Feb 9 06:32:10 UTC 2017 - glin@suse.com
|
||||
|
||||
- Add efivar-use-sysmacros.patch to fix the Factory/Tumbleweed
|
||||
build correctly.
|
||||
- Amend the spec file to specify the gcc version for SLE11SP4
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 6 14:40:25 UTC 2017 - rw@suse.com
|
||||
|
19
efivar.spec
19
efivar.spec
@ -84,19 +84,6 @@ perl -pi -e 's{\#include \<uchar\.h\>}{typedef __CHAR16_TYPE__ char16_t;}' \
|
||||
%endif
|
||||
|
||||
%build
|
||||
# SUSE multi-dist building effort
|
||||
if [ "0%{?gcc}" != "0" ]||[ ! -x /usr/bin/gcc-ar ]; then
|
||||
mkdir bin
|
||||
if [ "0%{?gcc}" != "0" ]; then
|
||||
for p in "" -ar -nm -ranlib; do
|
||||
ln -s /usr/bin/gcc$p-%{gcc_v} bin/gcc$p
|
||||
done
|
||||
else
|
||||
ln -s /usr/bin/ar bin/gcc-ar
|
||||
fi
|
||||
PATH=$PWD/bin:$PATH
|
||||
fi
|
||||
|
||||
CFLAGS="%{optflags} -Wno-nonnull"
|
||||
%if %{with forced_lto}
|
||||
CFLAGS="$CFLAGS -flto"
|
||||
@ -107,6 +94,12 @@ CFLAGS="%{optflags} -Wno-nonnull"
|
||||
export CFLAGS
|
||||
|
||||
make \
|
||||
%if 0%{?suse_version} == 1110
|
||||
CC=gcc-%{gcc_v} \
|
||||
AR=gcc-ar-%{gcc_v} \
|
||||
NM=gcc-nm-%{gcc_v} \
|
||||
RANLIB=gcc-ranlib-%{gcc_v} \
|
||||
%endif
|
||||
libdir=%{_libdir} \
|
||||
bindir=%{_bindir}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user