[csw-devel] SF.net SVN: gar:[14669] csw/mgar/pkg/ipv6calc/trunk

[skayser at users.sourceforge.net]

Revision: 14669
          http://gar.svn.sourceforge.net/gar/?rev=14669&view=rev
Author:   skayser
Date:     2011-05-30 21:57:12 +0000 (Mon, 30 May 2011)

Log Message:
-----------
ipv6calc/trunk: fix missing -lsocket/-lnsl in ./configure, override gcc'isms

Modified Paths:
--------------
    csw/mgar/pkg/ipv6calc/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/ipv6calc/trunk/files/0001-Include-lsocket-and-lnsl-in-.-configure-checks.patch

Modified: csw/mgar/pkg/ipv6calc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ipv6calc/trunk/Makefile	2011-05-30 19:11:07 UTC (rev 14668)
+++ csw/mgar/pkg/ipv6calc/trunk/Makefile	2011-05-30 21:57:12 UTC (rev 14669)
@@ -1,7 +1,9 @@
 # $Id$
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
-# ! ./configure fails, check for GeoIP doesn't include -lsocket
+# ! Final linking fails
+#   /opt/SUNWspro/bin/cc -m32 -xarch=386 -L/opt/csw/lib -o ipv6calc ipv6calc.o showinfo.o ../getopt/getopt.o ../getopt/getopt1.o ../md5/md5.o -lipv6calc -L../lib/ -L/opt/csw/lib -lGeoIP
+#   ld: fatal: library -lipv6calc: not found
 #
 NAME = ipv6calc
 VERSION = 0.90.0
@@ -22,9 +24,19 @@
 MASTER_SITES = ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/
 DISTFILES    = $(DISTNAME).tar.gz
 
+PATCHFILES += 0001-Include-lsocket-and-lnsl-in-.-configure-checks.patch
+
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-geoip
 CONFIGURE_ARGS += --with-geoip-headers=$(includedir)
 CONFIGURE_ARGS += --with-geoip-lib=$(libdir)
 
+# ipv6calc pre-sets DEFAULT_CFLAGS with gcc'isms, override these
+BUILD_OVERRIDE_VARS = DEFAULT_CFLAGS
+DEFAULT_CFLAGS =
+
 include gar/category.mk
+
+pre-configure-modulated:
+	@cd $(WORKSRC) && autoreconf -fi
+	@$(MAKECOOKIE)

Added: csw/mgar/pkg/ipv6calc/trunk/files/0001-Include-lsocket-and-lnsl-in-.-configure-checks.patch
===================================================================
--- csw/mgar/pkg/ipv6calc/trunk/files/0001-Include-lsocket-and-lnsl-in-.-configure-checks.patch	                        (rev 0)
+++ csw/mgar/pkg/ipv6calc/trunk/files/0001-Include-lsocket-and-lnsl-in-.-configure-checks.patch	2011-05-30 21:57:12 UTC (rev 14669)
@@ -0,0 +1,27 @@
+From be2bfae944d34f4aeee1126c2a345981142ba4ca Mon Sep 17 00:00:00 2001
+From: Sebastian Kayser <skayser at opencsw.org>
+Date: Mon, 30 May 2011 23:41:36 +0200
+Subject: [PATCH] Include -lsocket and -lnsl in ./configure checks.
+
+---
+ configure.in |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index d03e5a9..d42b43d 100644
+--- a/configure.in
++++ b/configure.in
+@@ -44,6 +44,10 @@ AC_CHECK_FUNC(getopt_long, [],
+ AC_SUBST(GETOPT_INCLUDE)
+ AC_SUBST(ENABLE_BUNDLED_GETOPT)
+ 
++dnl check for -lnsl, -lsocket
++AC_CHECK_FUNC(gethostbyname,,AC_CHECK_LIB(nsl, gethostbyname))
++AC_CHECK_FUNC(socket,,AC_CHECK_LIB(socket, socket))
++
+ dnl IP2Location support
+ AC_ARG_ENABLE([ip2location], 
+ 	AS_HELP_STRING([--enable-ip2location],
+-- 
+1.7.3.2
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.