diff options
| author | dholland <dholland@pkgsrc.org> | 2013-02-18 04:25:06 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2013-02-18 04:25:06 +0000 |
| commit | f3ebffc8b5463ab46a2369a9196377ce77634cac (patch) | |
| tree | 881a9771d1f35efd9a11050037af4082024102dd | |
| parent | 89ebddf8a17fccedd4e11955cfbab02c71f3af0f (diff) | |
| download | pkgsrc-f3ebffc8b5463ab46a2369a9196377ce77634cac.tar.gz | |
Fix Linux build; from Rafael Kitover in PR 47546. While here, teach it
to not store IP(v4) addresses in 64-bit integers on LP64 hosts, as
that causes problems.
| -rw-r--r-- | net/host/Makefile | 6 | ||||
| -rw-r--r-- | net/host/distinfo | 4 | ||||
| -rw-r--r-- | net/host/patches/patch-aa | 20 |
3 files changed, 23 insertions, 7 deletions
diff --git a/net/host/Makefile b/net/host/Makefile index 4d039465d80..2b01e7bdc13 100644 --- a/net/host/Makefile +++ b/net/host/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2012/10/23 17:18:27 asau Exp $ +# $NetBSD: Makefile,v 1.26 2013/02/18 04:25:06 dholland Exp $ DISTNAME= host-20040812 PKGREVISION= 1 @@ -31,6 +31,10 @@ LDFLAGS+= -lresolv -lsocket -lnsl BUILDLINK_TRANSFORM+= rm:-Wl,--warn-common BUILDLINK_TRANSFORM+= rm:-static .endif +.if ${OPSYS} == "Linux" +LDFLAGS+= -lresolv +BUILDLINK_TRANSFORM+= rm:-static +.endif .if !empty(MACHINE_PLATFORM:MIRIX-5*) CPPFLAGS+= -DIRIX5 .endif diff --git a/net/host/distinfo b/net/host/distinfo index 54e63e4cc1f..740485d8a0b 100644 --- a/net/host/distinfo +++ b/net/host/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.10 2010/09/29 12:24:48 obache Exp $ +$NetBSD: distinfo,v 1.11 2013/02/18 04:25:06 dholland Exp $ SHA1 (host-20040812.tar.gz) = 02027effe88a851e6cecf133cef8ba096af48258 RMD160 (host-20040812.tar.gz) = d8fc5a0a4218eae75bcd14cce4353f82f049175e Size (host-20040812.tar.gz) = 147758 bytes -SHA1 (patch-aa) = d8f3d0e446463338d6fc7328990895ba9c8246f9 +SHA1 (patch-aa) = ea46e710f8188189d8f0a7f4eddc66a0b3525a46 SHA1 (patch-ab) = 459185f9340d2834c80628905609696b6e679255 SHA1 (patch-ac) = 35cf473a23b32b2f13f46bc6faba826c1ea3ae7c diff --git a/net/host/patches/patch-aa b/net/host/patches/patch-aa index 3e0f8b15aca..7e51bed1843 100644 --- a/net/host/patches/patch-aa +++ b/net/host/patches/patch-aa @@ -1,7 +1,10 @@ -$NetBSD: patch-aa,v 1.4 2006/10/03 14:25:55 schwarz Exp $ +$NetBSD: patch-aa,v 1.5 2013/02/18 04:25:07 dholland Exp $ ---- port.h.orig 2003-06-05 03:00:07.000000000 +0200 -+++ port.h 2006-10-03 16:23:18.000000000 +0200 + - support NetBSD and Irix + - check for _LP64 + +--- port.h.orig 2003-06-05 01:00:07.000000000 +0000 ++++ port.h @@ -76,7 +76,7 @@ * Every other conceivable version of the BIND-based resolvers should have one * or both of __BIND and/or __NAMESER defined to define their API version. @@ -11,7 +14,7 @@ $NetBSD: patch-aa,v 1.4 2006/10/03 14:25:55 schwarz Exp $ # define BIND_4_8 1 /* XXX this should be ``#include "ERROR!!!"''*/ #endif -@@ -154,7 +154,8 @@ +@@ -154,7 +154,8 @@ typedef int bool_t; /* boolean type */ */ #if defined(__NAMESER) && (!defined(__GLIBC__) || ((__RES - 0) > 19991006)) && \ ((__NAMESER - 0) >= 19991006 || \ @@ -21,3 +24,12 @@ $NetBSD: patch-aa,v 1.4 2006/10/03 14:25:55 schwarz Exp $ # define HAVE_GETIPNODEBYNAME 1 # define HAVE_GETIPNODEBYADDR 1 # define HAVE_FREEHOSTENT 1 +@@ -236,7 +237,7 @@ typedef u_char nbuf_t; + #endif + + #ifndef _IPADDR_T +-# if defined(__alpha) || defined(__arch64__) ++# if defined(__alpha) || defined(__arch64__) || defined(_LP64) + typedef unsigned int ipaddr_t; + # else + typedef unsigned long ipaddr_t; |