Re: toolchain/51118: libctf tools build fails on FreeBSD 10.3-RELEASE

To: toolchain-manager%netbsd.org@localhost,gnats-admin%netbsd.org@localhost,netbsd-bugs%netbsd.org@localhost,jmcneill%invisible.ca@localhost
Subject: Re: toolchain/51118: libctf tools build fails on FreeBSD 10.3-RELEASE
From: Michael Plass <mfpnb%plass-family.net@localhost>
Date: Wed, 17 Aug 2016 21:50:00 +0000 (UTC)
The following reply was made to PR toolchain/51118; it has been noted by GNATS.

From: Michael Plass <mfpnb%plass-family.net@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: Michael Plass <mfpnb%plass-family.net@localhost>,
 Jared McNeill <jmcneill%invisible.ca@localhost>
Subject: Re: toolchain/51118: libctf tools build fails on FreeBSD 10.3-RELEASE
Date: Wed, 17 Aug 2016 14:45:31 -0700

 A better fix is to remove the cddl sys/limits.h and assert.h altogether,
 replacing the references to the former by sys/syslimits.h
 
 Patch included here, and also on=20
   https://gist.github.com/mfplass/4b14fc832a51471825bd49d8fe9b38c7
 in case of mangled email.
 
 Patch is against a recent -current. I didn=E2=80=99t re-sort the =
 includes, sorry.
 
 =
 --------------------------------------------------------------------------=
 --
 commit cc42752c2051c01c879419aa186892d2d327a76b
 Author: Michael Plass <mfp%plass-family.net@localhost>
 Date:   Tue Aug 16 20:59:23 2016 -0700
 
     Remove cddl sys/limits.h and assert.h.
    =20
     These interfere with cross-building on FreeBSD.
     toolchain/51118
 
 diff --git a/external/cddl/osnet/dev/fbt/fbt.c =
 b/external/cddl/osnet/dev/fbt/fbt.c
 index 854cabe..50fcf22 100644
 --- a/external/cddl/osnet/dev/fbt/fbt.c
 +++ b/external/cddl/osnet/dev/fbt/fbt.c
 @@ -44,7 +44,7 @@
  #include <sys/ksyms.h>
  #include <sys/cpu.h>
  #include <sys/kthread.h>
 -#include <sys/limits.h>
 +#include <sys/syslimits.h>
  #include <sys/linker.h>
  #include <sys/lock.h>
  #include <sys/malloc.h>
 diff --git a/external/cddl/osnet/dev/profile/profile.c =
 b/external/cddl/osnet/dev/profile/profile.c
 index b1b5459..f7f3c02 100644
 --- a/external/cddl/osnet/dev/profile/profile.c
 +++ b/external/cddl/osnet/dev/profile/profile.c
 @@ -44,7 +44,7 @@
  #include <sys/kernel.h>
  #include <sys/kmem.h>
  #include <sys/kthread.h>
 -#include <sys/limits.h>
 +#include <sys/syslimits.h>
  #include <sys/linker.h>
  #include <sys/lock.h>
  #include <sys/malloc.h>
 diff --git a/external/cddl/osnet/dev/sdt/sdt.c =
 b/external/cddl/osnet/dev/sdt/sdt.c
 index 5c607d1..2291011 100644
 --- a/external/cddl/osnet/dev/sdt/sdt.c
 +++ b/external/cddl/osnet/dev/sdt/sdt.c
 @@ -50,7 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: sdt.c,v 1.17 2016/07/17 =
 02:09:10 pgoyette Exp $");
  #include <sys/eventhandler.h>
  #endif
  #include <sys/kernel.h>
 -#include <sys/limits.h>
 +#include <sys/syslimits.h>
  #ifdef __FreeBSD__
  #include <sys/linker.h>
  #include <sys/linker_set.h>
 diff --git a/external/cddl/osnet/dev/systrace/systrace.c =
 b/external/cddl/osnet/dev/systrace/systrace.c
 index 7ebc89c..c48bebd 100644
 --- a/external/cddl/osnet/dev/systrace/systrace.c
 +++ b/external/cddl/osnet/dev/systrace/systrace.c
 @@ -41,7 +41,7 @@
  #include <sys/kernel.h>
  #include <sys/kmem.h>
  #include <sys/kthread.h>
 -#include <sys/limits.h>
 +#include <sys/syslimits.h>
  #include <sys/linker.h>
  #include <sys/lock.h>
  #include <sys/malloc.h>
 diff --git a/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c =
 b/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c
 index d7b22ec..887a6b7 100644
 --- a/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c
 +++ b/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c
 @@ -119,7 +119,7 @@
  #if !defined(sun)
 =20
  #include <sys/ctype.h>
 -#include <sys/limits.h>
 +#include <sys/syslimits.h>
  //#include <sys/kdb.h>
  #include <sys/kernel.h>
  #include <sys/malloc.h>
 diff --git a/external/cddl/osnet/sys/assert.h =
 b/external/cddl/osnet/sys/assert.h
 deleted file mode 100644
 index 5c3eb18..0000000
 --- a/external/cddl/osnet/sys/assert.h
 +++ /dev/null
 @@ -1,36 +0,0 @@
 -/*	$NetBSD: assert.h,v 1.2 2015/12/27 21:39:34 christos Exp $	=
 */
 -
 -/*-
 - * Copyright (c) 2009 The NetBSD Foundation, Inc.
 - * All rights reserved.
 - *
 - * This code is derived from software contributed to The NetBSD =
 Foundation
 - * by Andrew Doran.
 - *
 - * Redistribution and use in source and binary forms, with or without
 - * modification, are permitted provided that the following conditions
 - * are met:
 - * 1. Redistributions of source code must retain the above copyright
 - *    notice, this list of conditions and the following disclaimer.
 - * 2. Redistributions in binary form must reproduce the above copyright
 - *    notice, this list of conditions and the following disclaimer in =
 the
 - *    documentation and/or other materials provided with the =
 distribution.
 - *
 - * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND =
 CONTRIBUTORS
 - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT =
 LIMITED
 - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A =
 PARTICULAR
 - * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR =
 CONTRIBUTORS
 - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, =
 OR
 - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR =
 BUSINESS
 - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER =
 IN
 - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR =
 OTHERWISE)
 - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED =
 OF THE
 - * POSSIBILITY OF SUCH DAMAGE.
 - */
 -
 -#include_next "assert.h"
 -
 -#ifndef __assert
 -#define __assert(a, b, c)       __assert(a, c, b)
 -#endif
 diff --git a/external/cddl/osnet/sys/kern/taskq.c =
 b/external/cddl/osnet/sys/kern/taskq.c
 index 1402148..da5d3ed 100644
 --- a/external/cddl/osnet/sys/kern/taskq.c
 +++ b/external/cddl/osnet/sys/kern/taskq.c
 @@ -385,7 +385,7 @@
  #include <sys/sdt.h>
  #include <sys/mutex.h>
  #include <sys/kernel.h>
 -#include <sys/limits.h>
 +#include <sys/syslimits.h>
 =20
  static kmem_cache_t *taskq_ent_cache, *taskq_cache;
 =20
 diff --git a/external/cddl/osnet/sys/sys/limits.h =
 b/external/cddl/osnet/sys/sys/limits.h
 deleted file mode 100644
 index accc2fe..0000000
 --- a/external/cddl/osnet/sys/sys/limits.h
 +++ /dev/null
 @@ -1,32 +0,0 @@
 -/*	$NetBSD: limits.h,v 1.1 2009/08/07 20:57:57 haad Exp $	*/
 -
 -/*-
 - * Copyright (c) 2009 The NetBSD Foundation, Inc.
 - * All rights reserved.
 - *
 - * This code is derived from software contributed to The NetBSD =
 Foundation
 - * by Andrew Doran.
 - *
 - * Redistribution and use in source and binary forms, with or without
 - * modification, are permitted provided that the following conditions
 - * are met:
 - * 1. Redistributions of source code must retain the above copyright
 - *    notice, this list of conditions and the following disclaimer.
 - * 2. Redistributions in binary form must reproduce the above copyright
 - *    notice, this list of conditions and the following disclaimer in =
 the
 - *    documentation and/or other materials provided with the =
 distribution.
 - *
 - * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND =
 CONTRIBUTORS
 - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT =
 LIMITED
 - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A =
 PARTICULAR
 - * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR =
 CONTRIBUTORS
 - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, =
 OR
 - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR =
 BUSINESS
 - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER =
 IN
 - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR =
 OTHERWISE)
 - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED =
 OF THE
 - * POSSIBILITY OF SUCH DAMAGE.
 - */
 -
 -#include <sys/syslimits.h>
 diff --git a/external/cddl/osnet/sys/sys/zfs_context.h =
 b/external/cddl/osnet/sys/sys/zfs_context.h
 index 4f98e85..53ce002 100644
 --- a/external/cddl/osnet/sys/sys/zfs_context.h
 +++ b/external/cddl/osnet/sys/sys/zfs_context.h
 @@ -582,7 +582,7 @@ extern char *kmem_asprintf(const char *fmt, ...);
 =20
  #include <sys/systm.h>
  #include <sys/kcondvar.h>
 -#include <sys/limits.h>
 +#include <sys/syslimits.h>
  #include <sys/kmem.h>
  #include <sys/param.h>
  #include <sys/stdint.h>
 =
 --------------------------------------------------------------------------=
 --
Prev by Date: Re: kern/50511 (npf fails to load tree file above certain size)
Next by Date: Re: kern/50511 (npf fails to load tree file above certain size)
Previous by Thread: Re: toolchain/51118: libctf tools build fails on FreeBSD 10.3-RELEASE
Next by Thread: PR/44893 CVS commit: [netbsd-6] src/sys/dev
Indexes:
Home | Main Index | Thread Index | Old Index