Djam/nss
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/nss.git synced 2025-02-24 00:42:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

drop cross_compiling macro

Browse source
This commit is contained in:
Tigro 2016-08-08 12:50:38 +03:00
parent e442d169db
commit 5af969d227
1 changed files with 0 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
nss.spec
View file

@ -1,5 +1,4 @@
%bcond_without lib %bcond_without lib
%bcond_with cross_compiling
%define url_ver %(echo %{version}| sed -e "s|\\.|_|g") %define url_ver %(echo %{version}| sed -e "s|\\.|_|g")
%define major 3 %define major 3
@ -177,20 +176,6 @@ perl ./certdata.perl < %{SOURCE7}
popd popd
%endif %endif
%if %cross_compiling
# Compile tools used at build time (nsinstall) in native
# mode before setting up the environment for crosscompiling
export USE_64=1
make -j1 -C ./nss \
build_coreconf build_dbm all
CPU_ARCH="%_target_cpu"
if echo $CPU_ARCH |grep -qE '(i.86|pentium.|athlon)'; then
CPU_ARCH=x86
fi
export CPU_ARCH
%endif
export NATIVE_CC="/usr/bin/gcc" export NATIVE_CC="/usr/bin/gcc"
export TARGETCC="%{__cc}" export TARGETCC="%{__cc}"
export TARGETCCC="%{__cxx}" export TARGETCCC="%{__cxx}"
@ -207,14 +192,7 @@ unset USE_64 || :
# TARGETCCC="$TARGETCCC" \ # TARGETCCC="$TARGETCCC" \
# TARGETRANLIB="$TARGETRANLIB" \ # TARGETRANLIB="$TARGETRANLIB" \
# AR="%__ar cr \"\$@\"" \ # AR="%__ar cr \"\$@\"" \
#%if %cross_compiling
# CPU_ARCH="$CPU_ARCH" \
#%endif
#%if %with %{cross_compiling}
#buildflags="TARGETCC='$TARGETCC' TARGETCCC='$TARGETCCC' TARGETRANLIB='$TARGETRANLIB' AR='%__ar" CPU_ARCH="$CPU_ARCH"
#%else
#buildflags="TARGETCC='$TARGETCC' TARGETCCC='$TARGETCCC' TARGETRANLIB='$TARGETRANLIB' AR='%__ar" #buildflags="TARGETCC='$TARGETCC' TARGETCCC='$TARGETCCC' TARGETRANLIB='$TARGETRANLIB' AR='%__ar"
#%endif
%make -j1 -C ./nss/coreconf %make -j1 -C ./nss/coreconf
%make -j1 -C ./nss/lib/dbm %make -j1 -C ./nss/lib/dbm
%make -j1 -C ./nss %make -j1 -C ./nss