meta-tizen: Update systemd recipe
authorKévin THIERRY <kevin.thierry@open.eurogiciel.org>
Mon, 16 Jun 2014 13:57:53 +0000 (15:57 +0200)
committerPatrick Ohly <patrick.ohly@intel.com>
Fri, 9 Jan 2015 17:20:48 +0000 (09:20 -0800)
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
(From meta-tizen rev: 855e9cde213f9f56a37d40917e740324d5c2b084)

Signed-off-by: Kévin THIERRY <kevin.thierry@open.eurogiciel.org>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
meta-tizen/recipes-tizen/systemd/systemd-extraconf.inc
meta-tizen/recipes-tizen/systemd/systemd.inc

index 2b0adb8..8d000d9 100644 (file)
@@ -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
 }
index 3ffb49b..27845a9 100644 (file)
@@ -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} \