Also fix compilation problem with uclibc #199222

(Portage version: 2.2_rc23/cvs/Linux x86_64)

4 files changed, 40 insertions, 13 deletions

diff --git a/net-voip/yate/ChangeLog b/net-voip/yate/ChangeLog
index 287545efdc64..33b0af715fc9 100644
--- a/net-voip/yate/ChangeLog
+++ b/net-voip/yate/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-voip/yate
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/yate/ChangeLog,v 1.6 2009/02/06 14:49:47 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/yate/ChangeLog,v 1.7 2009/02/06 15:21:30 drizzt Exp $
+
+  06 Feb 2009; Timothy Redaelli <drizzt@gentoo.org>
+  files/yate-1.3.0-makefiles.patch, +files/yate-1.3.0-resolv.patch,
+  yate-1.3.0.ebuild:
+  Also fix compilation problem with uclibc #199222
 
 *yate-1.3.0 (06 Feb 2009)
 
diff --git a/net-voip/yate/files/yate-1.3.0-makefiles.patch b/net-voip/yate/files/yate-1.3.0-makefiles.patch
index 05e16f7d9be0..ecf3aa7827fb 100644
--- a/net-voip/yate/files/yate-1.3.0-makefiles.patch
+++ b/net-voip/yate/files/yate-1.3.0-makefiles.patch
@@ -64,8 +64,6 @@ diff -ur --exclude Makefile yate.orig/clients/Makefile.in yate/clients/Makefile.
  
  $(GTKCLIENT):
  	$(MAKE) -C ../contrib/gtk2
-Only in yate: config.log
-Only in yate: config.status
 diff -ur --exclude Makefile yate.orig/contrib/gtk2/Makefile.in yate/contrib/gtk2/Makefile.in
 --- yate.orig/contrib/gtk2/Makefile.in	2009-02-06 14:54:30.457004060 +0100
 +++ yate/contrib/gtk2/Makefile.in	2009-02-06 15:17:15.993003394 +0100
@@ -89,7 +87,6 @@ diff -ur --exclude Makefile yate.orig/contrib/gtk2/Makefile.in yate/contrib/gtk2
  SOURCES = gtk2client.cpp
  OBJECTS = $(SOURCES:.cpp=.o)
  
-Only in yate/contrib/gtk2: Makefile.in.orig
 diff -ur --exclude Makefile yate.orig/contrib/ilbc/Makefile.in yate/contrib/ilbc/Makefile.in
 --- yate.orig/contrib/ilbc/Makefile.in	2009-02-06 14:54:30.457004060 +0100
 +++ yate/contrib/ilbc/Makefile.in	2009-02-06 15:08:35.465004588 +0100
@@ -117,7 +114,7 @@ diff -ur --exclude Makefile yate.orig/contrib/yiax/Makefile.in yate/contrib/yiax
  DEFS :=
  INCLUDES := -I@top_srcdir@ -I../.. -I@srcdir@
 -CFLAGS := -O2 @MODULE_CPPFLAGS@ @INLINE_FLAGS@
-+CXFLAGS += @MODULE_CPPFLAGS@ @INLINE_FLAGS@
++CXXFLAGS += @MODULE_CPPFLAGS@ @INLINE_FLAGS@
  LDFLAGS:= -L../.. -lyate
  INCFILES := @top_srcdir@/yateclass.h @srcdir@/yateiax.h
  
@@ -316,7 +313,7 @@ diff -ur --exclude Makefile yate.orig/modules/Makefile.in yate/modules/Makefile.
  
  .PHONY: install
  install: all do-install
-@@ -169,80 +169,80 @@
+@@ -169,80 +169,84 @@
  	$(LINK) -shared -o $@ $^
  
  %.yate: @srcdir@/%.cpp $(MKDEPS) $(INCFILES)
@@ -381,7 +378,7 @@ diff -ur --exclude Makefile yate.orig/modules/Makefile.in yate/modules/Makefile.
  
  ilbccodec.yate: ../contrib/ilbc/libilbc.a
 -ilbccodec.yate: LOCALLIBS = ../contrib/ilbc/libilbc.a
-+ilbccodec.yate: LOCALLIBS += ../contrib/ilbc/libilbc.a
++ilbccodec.yate: LOCALLIBS += ../contrib/ilbc/libilbc.a -lm
  ilbccodec.yate: LOCALFLAGS = @ILBC_INC@
  
 -gsmcodec.yate: LOCALLIBS = -lgsm
@@ -415,10 +412,13 @@ diff -ur --exclude Makefile yate.orig/modules/Makefile.in yate/modules/Makefile.
  rmanager.yate: LOCALFLAGS = $(COREDUMP_INC)
 -rmanager.yate: LOCALLIBS = $(COREDUMP_LIB)
 +rmanager.yate: LOCALLIBS += $(COREDUMP_LIB)
++
++analyzer.yate: LOCALLIBS += -lm
++tonegen.yate: LOCALLIBS += -lm
++yradius.yate: LOCALLIBS += -lm
  
  ../libyatess7.so:
  	$(MAKE) -C ../contrib/yss7
-Only in yate: run
 diff -ur --exclude Makefile yate.orig/test/Makefile.in yate/test/Makefile.in
 --- yate.orig/test/Makefile.in	2009-02-06 14:54:30.497003971 +0100
 +++ yate/test/Makefile.in	2009-02-06 15:03:14.912003374 +0100
@@ -442,6 +442,3 @@ diff -ur --exclude Makefile yate.orig/test/Makefile.in yate/test/Makefile.in
  COMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CFLAGS)
  LINK = $(CXX) $(LDFLAGS)
  MODLINK = $(CXX) $(MODFLAGS) $(MODSTRIP) $(LDFLAGS)
-Only in yate: yate-config
-Only in yate: yate.pc
-Only in yate: yateversn.h
diff --git a/net-voip/yate/files/yate-1.3.0-resolv.patch b/net-voip/yate/files/yate-1.3.0-resolv.patch
new file mode 100644
index 000000000000..203db9ec4c18
--- /dev/null
+++ b/net-voip/yate/files/yate-1.3.0-resolv.patch
@@ -0,0 +1,22 @@
+--- ../yate.orig/configure.in	2009-02-06 15:55:22.000000000 +0100
++++ ../yate/configure.in	2009-02-06 16:04:36.000000000 +0100
+@@ -182,14 +182,17 @@
+ 
+ # Checks for optional libraries.
+ 
++SAVE_LIBS="$LIBS"
++LIBS=-lresolv
+ HAVE_RESOLV=no
+-AC_MSG_CHECKING([for resolver library])
++AC_MSG_CHECKING([for resolver library (with dn_skipname)])
+ AC_LANG_SAVE
+ AC_LANG_C
+ AC_TRY_LINK([#include <netinet/in.h>
+ #include <arpa/nameser.h>
+-#include <resolv.h>],[res_init();],[HAVE_RESOLV=yes],[HAVE_RESOLV=no])
++#include <resolv.h>],[res_init(); dn_skipname(NULL, NULL);],[HAVE_RESOLV=yes],[HAVE_RESOLV=no])
+ AC_LANG_RESTORE
++LIBS="$SAVE_LIBS"
+ AC_MSG_RESULT([$HAVE_RESOLV])
+ AC_SUBST(HAVE_RESOLV)
+ 
diff --git a/net-voip/yate/yate-1.3.0.ebuild b/net-voip/yate/yate-1.3.0.ebuild
index cae8863b134a..32cdbdd18a0b 100644
--- a/net-voip/yate/yate-1.3.0.ebuild
+++ b/net-voip/yate/yate-1.3.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/yate/yate-1.3.0.ebuild,v 1.1 2009/02/06 14:49:47 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/yate/yate-1.3.0.ebuild,v 1.2 2009/02/06 15:21:30 drizzt Exp $
 
 IUSE="doc gsm gtk h323 ilbc postgres zaptel"
 
-inherit eutils
+inherit eutils autotools
 
 DESCRIPTION="YATE - Yet Another Telephony Engine"
 HOMEPAGE="http://yate.null.ro/"
@@ -36,6 +36,9 @@ src_unpack() {
 
 	# fix makefiles for custom CFLAGS/LDFLAGS
 	epatch "${FILESDIR}"/${P}-makefiles.patch
+	epatch "${FILESDIR}"/${P}-resolv.patch #199222
+
+	eautoconf
 }
 
 src_compile() {