Recipes updates to support ia32 build

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

diff --git a/recipes-tizen/alsa-scenario-0.2/alsa-scenario-0.2-extraconf.inc b/recipes-tizen/alsa-scenario-0.2/alsa-scenario-0.2-extraconf.inc
index 5dd0a66..a4b163a 100644 (file)
--- a/recipes-tizen/alsa-scenario-0.2/alsa-scenario-0.2-extraconf.inc
+++ b/recipes-tizen/alsa-scenario-0.2/alsa-scenario-0.2-extraconf.inc
@@ -5,11 +5,9 @@ do_compile() {
  unset DISPLAY
  LD_AS_NEEDED=1; export LD_AS_NEEDED ;
 
-
  cp -f ${PKG_CONFIG_SYSROOT_DIR}${datadir}/libtool/config/config.guess ${WORKDIR}
  cp -f ${PKG_CONFIG_SYSROOT_DIR}${datadir}/libtool/config/config.sub ${WORKDIR}
 
-
    autotools_do_configure --build=${TARGET_SYS} --host=${HOST_SYS} \
          --target=x86_64-tizen-linux \
          --program-prefix= \

diff --git a/recipes-tizen/app-checker/app-checker-extraconf.inc b/recipes-tizen/app-checker/app-checker-extraconf.inc
index 2838c8b..6a39556 100644 (file)
--- a/recipes-tizen/app-checker/app-checker-extraconf.inc
+++ b/recipes-tizen/app-checker/app-checker-extraconf.inc
@@ -1 +1,29 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/app-checker"
+
+SRC_URI += "file://0001-yocto-Correct-libdl-linking-issue.patch"
+
 LICENSE = "Apache-2.0"
+
+do_compile() {
+ cd ${S}
+ LANG=C
+ export LANG
+ unset DISPLAY
+ LD_AS_NEEDED=1; export LD_AS_NEEDED ;
+ 
+   cmake \
+         -DCMAKE_VERBOSE_MAKEFILE=ON \
+         -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \
+         -DCMAKE_INSTALL_LIBDIR:PATH=${prefix}/lib \
+         -DINCLUDE_INSTALL_DIR:PATH=${prefix}/include \
+         -DLIB_INSTALL_DIR:PATH=${prefix}/lib \
+         -DSYSCONF_INSTALL_DIR:PATH=${sysconfdir} \
+         -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \
+         -DCMAKE_SKIP_RPATH:BOOL=ON \
+         -DBUILD_SHARED_LIBS:BOOL=ON .
+ 
+ oe_runmake
+ 
+ 
+ 
+}
\ No newline at end of file

diff --git a/recipes-tizen/app-checker/app-checker/0001-yocto-Correct-libdl-linking-issue.patch b/recipes-tizen/app-checker/app-checker/0001-yocto-Correct-libdl-linking-issue.patch
new file mode 100644 (file)
index 0000000..09f7f63
--- /dev/null
+++ b/recipes-tizen/app-checker/app-checker/0001-yocto-Correct-libdl-linking-issue.patch
@@ -0,0 +1,30 @@
+From 08d9a48423ff699e20eda48e07d78387f5aecb73 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?K=C3=A9vin=20THIERRY?= <kevin.thierry@open.eurogiciel.org>
+Date: Mon, 7 Jul 2014 14:01:46 +0200
+Subject: [PATCH] [yocto] Correct libdl linking issue
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Change-Id: Icedff39ddd6e458d0e567a519ba53ba51c5683b9
+Signed-off-by: Kévin THIERRY <kevin.thierry@open.eurogiciel.org>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 61416f8..a476415 100755
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -24,7 +24,7 @@ INCLUDE(FindPkgConfig)
+ pkg_check_modules(pkgs REQUIRED dlog glib-2.0)
+ pkg_check_modules(libpkgs REQUIRED dlog glib-2.0)
+ 
+-FIND_LIBRARY(LIB_DL dl)
++FIND_LIBRARY(LIB_DL NAMES dl libdl.so.2)
+ 
+ FOREACH(flag ${libpkgs_CFLAGS})
+       SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
+-- 
+1.8.1.4
+

diff --git a/recipes-tizen/audio-session-manager/audio-session-manager-extraconf.inc b/recipes-tizen/audio-session-manager/audio-session-manager-extraconf.inc
index a92dfb6..c7252bb 100644 (file)
--- a/recipes-tizen/audio-session-manager/audio-session-manager-extraconf.inc
+++ b/recipes-tizen/audio-session-manager/audio-session-manager-extraconf.inc
@@ -4,8 +4,7 @@ do_compile() {
  export LANG
  unset DISPLAY
  LD_AS_NEEDED=1; export LD_AS_NEEDED ;
-
- CFLAGS="-O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -fvisibility=hidden -DMM_DEBUG_FLAG -DEXPORT_API=\"__attribute__((visibility(\\\"default\\\")))\"" ; export CFLAGS
+ CFLAGS="-DMM_DEBUG_FLAG -DEXPORT_API=\"__attribute__((visibility(\\\"default\\\")))\"" ; export CFLAGS
 
    autotools_do_configure --build=${TARGET_SYS} --host=${HOST_SYS} \
          --target=x86_64-tizen-linux \
@@ -23,7 +22,7 @@ do_compile() {
          --sharedstatedir=${prefix}/com \
          --mandir=${mandir} \
          --infodir=${infodir} --disable-static --enable-security
- make -j16
+ oe_runmake
 
 
 

diff --git a/recipes-tizen/crosswalk/crosswalk-extraconf.inc b/recipes-tizen/crosswalk/crosswalk-extraconf.inc
index 2da72ef..a0f46ae 100644 (file)
--- a/recipes-tizen/crosswalk/crosswalk-extraconf.inc
+++ b/recipes-tizen/crosswalk/crosswalk-extraconf.inc
@@ -1,5 +1,21 @@
 inherit gettext
-FILES_${PN}-dbg += "${systemd-dbg_files}"
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/crosswalk"
+
+SRC_URI += "\
+            file://include.gypi \
+            file://oe-defaults.gypi \
+            "
+
+# This comes from the chromium recipe:
+# http://layers.openembedded.org/layerindex/recipe/4969/
+# It allows architecture specific configuration
+COMPATIBLE_MACHINE = "(-)"
+COMPATIBLE_MACHINE_i586 = "(.*)"
+COMPATIBLE_MACHINE_x86-64 = "(.*)"
+COMPATIBLE_MACHINE_armv6 = "(.*)"
+COMPATIBLE_MACHINE_armv7a = "(.*)"
+COMPATIBLE_MACHINE_romley-ivb = "(.*)"
 
 do_compile() {
  cd ${S}
@@ -36,7 +52,7 @@ do_compile() {
 
  GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Duse_ozone=1 -Denable_ozone_wayland_vkb=1 -Denable_xdg_shell=1"
  GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Dlinux_use_bundled_binutils=0 -Dlinux_use_bundled_gold=0 -Ddisable_fatal_linker_warnings=1"
-
+ GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -I${WORKDIR}/oe-defaults.gypi -I${WORKDIR}/include.gypi"
 
  export GYP_GENERATORS='ninja'
  ./src/xwalk/gyp_xwalk src/xwalk/xwalk.gyp \
@@ -53,7 +69,7 @@ do_compile() {
  -Duse_kerberos=0 \
  -Denable_hidpi=1
 
- ninja -j16 -C src/out/Release xwalk xwalkctl xwalk_launcher xwalk-pkg-helper
+ ninja ${PARALLEL_MAKE} -C src/out/Release xwalk xwalkctl xwalk_launcher xwalk-pkg-helper
 
 }
 
@@ -69,4 +85,4 @@ pkg_postinst_${PN}() {
     mkdir -p $D/opt/share/icons/default/small
     mkdir -p $D/opt/share/packages
 
-}
\ No newline at end of file
+}

diff --git a/recipes-tizen/crosswalk/crosswalk/armv6/include.gypi b/recipes-tizen/crosswalk/crosswalk/armv6/include.gypi
new file mode 100644 (file)
index 0000000..2c88271
--- /dev/null
+++ b/recipes-tizen/crosswalk/crosswalk/armv6/include.gypi
@@ -0,0 +1,8 @@
+{
+  'variables': {
+    # Configure for armv6 compilation
+    'target_arch': 'arm',
+    'armv7': 0,
+    'arm_neon': 0,
+  }
+}

diff --git a/recipes-tizen/crosswalk/crosswalk/armv6/oe-defaults.gypi b/recipes-tizen/crosswalk/crosswalk/armv6/oe-defaults.gypi
new file mode 100644 (file)
index 0000000..27e1cfe
--- /dev/null
+++ b/recipes-tizen/crosswalk/crosswalk/armv6/oe-defaults.gypi
@@ -0,0 +1,15 @@
+{
+  'variables': {
+    'use_system_bzip2': 1,
+    'disable_nacl': 1,
+    'proprietary_codecs': 1,
+    'v8_use_snapshot': 1,
+    'use_system_ffmpeg': 0,
+    'linux_use_tcmalloc': 0,
+    'linux_link_kerberos': 0,
+    'use_kerberos': 0,
+    'use_cups': 0,
+    'use_gnome_keyring': 0,
+    'linux_link_gnome_keyring': 0
+  }, 
+}

diff --git a/recipes-tizen/crosswalk/crosswalk/armv7a/include.gypi b/recipes-tizen/crosswalk/crosswalk/armv7a/include.gypi
new file mode 100644 (file)
index 0000000..316cf48
--- /dev/null
+++ b/recipes-tizen/crosswalk/crosswalk/armv7a/include.gypi
@@ -0,0 +1,9 @@
+{
+  'variables': {
+    # Configure for armv7 compilation
+    'target_arch': 'arm',
+    'armv7': 1,
+    'arm_thumb': 1,
+    'arm_neon': 1,
+  }, 
+}

diff --git a/recipes-tizen/crosswalk/crosswalk/armv7a/oe-defaults.gypi b/recipes-tizen/crosswalk/crosswalk/armv7a/oe-defaults.gypi
new file mode 100644 (file)
index 0000000..27e1cfe
--- /dev/null
+++ b/recipes-tizen/crosswalk/crosswalk/armv7a/oe-defaults.gypi
@@ -0,0 +1,15 @@
+{
+  'variables': {
+    'use_system_bzip2': 1,
+    'disable_nacl': 1,
+    'proprietary_codecs': 1,
+    'v8_use_snapshot': 1,
+    'use_system_ffmpeg': 0,
+    'linux_use_tcmalloc': 0,
+    'linux_link_kerberos': 0,
+    'use_kerberos': 0,
+    'use_cups': 0,
+    'use_gnome_keyring': 0,
+    'linux_link_gnome_keyring': 0
+  }, 
+}

diff --git a/recipes-tizen/crosswalk/crosswalk/i586/include.gypi b/recipes-tizen/crosswalk/crosswalk/i586/include.gypi
new file mode 100644 (file)
index 0000000..69f3a08
--- /dev/null
+++ b/recipes-tizen/crosswalk/crosswalk/i586/include.gypi
@@ -0,0 +1,5 @@
+{
+  'variables': {
+    'target_arch': 'ia32',
+  }
+}

diff --git a/recipes-tizen/crosswalk/crosswalk/i586/oe-defaults.gypi b/recipes-tizen/crosswalk/crosswalk/i586/oe-defaults.gypi
new file mode 100644 (file)
index 0000000..0a6e8e8
--- /dev/null
+++ b/recipes-tizen/crosswalk/crosswalk/i586/oe-defaults.gypi
@@ -0,0 +1,15 @@
+{
+  'variables': {
+    'use_system_bzip2': 1,
+    'disable_nacl': 1,
+    'proprietary_codecs': 0,
+    'v8_use_snapshot': 1,
+    'use_system_ffmpeg': 0,
+    'linux_use_tcmalloc': 1,
+    'linux_link_kerberos': 0,
+    'use_kerberos': 0,
+    'use_cups': 0,
+    'use_gnome_keyring': 0,
+    'linux_link_gnome_keyring': 0,
+  }, 
+}

diff --git a/recipes-tizen/crosswalk/crosswalk/romley-ivb/include.gypi b/recipes-tizen/crosswalk/crosswalk/romley-ivb/include.gypi
new file mode 100644 (file)
index 0000000..c2e2a7d
--- /dev/null
+++ b/recipes-tizen/crosswalk/crosswalk/romley-ivb/include.gypi
@@ -0,0 +1,5 @@
+{
+  'variables': {
+    'target_arch': 'x64',
+  }
+}

diff --git a/recipes-tizen/crosswalk/crosswalk/romley-ivb/oe-defaults.gypi b/recipes-tizen/crosswalk/crosswalk/romley-ivb/oe-defaults.gypi
new file mode 100644 (file)
index 0000000..0a6e8e8
--- /dev/null
+++ b/recipes-tizen/crosswalk/crosswalk/romley-ivb/oe-defaults.gypi
@@ -0,0 +1,15 @@
+{
+  'variables': {
+    'use_system_bzip2': 1,
+    'disable_nacl': 1,
+    'proprietary_codecs': 0,
+    'v8_use_snapshot': 1,
+    'use_system_ffmpeg': 0,
+    'linux_use_tcmalloc': 1,
+    'linux_link_kerberos': 0,
+    'use_kerberos': 0,
+    'use_cups': 0,
+    'use_gnome_keyring': 0,
+    'linux_link_gnome_keyring': 0,
+  }, 
+}

diff --git a/recipes-tizen/crosswalk/crosswalk/x86-64/include.gypi b/recipes-tizen/crosswalk/crosswalk/x86-64/include.gypi
new file mode 100644 (file)
index 0000000..c2e2a7d
--- /dev/null
+++ b/recipes-tizen/crosswalk/crosswalk/x86-64/include.gypi
@@ -0,0 +1,5 @@
+{
+  'variables': {
+    'target_arch': 'x64',
+  }
+}

diff --git a/recipes-tizen/crosswalk/crosswalk/x86-64/oe-defaults.gypi b/recipes-tizen/crosswalk/crosswalk/x86-64/oe-defaults.gypi
new file mode 100644 (file)
index 0000000..0a6e8e8
--- /dev/null
+++ b/recipes-tizen/crosswalk/crosswalk/x86-64/oe-defaults.gypi
@@ -0,0 +1,15 @@
+{
+  'variables': {
+    'use_system_bzip2': 1,
+    'disable_nacl': 1,
+    'proprietary_codecs': 0,
+    'v8_use_snapshot': 1,
+    'use_system_ffmpeg': 0,
+    'linux_use_tcmalloc': 1,
+    'linux_link_kerberos': 0,
+    'use_kerberos': 0,
+    'use_cups': 0,
+    'use_gnome_keyring': 0,
+    'linux_link_gnome_keyring': 0,
+  }, 
+}

diff --git a/recipes-tizen/iniparser/iniparser-extraconf.inc b/recipes-tizen/iniparser/iniparser-extraconf.inc
index e69de29..98ed794 100644 (file)
--- a/recipes-tizen/iniparser/iniparser-extraconf.inc
+++ b/recipes-tizen/iniparser/iniparser-extraconf.inc
@@ -0,0 +1,10 @@
+EXTRA_OEMAKE = "'CC=${CC} -fPIC' 'MYCFLAGS=${CFLAGS}' MYLDFLAGS='${LDFLAGS}'"
+
+do_compile() {
+    cd ${S}
+    LANG=C
+    export LANG
+    unset DISPLAY
+    LD_AS_NEEDED=1; export LD_AS_NEEDED ;
+    oe_runmake prefix=${prefix}  ${PARALLEL_MAKE} CFLAGS="${CFLAGS} -fPIC"
+}
\ No newline at end of file

diff --git a/recipes-tizen/libmm-common/libmm-common-extraconf.inc b/recipes-tizen/libmm-common/libmm-common-extraconf.inc
index e69de29..8e37e4c 100644 (file)
--- a/recipes-tizen/libmm-common/libmm-common-extraconf.inc
+++ b/recipes-tizen/libmm-common/libmm-common-extraconf.inc
@@ -0,0 +1,28 @@
+do_compile() {
+ cd ${S}
+ LANG=C
+ export LANG
+ unset DISPLAY
+ LD_AS_NEEDED=1; export LD_AS_NEEDED ;
+ CFLAGS="-DEXPORT_API=\"__attribute__((visibility(\\\"default\\\")))\" "
+   autotools_do_configure --build=${TARGET_SYS} --host=${HOST_SYS} \
+         --target=${TARGET_SYS} \
+         --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}
+ oe_runmake ${PARALLEL_MAKE}
+ 
+ 
+ 
+}
\ No newline at end of file

diff --git a/recipes-tizen/libmm-sound/libmm-sound-extraconf.inc b/recipes-tizen/libmm-sound/libmm-sound-extraconf.inc
index 01c9156..ae0d6c3 100644 (file)
--- a/recipes-tizen/libmm-sound/libmm-sound-extraconf.inc
+++ b/recipes-tizen/libmm-sound/libmm-sound-extraconf.inc
@@ -3,16 +3,16 @@ do_compile() {
  cd ${S}
  LANG=C
  export LANG
- unset DISPLAY
- LD_AS_NEEDED=1; export LD_AS_NEEDED ;
-
+ unset DISPLAY 
+ LD_AS_NEEDED=1; export LD_AS_NEEDED ; 
+ 
  ./autogen.sh
- CFLAGS="-O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -fvisibility=hidden -DMM_DEBUG_FLAG -DSEPARATE_SPEAKER_AND_WIRED_ACCESSORY -DEXPORT_API=\"__attribute__((visibility(\\\"default\\\")))\""; export CFLAGS
-
-   autoreconf -v --install --force
+ CFLAGS="-DMM_DEBUG_FLAG -DSEPARATE_SPEAKER_AND_WIRED_ACCESSORY -DEXPORT_API=\"__attribute__((visibility(\\\"default\\\")))\""; export CFLAGS
+ 
+   autoreconf -v --install --force  
    ./configure --host=${HOST_SYS} \
          --prefix=${prefix} --enable-pulse --enable-security
- make -j16
+ oe_runmake ${PARALLEL_MAKE}
 
 }
 

diff --git a/recipes-tizen/lua/lua-extraconf.inc b/recipes-tizen/lua/lua-extraconf.inc
index 34650e3..9f0b659 100644 (file)
--- a/recipes-tizen/lua/lua-extraconf.inc
+++ b/recipes-tizen/lua/lua-extraconf.inc
@@ -1,17 +1,13 @@
-do_compile() {
- cd ${S}
- LANG=C
- export LANG
- unset DISPLAY
- LD_AS_NEEDED=1; export LD_AS_NEEDED ;
-
- sed -i 's:LUA_ROOT2 "LIBDIR/lua/5.1/":LUA_ROOT2 \"lib/lua/5.1/":' src/luaconf.h
- make -j1 -C src CC="${CC}" MYCFLAGS="-O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -fPIC -DLUA_USE_LINUX" MYLDFLAGS='${LDFLAGS}' MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses" V=5.1 all
-
-
-
-}
 INSANE_SKIP_${PN}-dev = "staticdev"
 
-BBCLASSEXTEND += " nativesdk "
+EXTRA_OEMAKE = "'CC=${CC} -fPIC' 'MYCFLAGS=${CFLAGS} -DLUA_USE_LINUX -fPIC' MYLDFLAGS='${LDFLAGS}'"
 
+do_compile() {
+    cd ${S}
+    LANG=C
+    export LANG
+    unset DISPLAY
+    LD_AS_NEEDED=1; export LD_AS_NEEDED ;
+    sed -i 's:LUA_ROOT2 "LIBDIR/lua/5.1/":LUA_ROOT2 \"lib/lua/5.1/":' src/luaconf.h
+    oe_runmake ${PARALLEL_MAKE} -C src CC="${CC}" MYCFLAGS="${CFLAGS} -fPIC -DLUA_USE_LINUX" MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses" V=5.1 all
+}

diff --git a/recipes-tizen/pam/pam-extraconf.inc b/recipes-tizen/pam/pam-extraconf.inc
index f95e60f..3d77f9a 100644 (file)
--- a/recipes-tizen/pam/pam-extraconf.inc
+++ b/recipes-tizen/pam/pam-extraconf.inc
@@ -7,6 +7,43 @@ EXTRA_OECONF = "--with-db-uniquename=_pam \
                 --disable-regenerate-docu \
                 --disable-prelude"
 
+do_compile() {
+ cd ${S}
+ LANG=C
+ export LANG
+ unset DISPLAY
+ LD_AS_NEEDED=1; export LD_AS_NEEDED ;
+
+   autotools_do_configure --build=${TARGET_SYS} --host=${HOST_SYS} \
+         --target=${TARGET_SYS} \
+         --program-prefix= \
+         --prefix=${prefix} \
+         --exec-prefix=${prefix} \
+         --bindir=${prefix}/bin \
+         --sbindir=/sbin \
+         --sysconfdir=${sysconfdir} \
+         --datadir=${prefix}/share \
+         --includedir=${prefix}/include \
+         --libdir=${prefix}/lib \
+         --libexecdir=${prefix}/libexec \
+         --localstatedir=${localstatedir} \
+         --sharedstatedir=${prefix}/com \
+         --mandir=${mandir} \
+         --infodir=${infodir} \
+         --libdir=${prefix}/lib \
+         --includedir=${prefix}/include/security \
+         --enable-isadir=../..${prefix}/lib/security \
+         --disable-audit \
+         --with-db-uniquename=_pam \
+         --with-libiconv-prefix=/usr \
+         --enable-read-both-confs &&
+ 
+ make  CFLAGS="$CFLAGS -lfl -lcrypt"
+ 
+ 
+ 
+}
+
 PACKAGECONFIG[audit] = "--enable-audit,--disable-audit,audit,"
 
 pam-dev_files += "${prefix}/include/*"

diff --git a/recipes-tizen/rpm/rpm-extraconf.inc b/recipes-tizen/rpm/rpm-extraconf.inc
index 41ee0f1..cd37703 100644 (file)
--- a/recipes-tizen/rpm/rpm-extraconf.inc
+++ b/recipes-tizen/rpm/rpm-extraconf.inc
@@ -25,15 +25,11 @@ do_compile_prepend() {
  LANG=C
  export LANG
  unset DISPLAY
- CFLAGS="-O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables" ; export CFLAGS ;
- CXXFLAGS="${CXXFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables}" ; export CXXFLAGS ;
- FFLAGS="${FFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -I%_fmoddir }" ; export FFLAGS ;
  LD_AS_NEEDED=1; export LD_AS_NEEDED ;
 
  ### BUILD BEGIN ###
  CPPFLAGS="$CPPFLAGS `pkg-config --cflags nss`"
  export CPPFLAGS
- export CFLAGS="-O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -ffunction-sections"
  export LDFLAGS="${LDFLAGS} -Wl,-Bsymbolic-functions -ffunction-sections"
 
  export CCFLAGS+=" -fPIC "
@@ -58,7 +54,6 @@ do_compile() {
 
  CPPFLAGS="$CPPFLAGS `pkg-config --cflags nss`"
  export CPPFLAGS
- export CFLAGS="-O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -ffunction-sections"
  export LDFLAGS="${LDFLAGS} -Wl,-Bsymbolic-functions -ffunction-sections"
 
  BUILDTARGET="--host=x86_64-linux-gnu "
@@ -92,7 +87,7 @@ do_compile() {
      --with-msm \
      $BUILDTARGET
 
- make -j16
+ oe_runmake ${PARALLEL_MAKE}
 
 }