GNU bug report logs - #25921
pkgsrc patches: Dragonfly support

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 25921 in the body.
You can then email your comments to 25921 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Thomas Klausner <tk <at> giga.or.at>
To: bug-guile <at> gnu.org
Cc: Greg Troxel <gdt <at> lexort.com>
Subject: pkgsrc patches: Dragonfly support
Date: Wed, 1 Mar 2017 21:27:10 +0100

[Message part 1 (text/plain, inline)]

Hi!

We have a couple of patches in pkgsrc for guile which I'd like to see
merged.

The attached ones are for supporting DragonFly
(https://www.dragonflybsd.org/) better.

Can you please merge them?
 Thomas

[patch-lib_signal.in.h (text/plain, attachment)]

[patch-libguile_threads.c (text/plain, attachment)]

Message #10 received at 25921-done <at> debbugs.gnu.org (full text, mbox):

From: Andy Wingo <wingo <at> pobox.com>
To: Thomas Klausner <tk <at> giga.or.at>
Cc: 25921-done <at> debbugs.gnu.org, Greg Troxel <gdt <at> lexort.com>
Subject: Re: bug#25921: pkgsrc patches: Dragonfly support
Date: Tue, 14 Mar 2017 12:27:18 +0100

On Wed 01 Mar 2017 21:27, Thomas Klausner <tk <at> giga.or.at> writes:

> $NetBSD: patch-lib_signal.in.h,v 1.1 2016/12/03 03:15:33 marino Exp $
>
> DragonFly support.
>
> --- lib/signal.in.h.orig	2016-06-29 09:12:27 UTC
> +++ lib/signal.in.h
> @@ -61,6 +61,7 @@
>  #if (@GNULIB_PTHREAD_SIGMASK@ || defined GNULIB_POSIXCHECK) \
>      && ((defined __APPLE__ && defined __MACH__) \
>          || defined __FreeBSD__ || defined __OpenBSD__ || defined __osf__ \
> +        || defined __DragonFly__ \
>          || defined __sun || defined __ANDROID__) \
>      && ! defined __GLIBC__
>  # include <pthread.h>
>

This file comes from gnulib.  Can you send this patch there?
bug-gnulib <at> gnu.org.  That way you will fix it once and reap the benefits
many places.

> $NetBSD: patch-libguile_threads.c,v 1.1 2016/12/03 03:15:33 marino Exp $
>
> DragonFly support.
>
> --- libguile/threads.c.orig	2016-06-20 20:35:06 UTC
> +++ libguile/threads.c
> @@ -2252,7 +2252,7 @@ scm_ia64_ar_bsp (const void *opaque)
>    return (void *) ctx->uc_mcontext.sc_ar_bsp;
>  }
>  # endif /* linux */
> -# ifdef __FreeBSD__
> +# if defined __FreeBSD__ || defined __DragonFly__
>  #  include <ucontext.h>
>  void *

This is for ia64 support which AFAIU DragonFly doesn't do; I think you
can drop this one.

Closing this one as I think there's nothing for me to do here.

Andy

Message #13 received at 25921-done <at> debbugs.gnu.org (full text, mbox):

From: Thomas Klausner <tk <at> giga.or.at>
To: Andy Wingo <wingo <at> pobox.com>
Cc: 25921-done <at> debbugs.gnu.org, Greg Troxel <gdt <at> lexort.com>
Subject: Re: bug#25921: pkgsrc patches: Dragonfly support
Date: Wed, 15 Mar 2017 19:04:45 +0100

On Tue, Mar 14, 2017 at 12:27:18PM +0100, Andy Wingo wrote:
> On Wed 01 Mar 2017 21:27, Thomas Klausner <tk <at> giga.or.at> writes:
> 
> > $NetBSD: patch-lib_signal.in.h,v 1.1 2016/12/03 03:15:33 marino Exp $
> >
> > DragonFly support.
> >
> > --- lib/signal.in.h.orig	2016-06-29 09:12:27 UTC
> > +++ lib/signal.in.h
> > @@ -61,6 +61,7 @@
> >  #if (@GNULIB_PTHREAD_SIGMASK@ || defined GNULIB_POSIXCHECK) \
> >      && ((defined __APPLE__ && defined __MACH__) \
> >          || defined __FreeBSD__ || defined __OpenBSD__ || defined __osf__ \
> > +        || defined __DragonFly__ \
> >          || defined __sun || defined __ANDROID__) \
> >      && ! defined __GLIBC__
> >  # include <pthread.h>
> >
> 
> This file comes from gnulib.  Can you send this patch there?
> bug-gnulib <at> gnu.org.  That way you will fix it once and reap the benefits
> many places.

I sent this upstream and learned that it's probably unnecessary, so
I've removed it from pkgsrc.

> > $NetBSD: patch-libguile_threads.c,v 1.1 2016/12/03 03:15:33 marino Exp $
> >
> > DragonFly support.
> >
> > --- libguile/threads.c.orig	2016-06-20 20:35:06 UTC
> > +++ libguile/threads.c
> > @@ -2252,7 +2252,7 @@ scm_ia64_ar_bsp (const void *opaque)
> >    return (void *) ctx->uc_mcontext.sc_ar_bsp;
> >  }
> >  # endif /* linux */
> > -# ifdef __FreeBSD__
> > +# if defined __FreeBSD__ || defined __DragonFly__
> >  #  include <ucontext.h>
> >  void *
> 
> This is for ia64 support which AFAIU DragonFly doesn't do; I think you
> can drop this one.

Ok, removed too.

Thanks for the feedback!
 Thomas

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.