Remove hard-coded options specific to x86_64 archs

Change-Id: Ied4e80af6c9a503795455b9250da39b68d28057a
Signed-off-by: Kévin THIERRY <kevin.thierry@open.eurogiciel.org>

diff --git a/proto-meta-Tizen_generic/rpm_tizen_macro/etc/macros.cmake b/proto-meta-Tizen_generic/rpm_tizen_macro/etc/macros.cmake
index 5aaf522..ed88815 100644 (file)
--- a/proto-meta-Tizen_generic/rpm_tizen_macro/etc/macros.cmake
+++ b/proto-meta-Tizen_generic/rpm_tizen_macro/etc/macros.cmake
@@ -6,9 +6,6 @@
 %__cmake cmake
 
 %cmake \
-  CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
-  CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
-  FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
   %__cmake \\\
         -DCMAKE_VERBOSE_MAKEFILE=ON \\\
         -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\

diff --git a/proto-meta-Tizen_generic/rpm_tizen_macro/lib/tizen_macros b/proto-meta-Tizen_generic/rpm_tizen_macro/lib/tizen_macros
index b0f797b..55a2910 100644 (file)
--- a/proto-meta-Tizen_generic/rpm_tizen_macro/lib/tizen_macros
+++ b/proto-meta-Tizen_generic/rpm_tizen_macro/lib/tizen_macros
@@ -134,9 +134,7 @@
   find %{?buildroot:%{buildroot}} -regex ".*\\.la$" | xargs rm -f -- \
   %{!?keepstatic:find %{?buildroot:%{buildroot}} -regex ".*\\.a$" | xargs rm -f --}
 
-%_smp_mflags %([ -z "$RPM_BUILD_NCPUS" ] \\\
-        && RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"; \\\
-        [ "$RPM_BUILD_NCPUS" -gt 1 ] && echo "-j$RPM_BUILD_NCPUS")
+%_smp_mflags \${PARALLEL_MAKE}
 
 %lang_package(n:f:) \
 %package %{-n:-n %{-n*}-}locale \

diff --git a/proto-meta-Tizen_generic/rpm_tizen_macro/user/.rpmmacros b/proto-meta-Tizen_generic/rpm_tizen_macro/user/.rpmmacros
index 606d16e..7e71551 100644 (file)
--- a/proto-meta-Tizen_generic/rpm_tizen_macro/user/.rpmmacros
+++ b/proto-meta-Tizen_generic/rpm_tizen_macro/user/.rpmmacros
@@ -23,6 +23,3 @@
 %undefine _enable_debug_packages \
 %debug_package
 
-
-%jobs 16
-%_smp_mflags -j16

diff --git a/proto-meta-Tizen_generic/rpm_tizen_macro/yocto/macro b/proto-meta-Tizen_generic/rpm_tizen_macro/yocto/macro
index 096a8bf..cfb7911 100644 (file)
--- a/proto-meta-Tizen_generic/rpm_tizen_macro/yocto/macro
+++ b/proto-meta-Tizen_generic/rpm_tizen_macro/yocto/macro
@@ -26,11 +26,11 @@
 %define _with_wayland 1
 %define _with_mesa 1
 
-
-
 %define _with_wayland 1
 %define _with_tizen 1
 %define _with_mesa 1
 %define _wrt_option_bluetooth 1
 %define _wrt_option_msg_port 1
 %define _wrt_option_call_history 1
+
+%optflags \${CFLAGS}