diff options
| author | he <he@pkgsrc.org> | 2017-08-28 10:29:41 +0000 |
|---|---|---|
| committer | he <he@pkgsrc.org> | 2017-08-28 10:29:41 +0000 |
| commit | f960b3fbf14799504b0bbc2949ffee3b52828254 (patch) | |
| tree | 58c028859ef40b90c85205de4ae42090bfa3e379 /net/ns | |
| parent | fe25bdd18cc25288a264dca978703faa0b00b29e (diff) | |
| download | pkgsrc-f960b3fbf14799504b0bbc2949ffee3b52828254.tar.gz | |
Add a patch to make this build on NetBSD again.
The hack to let lib/bsd-list.h substitute for <sys/queue.h> and
prevent the latter's processing fails miserably on NetBSD, because
on NetBSD, <net/if.h> requires the TAILQ_* macros which are not
defined in lib/bsd-list.h.
No PKGREVISION bump since this is a build fix only.
Diffstat (limited to 'net/ns')
| -rw-r--r-- | net/ns/distinfo | 3 | ||||
| -rw-r--r-- | net/ns/patches/patch-lib_bsd-list.h | 21 |
2 files changed, 23 insertions, 1 deletions
diff --git a/net/ns/distinfo b/net/ns/distinfo index 88f914b4239..721bc8957cf 100644 --- a/net/ns/distinfo +++ b/net/ns/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.22 2015/11/04 00:35:16 agc Exp $ +$NetBSD: distinfo,v 1.23 2017/08/28 10:29:41 he Exp $ SHA1 (ns-src-2.35.tar.gz) = 785d4045711d92c0042a6f8f5620d5eb74732980 RMD160 (ns-src-2.35.tar.gz) = 197e6874b97c56819ce9a722ffab9fe80a5cfe21 @@ -25,6 +25,7 @@ SHA1 (patch-common_ptypes2tcl.cc) = 2354e030fef92d28c2c4049be30dcb365302068a SHA1 (patch-common_scheduler.cc) = 9fc226aa15a50880b09b97c99b9778e7c230d4da SHA1 (patch-common_tclAppInit.cc) = a96791d7a4cdf9834fa2e3bf994903944f41b011 SHA1 (patch-common_tkAppInit.cc) = c4f5bfa97a1585773443044640dac343219a4155 +SHA1 (patch-lib_bsd-list.h) = 21675c566b66f7c3af8e0d0bc6a9936d2641b682 SHA1 (patch-linkstate_ls.h) = 5f0fb99db398cf39e9853e7d8e8cd6536d29e44b SHA1 (patch-mac_mac-802_11Exr.cc) = 93e4112025b6e610e76694c6067723f77cd75b84 SHA1 (patch-mdart_mdart__adp.cc) = 5cee0a60a5102197363f53f2ebb90ca972bc139c diff --git a/net/ns/patches/patch-lib_bsd-list.h b/net/ns/patches/patch-lib_bsd-list.h new file mode 100644 index 00000000000..fc24157bc65 --- /dev/null +++ b/net/ns/patches/patch-lib_bsd-list.h @@ -0,0 +1,21 @@ +$NetBSD: patch-lib_bsd-list.h,v 1.1 2017/08/28 10:29:41 he Exp $ + +Actually, lib/bsd-list.h isn't a substitute for <sys/queue.h> +because TAILQ_* macros are not defined here, and on NetBSD, <net/if.h> +requires those macros be defined. + +--- lib/bsd-list.h.orig 2008-03-25 04:28:30.000000000 +0000 ++++ lib/bsd-list.h +@@ -40,7 +40,11 @@ + #define _NS_BSD_LIST_H_ + + // define _SYS_QUEUE_H_ so /usr/include/sys/queue.h does not redefine +-#define _SYS_QUEUE_H_ ++#ifndef __NetBSD__ ++# define _SYS_QUEUE_H_ ++#endif ++// This doesn't define the 5 queue forms, and NetBSD's <net/if.h> ++// requires TAILQ_* which isn't defined here. + + /* + * This file defines five types of data structures: singly-linked lists, |