From: Kévin THIERRY Date: Mon, 16 Jun 2014 13:57:53 +0000 (+0200) Subject: Update systemd recipe X-Git-Tag: demo_release_0.1~18^2~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=855e9cde213f9f56a37d40917e740324d5c2b084;p=scm%2Fbb%2Fmeta-tizen.git Update systemd recipe New generated recipe. This commit correct a build error introduced with the last systemd recipe update (commit f82c956587e36a2b6ffb6d0ff715205415600e02). Also clean systemd-extraconf.inc. Change-Id: I5855170e4816634f1723692cf52ae0c035497d9f Signed-off-by: Kévin THIERRY --- diff --git a/recipes-tizen/systemd/systemd-extraconf.inc b/recipes-tizen/systemd/systemd-extraconf.inc index 2b0adb8..8d000d9 100644 --- a/recipes-tizen/systemd/systemd-extraconf.inc +++ b/recipes-tizen/systemd/systemd-extraconf.inc @@ -51,9 +51,9 @@ EXTRA_OECONF = " --disable-manpages \ GTKDOC_DOCDIR = "${S}/docs/" do_configure_prepend() { - rm -f ${S}/docs/gtk-doc.make - echo 'EXTRA_DIST =' > ${S}/docs/gtk-doc.make + rm -f ${S}/docs/gtk-doc.make + echo 'EXTRA_DIST =' > ${S}/docs/gtk-doc.make - sed -i 's!@KMOD@!/bin/kmod!g' ${S}/units/kmod-static-nodes.service.in - sed -i 's!@KILL@!/bin/kill!g' ${S}/units/user/systemd-exit.service.in + sed -i 's!@KMOD@!/bin/kmod!g' ${S}/units/kmod-static-nodes.service.in + sed -i 's!@KILL@!/bin/kill!g' ${S}/units/user/systemd-exit.service.in } diff --git a/recipes-tizen/systemd/systemd.inc b/recipes-tizen/systemd/systemd.inc index 3ffb49b..27845a9 100644 --- a/recipes-tizen/systemd/systemd.inc +++ b/recipes-tizen/systemd/systemd.inc @@ -118,10 +118,11 @@ do_compile() { LD_AS_NEEDED=1; export LD_AS_NEEDED ; + CFLAGS="${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 ; - ./autogen.sh --build=${TARGET_SYS} --host=${HOST_SYS} \ + autotools_do_configure --build=${TARGET_SYS} --host=${HOST_SYS} \ --target=x86_64-tizen-linux \ --program-prefix= \ --prefix=${prefix} \