adns: correct configure issues

* Remove unknown functions AC_MSG_WARN and ADNS_C_GETFUNC in
  configure.in.
* Create symlinks to hmacros.i4 and hsyscalls.i4 so they can be found.
* Remove '`' and ''' around hsyscalls.i4 includes which prevent the
  file from being found.

Also update the generated recipe.

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

diff --git a/recipes-tizen/adns/adns-extraconf.inc b/recipes-tizen/adns/adns-extraconf.inc
index 7fa22c8..161e7d0 100644 (file)
--- a/recipes-tizen/adns/adns-extraconf.inc
+++ b/recipes-tizen/adns/adns-extraconf.inc
@@ -1,4 +1,10 @@
+SRC_URI += "file://0001-Yocto-fix-remove-unknown-configure-functions.patch"
+
 do_configure_prepend() {
-    sed -i 's@AC_MSG_WARN(\[tsearch missing - not building client program(s) $PROGS_IF_TSEARCH\])@@' configure.in
-    sed -i 's@AC_MSG_WARN(\[inet_aton is in libresolv, urgh.  Must use -lresolv.\])@@' configure.in
-}
\ No newline at end of file
+    # Create symlinks to regress/hmacros.i4 and regress/hsyscalls.i4 in root src dir since they are not searched in the regress/ dir.
+    # There is probably a better way to manage that such as adding the regress/ dir to the src dirs but it seems to already be the case...
+    ln -sfn regress/hmacros.i4 hmacros.i4
+    ln -sfn regress/hsyscalls.i4 hsyscalls.i4
+    # Remove '`' and ''' around hsyscalls.i4 which prevent the file from being found.
+    grep -rl "m4_include" regress | xargs sed -i "s@m4_include(\`hsyscalls.i4')@m4_include(hsyscalls.i4)@g"
+}

diff --git a/recipes-tizen/adns/adns.inc b/recipes-tizen/adns/adns.inc
index 045a1cd..a16311f 100644 (file)
--- a/recipes-tizen/adns/adns.inc
+++ b/recipes-tizen/adns/adns.inc
@@ -1,6 +1,6 @@
 DESCRIPTION = "Advanced Easy-to-Use Asynchronous-Capable DNS Utilities"
 HOMEPAGE = "http://www.chiark.greenend.org.uk/~ian/adns/"
-SECTION = "Productivity/Networking/DNS/Utilities"
+SECTION = "System/Utilities"
 LICENSE = "GPL-2.0+"
 
 SRC_URI = ""
@@ -56,10 +56,9 @@ do_compile() {
   unset DISPLAY
   LD_AS_NEEDED=1; export LD_AS_NEEDED ;
   
-  autoreconf -fiv
   
   autotools_do_configure
-  make -j16 all
+  oe_runmake -j16 all
   
   
   
@@ -86,7 +85,6 @@ do_install() {
    find ${D} -regex ".*\.a$" | xargs rm -f --
  
  
- 
 }
 
 pkg_postinst_libadns() {

diff --git a/recipes-tizen/adns/adns/0001-Yocto-fix-remove-unknown-configure-functions.patch b/recipes-tizen/adns/adns/0001-Yocto-fix-remove-unknown-configure-functions.patch
new file mode 100644 (file)
index 0000000..ba29090
--- /dev/null
+++ b/recipes-tizen/adns/adns/0001-Yocto-fix-remove-unknown-configure-functions.patch
@@ -0,0 +1,50 @@
+From 93c8263990e954055ec4ab638530e873460ece63 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?K=C3=A9vin=20THIERRY?= <kevin.thierry@open.eurogiciel.org>
+Date: Fri, 29 Aug 2014 14:38:41 +0200
+Subject: [PATCH] Yocto fix: remove unknown configure functions
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Change-Id: Ice256455ab7ced0df8bc962863d23c3cac929c02
+Signed-off-by: Kévin THIERRY <kevin.thierry@open.eurogiciel.org>
+---
+ configure.in | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index e7a5ee6..9d087e6 100644
+--- a/configure.in
++++ b/configure.in
+@@ -177,8 +177,6 @@ struct pollfd { int fd; short events; short revents; };
+ ])
+ 
+ AC_CHECK_FUNCS(poll)
+-ADNS_C_GETFUNC(socket,socket)
+-ADNS_C_GETFUNC(inet_ntoa,nsl)
+ 
+ PROGS_IF_TSEARCH=adnsresfilter
+ AC_SUBST(PROGS_HAVE_TSEARCH)
+@@ -186,7 +184,6 @@ AC_CHECK_FUNC(tsearch,[
+  PROGS_HAVE_TSEARCH=$PROGS_IF_TSEARCH
+ ],[
+  PROGS_HAVE_TSEARCH='';
+- AC_MSG_WARN([tsearch missing - not building client program(s) $PROGS_IF_TSEARCH])
+ ])
+ 
+ AC_MSG_CHECKING(for INADDR_LOOPBACK)
+@@ -211,11 +208,6 @@ else
+  ])
+ fi
+ 
+-ADNS_C_GETFUNC(inet_aton,resolv,[
+- LIBS="-lresolv $LIBS";
+- AC_MSG_WARN([inet_aton is in libresolv, urgh.  Must use -lresolv.])
+-])
+-
+ DPKG_CACHED_TRY_COMPILE(inlines,dpkg_cv_c_inline,,
+  [} inline int foo (int x) {],
+  AC_MSG_RESULT(yes)
+-- 
+1.8.1.4
+

diff --git a/recipes-tizen/adns/adns_git.bb b/recipes-tizen/adns/adns_git.bb
index ff05e02..808c63e 100644 (file)
--- a/recipes-tizen/adns/adns_git.bb
+++ b/recipes-tizen/adns/adns_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/platform/upstream/adns;tag=b17c61b0cea0a7b65f33a8454c0a017b5f95124c;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/upstream/adns;tag=20e474eda39bdaa3ab7a80345e77d93967d55f88;nobranch=1"
 
 BBCLASSEXTEND += " native "