From: Kévin THIERRY <kevin.thierry@open.eurogiciel.org>
Date: Wed, 2 Jul 2014 13:30:52 +0000 (+0200)
Subject: Remove build flags in recipes
X-Git-Tag: rev_0.4~62^2~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=71cd5baa85dcb35f68396d6795e7a09db9836d3a;p=scm%2Fbb%2Ftizen.git

Remove build flags in recipes

Remove build flags in recipes. Default build flags are already defined
by Yocto and the one we used were for x86_64 architectures only.

Also update spec2yoctorc.

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

diff --git a/proto-meta-Tizen_generic/.spec2yoctorc b/proto-meta-Tizen_generic/.spec2yoctorc
index 6c3a711..a7d6a4a 100644
--- a/proto-meta-Tizen_generic/.spec2yoctorc
+++ b/proto-meta-Tizen_generic/.spec2yoctorc
@@ -9,7 +9,7 @@ runtime_blacklist=runtime_tizen_common_blacklist
 native_blacklist=native_tizen_common_blacklist
 blacklist=tizen_common_blacklist, tmp_tizen_common_blacklist
 whitelist=whitelist_tizen_common
-recipes_dir_sources=${YOCTO_WORKDIR}/yoctoTizen/meta-tizen-generic/recipes-tizen
+recipes_dir_sources=${YOCTO_WORKDIR}/meta-tizen/recipes-tizen
 recipes_dir_group=${YOCTO_WORKDIR}/yoctoTizen/meta-tizen-generic/recipes-packagegroups/packagegroups
 blacklist_autoreconf=tizen_common_autoreconf
 group=Base-System
diff --git a/proto-meta-Tizen_generic/rpm_tizen_macro/lib/macros b/proto-meta-Tizen_generic/rpm_tizen_macro/lib/macros
index 311e1cd..05039f9 100644
--- a/proto-meta-Tizen_generic/rpm_tizen_macro/lib/macros
+++ b/proto-meta-Tizen_generic/rpm_tizen_macro/lib/macros
@@ -850,27 +850,6 @@ posix.setenv("RPMBUILD_SOURCEDIR",rpm.expand("%?_sourcedir"));
 # because the rest of the arguments will be expanded using %*.
 #
 %_configure autotools_do_configure
-%configure \
-  CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
-  CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
-  FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
-  %{_configure} --host=%{_host} --build=%{_build} \\\
-	--program-prefix=%{?_program_prefix} \\\
-	--disable-dependency-tracking \\\
-	--prefix=%{_prefix} \\\
-	--exec-prefix=%{_exec_prefix} \\\
-	--bindir=%{_bindir} \\\
-	--sbindir=%{_sbindir} \\\
-	--sysconfdir=%{_sysconfdir} \\\
-	--datadir=%{_datadir} \\\
-	--includedir=%{_includedir} \\\
-	--libdir=%{_libdir} \\\
-	--libexecdir=%{_libexecdir} \\\
-	--localstatedir=%{_localstatedir} \\\
-	--sharedstatedir=%{_sharedstatedir} \\\
-	--mandir=%{_mandir} \\\
-	--infodir=%{_infodir} \\\
-	--disable-dependency-tracking
 
 #------------------------------------------------------------------------------
 # The make install analogue of %configure for modern autotools:
diff --git a/proto-meta-Tizen_generic/rpm_tizen_macro/lib/platform/x86_64-linux/macros b/proto-meta-Tizen_generic/rpm_tizen_macro/lib/platform/x86_64-linux/macros
index 88e66e1..d4c2379 100644
--- a/proto-meta-Tizen_generic/rpm_tizen_macro/lib/platform/x86_64-linux/macros
+++ b/proto-meta-Tizen_generic/rpm_tizen_macro/lib/platform/x86_64-linux/macros
@@ -8,8 +8,8 @@
 %_vendor		tizen
 %_os			linux
 %_gnu			-gnu
-%_target_platform	%{_target_cpu}-%{_vendor}-%{_target_os}
-%optflags		-O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables
+%_target_platform	${TARGET_SYS}
+%optflags		-O2 -g -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables
 
 %__isa_name		x86
 %__isa_bits		64
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 2984aee..b0f797b 100644
--- a/proto-meta-Tizen_generic/rpm_tizen_macro/lib/tizen_macros
+++ b/proto-meta-Tizen_generic/rpm_tizen_macro/lib/tizen_macros
@@ -64,9 +64,6 @@
 # Tizen
 #
 %configure \
-  CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
-  CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
-  FFLAGS="${FFLAGS:-%optflags -I%_fmoddir}" ; export FFLAGS ; \
   %{_configure} --build=%{_build} --host=%{_host} \\\
         --target=%{_target_platform} \\\
         --program-prefix=%{?_program_prefix} \\\
@@ -86,9 +83,6 @@
 
 
 %reconfigure \
-  CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
-  CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
-  FFLAGS="${FFLAGS:-%optflags -I%_fmoddir}" ; export FFLAGS ; \
   %{_configure} --build=%{_build} --host=%{_host} \\\
         --target=%{_target_platform} \\\
         --program-prefix=%{?_program_prefix} \\\
@@ -180,9 +174,6 @@ unset DISPLAY\
 LANG=C\
 export LANG\
 unset DISPLAY\
-CFLAGS="%optflags" ; export CFLAGS ;\
-CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ;\
-FFLAGS="${FFLAGS:-%optflags -I%_fmoddir}" ; export FFLAGS ;\
 LD_AS_NEEDED=1; export LD_AS_NEEDED ;\
 %{nil}