From 5af969d22791ac653311da9f2d294cad96601aa0 Mon Sep 17 00:00:00 2001 From: Tigro Date: Mon, 8 Aug 2016 12:50:38 +0300 Subject: [PATCH] drop cross_compiling macro --- nss.spec | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/nss.spec b/nss.spec index aad7048..32d4bcb 100644 --- a/nss.spec +++ b/nss.spec @@ -1,5 +1,4 @@ %bcond_without lib -%bcond_with cross_compiling %define url_ver %(echo %{version}| sed -e "s|\\.|_|g") %define major 3 @@ -177,20 +176,6 @@ perl ./certdata.perl < %{SOURCE7} popd %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 TARGETCC="%{__cc}" export TARGETCCC="%{__cxx}" @@ -207,14 +192,7 @@ unset USE_64 || : # TARGETCCC="$TARGETCCC" \ # TARGETRANLIB="$TARGETRANLIB" \ # 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" -#%endif %make -j1 -C ./nss/coreconf %make -j1 -C ./nss/lib/dbm %make -j1 -C ./nss