Merge branch 'tizen' of git.vannes:/srv/git/gitcache/review.tizen.org//scm/bb/meta...

Conflicts:
	recipes-tizen/rpm/rpm-extraconf.inc

Change-Id: Ib44a1b0c91bfc4a969733ba909e1e7ad75f30624

diff --cc recipes-tizen/crosswalk/crosswalk-extraconf.inc
Simple merge

diff --cc recipes-tizen/rpm/rpm-extraconf.inc
index 982aa88,ba7fcc1..bc7fd7c
--- 1/recipes-tizen/rpm/rpm-extraconf.inc
--- 2/recipes-tizen/rpm/rpm-extraconf.inc
+++ b/recipes-tizen/rpm/rpm-extraconf.inc
@@@ -50,30 -47,50 +50,27 @@@ do_compile_prepend() 
  
  do_compile() {
   cd ${S}
 - LANG=C
 - export LANG
 - unset DISPLAY
 - LD_AS_NEEDED=1; export LD_AS_NEEDED ;
 -
 - CPPFLAGS="$CPPFLAGS `pkg-config --cflags nss`"
 - export CPPFLAGS
 - export LDFLAGS="${LDFLAGS} -Wl,-Bsymbolic-functions -ffunction-sections"
 -
 - BUILDTARGET="--host=x86_64-linux-gnu "
 -
 -   export CFLAGS="${CFLAGS} -DRPM_VENDOR_OE "
 -   autoreconf -i -f
 -   ./configure   --host=${HOST_SYS} \
 -         --target=x86_64-tizen-linux \
 -         --program-prefix= \
 -         --prefix=${prefix} \
 -         --exec-prefix=${prefix} \
 -         --bindir=${prefix}/bin \
 -         --sbindir=${prefix}/sbin \
 -         --sysconfdir=${sysconfdir} \
 -         --datadir=${prefix}/share \
 -         --includedir=${prefix}/include \
 -         --libdir=${prefix}/lib \
 -         --libexecdir=${prefix}/libexec \
 -         --localstatedir=${localstatedir} \
 -         --sharedstatedir=${prefix}/com \
 -         --mandir=${mandir} \
 -         --infodir=${infodir} \
 -     --disable-dependency-tracking \
 -     --with-lua \
 -     --with-acl \
 -     --with-cap \
 -     --enable-shared \
 -     --enable-python \
 -     --with-python-inc-dir=${STAGING_INCDIR}/python${PYTHON_BASEVERSION} \
 -     --with-python-lib-dir=${libdir}/python${PYTHON_BASEVERSION}/site-packages \
 -     --with-msm \
 -     $BUILDTARGET
 -
 - oe_runmake ${PARALLEL_MAKE}
 -
 +  LANG=C
 +  export LANG
 +  unset DISPLAY
 +  LD_AS_NEEDED=1; export LD_AS_NEEDED ;
 +  
 +  CPPFLAGS="$CPPFLAGS `pkg-config --cflags nss`"
 +  export CPPFLAGS
 +  export CFLAGS="$CFLAGS -ffunction-sections"
 +  export LDFLAGS="${LDFLAGS} -Wl,-Bsymbolic-functions -ffunction-sections"
 +  
-   export CFLAGS+=" -DRPM_VENDOR_OE "
++  export CFLAGS="${CFLAGS} -DRPM_VENDOR_OE "
 +  autoreconf -i -f
 +  oe_runconf
 +  
 +  make ${PARALLEL_MAKE}
-   
-   
-   
  }
  
 +EXTRA_OECONF += " --with-python-inc-dir=${STAGING_INCDIR}/python${PYTHON_BASEVERSION} "
 +EXTRA_OECONF += " --with-python-lib-dir=${libdir}/python${PYTHON_BASEVERSION}/site-packages "
 +#EXTRA_OECONF += " --host=tizen-linux "
 +
  do_install() {
   echo export RPM_BUILD_ROOT=${D}
   cd ${S}