Revert "Fix build error due to toolchain upgrade(gcc6->gcc9)"

This reverts commit 15c0f76ff281e84bedd186fcb7f10739e0ff175b.

Change-Id: Ied000e23c9ac19bf508310925bc91c422d9ffdc8
Signed-off-by: Inki Dae <inki.dae@samsung.com>

diff --git a/packaging/openblas.spec b/packaging/openblas.spec
index bc434ae..0931556 100644 (file)
--- a/packaging/openblas.spec
+++ b/packaging/openblas.spec
@@ -1,6 +1,6 @@
 Name:           openblas
 Version:        0.2.20
-Release:        2
+Release:        1
 Summary:        An optimized BLAS library based on GotoBLAS2
 License:        BSD-3-Clause and MIT and Apache-2.0
 Group:          Productivity/Scientific/Math
@@ -162,25 +162,13 @@ export LDFLAGS+="-Wl,-z,noexecstack"
 %endif
 
 cd ..
-
-# Just to avoid duplication, global flags are passed with COMMON_OPT
-export CFLAGS=""
-export CXXFLAGS=""
-export FFLAGS=""
-
-BUILD_FLAGS="%{optflags}"
-%ifarch x86_64
-# On GCC9, the "-fno-omit-frame-pointer" option results in the segfault in case of x86_64.
-BUILD_FLAGS=$(echo $BUILD_FLAGS| sed 's/-fno-omit-frame-pointer/-fomit-frame-pointer/g')
-%endif
-
 # Make serial, threaded and OpenMP versions
 make -C serial %{?_smp_mflags} %{?openblas_target} USE_THREAD=0 USE_OPENMP=0 LIBNAMESUFFIX=serial \
-        FC=gfortran CC=gcc COMMON_OPT="${BUILD_FLAGS}" NUM_THREADS=64 V=1
+        FC=gfortran CC=gcc COMMON_OPT="%{optflags}" NUM_THREADS=64 V=1
 make -C openmp %{?_smp_mflags} %{?openblas_target} USE_THREAD=1 USE_OPENMP=1 LIBNAMESUFFIX=openmp \
-        FC=gfortran CC=gcc COMMON_OPT="${BUILD_FLAGS}" NUM_THREADS=64 V=1
+        FC=gfortran CC=gcc COMMON_OPT="%{optflags}" NUM_THREADS=64 V=1
 make -C pthreads %{?_smp_mflags} %{?openblas_target} USE_THREAD=1 USE_OPENMP=0 LIBNAMESUFFIX=pthreads \
-        FC=gfortran CC=gcc COMMON_OPT="${BUILD_FLAGS}" NUM_THREADS=64 V=1
+        FC=gfortran CC=gcc COMMON_OPT="%{optflags}" NUM_THREADS=64 V=1
 
 %install
 cd ..