From: Kévin THIERRY <kevin.thierry@open.eurogiciel.org>
Date: Wed, 20 Aug 2014 15:03:21 +0000 (+0200)
Subject: libwebsockets: correct build issue
X-Git-Tag: ivi_rev_0.1~55
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F27%2F26327%2F2;p=scm%2Fbb%2Fmeta-tizen.git

libwebsockets: correct build issue

Inherit Yocto cmake functions and add the necessary parameters. cmake
Yocto functions override the default functions (do_configure,
do_compile, do_install...).

Also update recipe.

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

diff --git a/recipes-tizen/libwebsockets/libwebsockets-extraconf.inc b/recipes-tizen/libwebsockets/libwebsockets-extraconf.inc
index e69de29..dc1eef6 100644
--- a/recipes-tizen/libwebsockets/libwebsockets-extraconf.inc
+++ b/recipes-tizen/libwebsockets/libwebsockets-extraconf.inc
@@ -0,0 +1,19 @@
+inherit pkgconfig cmake
+
+EXTRA_OECMAKE += " -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 \
+                    -DWITH_SSL=On \
+                    -DWITH_SD_DAEMON=ON "
+
+cmake_do_install_append() {
+    rm -f ${D}${infodir}/dir
+    find ${D} -regex ".*\.la$" | xargs rm -f --
+    find ${D} -regex ".*\.a$" | xargs rm -f --
+}
diff --git a/recipes-tizen/libwebsockets/libwebsockets.inc b/recipes-tizen/libwebsockets/libwebsockets.inc
index 6f28fea..104bec1 100644
--- a/recipes-tizen/libwebsockets/libwebsockets.inc
+++ b/recipes-tizen/libwebsockets/libwebsockets.inc
@@ -1,7 +1,7 @@
 DESCRIPTION = "WebSocket Library"
 HOMEPAGE = "http://nohomepage.org"
 SECTION = "System/Libraries"
-LICENSE = "LGPLv2.1"
+LICENSE = "LGPL-2.1"
 
 SRC_URI = ""
 
@@ -70,14 +70,14 @@ do_compile() {
          -DBUILD_SHARED_LIBS:BOOL=ON \
          ${EXTRA_OECMAKE} -DWITH_SSL=On -DWITH_SD_DAEMON=ON
  
- make -j16
+ oe_runmake -j16
  
  
  
 }
 
 do_install() {
- echo export RPM_BUILD_ROOT=${D}
+ export RPM_BUILD_ROOT=${D}
  cd ${S}
  LANG=C
  export LANG
diff --git a/recipes-tizen/libwebsockets/libwebsockets_git.bb b/recipes-tizen/libwebsockets/libwebsockets_git.bb
index 9f30102..dfdc0f9 100644
--- a/recipes-tizen/libwebsockets/libwebsockets_git.bb
+++ b/recipes-tizen/libwebsockets/libwebsockets_git.bb
@@ -4,7 +4,7 @@ PRIORITY = "10"
 
 LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 
-SRC_URI += "git://review.tizen.org/profile/ivi/libwebsockets;tag=270620a55c0144f0af05f006523f2d294298ade2;nobranch=1"
+SRC_URI += "git://review.tizen.org/profile/ivi/libwebsockets;tag=d23ec16cf1cd3cc8c85884ed2b2c9afbcdedc027;nobranch=1"
 
 BBCLASSEXTEND += " native "