[oe-commits] org.oe.dev ntop: fix compilation issue (bug #1993)

[lenehan commit]

ntop: fix compilation issue (bug #1993)
* applied patch by Jamie Lenehan

Author: lenehan at twibble.org
Branch: org.openembedded.dev
Revision: d2ff855675080c5ae36403d11904698712868163
ViewMTN: http://monotone.openembedded.org/revision.psp?id=d2ff855675080c5ae36403d11904698712868163
Files:
1
packages/ntop/ntop-3.0/autotools.patch
packages/ntop/ntop_3.0.bb
Diffs:

#
# mt diff -r5e20d633091079f2cc58e4fc63d5eeba57c7d6b8 -rd2ff855675080c5ae36403d11904698712868163
#
# 
# 
# patch "packages/ntop/ntop-3.0/autotools.patch"
#  from [39de25577f48a3ec45eba97b4ec210c1ef78327a]
#    to [b7452a78e0098fa3dab03679c8ac195e42a2ead7]
# 
# patch "packages/ntop/ntop_3.0.bb"
#  from [53d18b36169c50e10b8e1e25e0f7e09f8da8772e]
#    to [23e78a4fb233134ddee3b6b6d6cdc953ddf99a70]
# 
============================================================
--- packages/ntop/ntop-3.0/autotools.patch	39de25577f48a3ec45eba97b4ec210c1ef78327a
+++ packages/ntop/ntop-3.0/autotools.patch	b7452a78e0098fa3dab03679c8ac195e42a2ead7
@@ -1,6 +1,16 @@
---- tmp/base/ntop-3.0-r0/ntop-3.0/acinclude.m4	2004-03-09 12:19:57.000000000 -0500
-+++ ntop-3.0/acinclude.m4	2004-03-09 12:19:57.000000000 -0500
-@@ -205,433 +205,3 @@
+--- ntop-3.0/acinclude.m4	2007/03/15 23:08:29	1.1
++++ ntop-3.0/acinclude.m4	2007/03/15 23:08:43
+@@ -34,6 +34,9 @@
+ dnl>    #undef HAVE_<typedef>
+ dnl>
+ 
++LIBTOOL='$host_alias-libtool'
++AC_SUBST(LIBTOOL)dnl
++
+ AC_DEFUN([AC_CHECK_TYPEDEF],[dnl
+ AC_REQUIRE([AC_HEADER_STDC])dnl
+ AC_MSG_CHECKING(for typedef $1)
+@@ -205,433 +208,3 @@
  fi
  # Finished expansion of NTOPCONFIGDEBUG_SETTINGS()
  ])
@@ -434,8 +444,8 @@
 -
 -dnl This is just to silence aclocal about the macro not being used
 -ifelse([AC_DISABLE_FAST_INSTALL])dnl
---- tmp/base/ntop-3.0-r0/ntop-3.0/configure.in	2004-03-21 18:45:04.000000000 -0500
-+++ ntop-3.0/configure.in	2004-05-22 14:20:07.000000000 -0400
+--- ntop-3.0/configure.in	2007/03/15 23:08:29	1.1
++++ ntop-3.0/configure.in	2007/03/15 23:08:34
 @@ -190,7 +190,6 @@
  AC_PROG_INSTALL
  AC_PROG_LN_S
============================================================
--- packages/ntop/ntop_3.0.bb	53d18b36169c50e10b8e1e25e0f7e09f8da8772e
+++ packages/ntop/ntop_3.0.bb	23e78a4fb233134ddee3b6b6d6cdc953ddf99a70
@@ -1,8 +1,9 @@ DEPENDS = "gdbm zlib libpcap libpng gd"
 LICENSE = "GPL"
 DESCRIPTION = "ntop is network top"
 SECTION = "console/network"
 PRIORITY = "optional"
 DEPENDS = "gdbm zlib libpcap libpng gd"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/ntop/ntop-${PV}.tgz \
            file://${FILESDIR}/autotools.patch;patch=1 \
@@ -25,11 +26,13 @@ FILES_${PN}-dev = "${includedir} ${libdi
 FILES_ntop_append = " ${libdir}/ntop/plugins/*.so ${libdir}/libntop-*.so \
                        ${libdir}/libntopreport-*.so"
 FILES_${PN}-dev = "${includedir} ${libdir}/libntop.so ${libdir}/libntopreport.so \
-                   ${libdir}/libntop.a ${libdir}/libntopreport.a ${libdir}/*.la"
+                   ${libdir}/*.a ${libdir}/libntopreport.a ${libdir}/*.la"
+FILES_${PN}-dbg += "${libdir}/ntop/plugins/.debug"
 
-do_configure () {
+do_configure_prepend () {
 	if [ ! -e acinclude.m4 ]; then
 		mv acinclude.m4.ntop acinclude.m4
 	fi
-	autotools_do_configure
+	rm -f libtool
+	cp ${STAGING_BINDIR_NATIVE}/${TARGET_SYS}-libtool libtool
 }