pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/pkgsrc-2004Q2]: pkgsrc Pullup ticket 71 to the pkgsrc-2004Q2 branch, ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/a9f52eddad13
branches: pkgsrc-2004Q2
changeset: 476741:a9f52eddad13
user: agc <agc%pkgsrc.org@localhost>
date: Mon Jul 26 16:30:37 2004 +0000
description:
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.
diffstat:
doc/CHANGES-pkgsrc-2004Q2 | 4 +++-
net/libpcap/buildlink3.mk | 12 +++++++++++-
2 files changed, 14 insertions(+), 2 deletions(-)
diffs (42 lines):
diff -r 83c2547c7106 -r a9f52eddad13 doc/CHANGES-pkgsrc-2004Q2
--- a/doc/CHANGES-pkgsrc-2004Q2 Mon Jul 26 16:26:18 2004 +0000
+++ b/doc/CHANGES-pkgsrc-2004Q2 Mon Jul 26 16:30:37 2004 +0000
@@ -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 @@
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 -r 83c2547c7106 -r a9f52eddad13 net/libpcap/buildlink3.mk
--- a/net/libpcap/buildlink3.mk Mon Jul 26 16:26:18 2004 +0000
+++ b/net/libpcap/buildlink3.mk Mon Jul 26 16:30:37 2004 +0000
@@ -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 @@
.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/+$//}
Home |
Main Index |
Thread Index |
Old Index