diff options
| author | agc <agc> | 2004-07-26 16:30:37 +0000 |
|---|---|---|
| committer | agc <agc> | 2004-07-26 16:30:37 +0000 |
| commit | d39315f11d2b4e0d82b365d4e19c3e5db347530f (patch) | |
| tree | 91cf2419ccba25bc660db7fa6713e040d7e87fb9 | |
| parent | 8f4f7c7038273635062ea7ece09351f96fbcac4b (diff) | |
| download | pkgsrc-d39315f11d2b4e0d82b365d4e19c3e5db347530f.tar.gz | |
Pullup ticket 71 to the pkgsrc-2004Q2 branch, requested by Grant Beattie
Solaris fix for libpcap
Module Name: pkgsrc
Committed By: grant
Date: Sun Jun 27 12:04:45 UTC 2004
Modified Files:
pkgsrc/net/libpcap: buildlink3.mk
Log Message:
on Solaris, binaries that use libpcap.a always need -lnsl and -lsocket
for the socket functions.
| -rw-r--r-- | doc/CHANGES-pkgsrc-2004Q2 | 4 | ||||
| -rw-r--r-- | net/libpcap/buildlink3.mk | 12 |
2 files changed, 14 insertions, 2 deletions
diff --git a/doc/CHANGES-pkgsrc-2004Q2 b/doc/CHANGES-pkgsrc-2004Q2 index f0e1196f064..f209109334b 100644 --- a/doc/CHANGES-pkgsrc-2004Q2 +++ b/doc/CHANGES-pkgsrc-2004Q2 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-pkgsrc-2004Q2,v 1.1.2.34 2004/07/26 16:26:18 agc Exp $ +$NetBSD: CHANGES-pkgsrc-2004Q2,v 1.1.2.35 2004/07/26 16:30:37 agc Exp $ Changes to the packages collection and infrastructure on the pkgsrc-2004Q2 branch: @@ -64,4 +64,6 @@ Pullup ticket 69, requested by Grant Beattie [agc 2004-07-26] Solaris/non-NetBSD fix for dvidvi Pullup ticket 70, requested by Grant Beattie [agc 2004-07-26] Build fix for gimp-print-cups +Pullup ticket 71, requested by Grant Beattie [agc 2004-07-26] + Solaris fix for libpcap diff --git a/net/libpcap/buildlink3.mk b/net/libpcap/buildlink3.mk index 266ab6c3527..bc48abebfb3 100644 --- a/net/libpcap/buildlink3.mk +++ b/net/libpcap/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.12 2004/03/10 17:57:14 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.12.4.1 2004/07/26 16:30:37 agc Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBPCAP_BUILDLINK3_MK:= ${LIBPCAP_BUILDLINK3_MK}+ @@ -13,6 +13,16 @@ BUILDLINK_PACKAGES+= libpcap .if !empty(LIBPCAP_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.libpcap+= libpcap>=0.7.2 BUILDLINK_PKGSRCDIR.libpcap?= ../../net/libpcap + +. include "../../mk/bsd.prefs.mk" + +# on Solaris, we always need libnsl and libsocket because libpcap.a +# references symbols in them. +. if ${OPSYS} == "SunOS" +BUILDLINK_LDADD.libpcap+= -lnsl -lsocket +LDFLAGS+= ${BUILDLINK_LDADD.libpcap} +. endif + .endif # LIBPCAP_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} |