unofficial mirror of bug-gnu-emacs@gnu.org 
 help / color / mirror / code / Atom feed
* bug#14068: [PATCH] Officially support DragonFly BSD
@ 2013-03-27 13:28 John Marino
  2013-04-03 13:22 ` John Marino
  0 siblings, 1 reply; 6+ messages in thread
From: John Marino @ 2013-03-27 13:28 UTC (permalink / raw)
  To: 14068

Hi, Emacs has built on DragonFly BSD for years, but it required patches 
of course.  One of the leaders of NetBSD's pkgsrc project has requested 
that the patch to configure.ac which enables DragonFly support be pushed 
upstream, and that seems like a great idea.

The follow patches were generated against version 24.3, so they should 
apply directly.

configure.ac:
https://raw.github.com/jsonn/pkgsrc/trunk/editors/emacs24/patches/patch-aa

configure (yes, I know it's generated but just FYI):
https://raw.github.com/jsonn/pkgsrc/trunk/editors/emacs24/patches/patch-ab

It would be great if Emacs could finally be built on DragonFly BSD out 
of the box without patches.  Can we make this happen?  Do you need 
anything else from me?  I'm hoping this is an obvious contribution.

Regards,
John





^ permalink raw reply	[flat|nested] 6+ messages in thread

* bug#14068: [PATCH] Officially support DragonFly BSD
  2013-03-27 13:28 bug#14068: [PATCH] Officially support DragonFly BSD John Marino
@ 2013-04-03 13:22 ` John Marino
  2013-04-03 19:47   ` Stefan Monnier
  2013-04-18  5:46   ` Glenn Morris
  0 siblings, 2 replies; 6+ messages in thread
From: John Marino @ 2013-04-03 13:22 UTC (permalink / raw)
  To: 14068

On 3/27/2013 14:28, John Marino wrote:
> Hi, Emacs has built on DragonFly BSD for years, but it required patches
> of course. One of the leaders of NetBSD's pkgsrc project has requested
> that the patch to configure.ac which enables DragonFly support be pushed
> upstream, and that seems like a great idea.
>
> The follow patches were generated against version 24.3, so they should
> apply directly.
>
> configure.ac:
> https://raw.github.com/jsonn/pkgsrc/trunk/editors/emacs24/patches/patch-aa
>
> configure (yes, I know it's generated but just FYI):
> https://raw.github.com/jsonn/pkgsrc/trunk/editors/emacs24/patches/patch-ab
>
> It would be great if Emacs could finally be built on DragonFly BSD out
> of the box without patches. Can we make this happen? Do you need
> anything else from me? I'm hoping this is an obvious contribution.
>

The previously submitted patch was for release 24.3.
The patch to add DragonFly support to version 24.3.50.112178 is much 
smaller:
https://raw.github.com/jrmarino/DPorts/staged/editors/emacs-devel/dragonfly/patch-configure.ac

Nobody responded to the original submission.  Did I do my part 
correctly?  Is there anything else I need to do?

John





^ permalink raw reply	[flat|nested] 6+ messages in thread

* bug#14068: [PATCH] Officially support DragonFly BSD
  2013-04-03 13:22 ` John Marino
@ 2013-04-03 19:47   ` Stefan Monnier
  2013-04-18  5:46   ` Glenn Morris
  1 sibling, 0 replies; 6+ messages in thread
From: Stefan Monnier @ 2013-04-03 19:47 UTC (permalink / raw)
  To: John Marino; +Cc: 14068

> The patch to add DragonFly support to version 24.3.50.112178 is much
> smaller:
> https://raw.github.com/jrmarino/DPorts/staged/editors/emacs-devel/dragonfly/patch-configure.ac

Thanks.  This is the patch we'd apply indeed.

> Nobody responded to the original submission.  Did I do my part correctly?

Yes, you did.

> Is there anything else I need to do?

The patch looks fine to me, but I'm not sufficiently familiar with our
autoconfigury code to really judge, so hopefully Paul or someone else
will find the time soon to take a look at it,


        Stefan






^ permalink raw reply	[flat|nested] 6+ messages in thread

* bug#14068: [PATCH] Officially support DragonFly BSD
  2013-04-03 13:22 ` John Marino
  2013-04-03 19:47   ` Stefan Monnier
@ 2013-04-18  5:46   ` Glenn Morris
  2013-04-18  7:59     ` John Marino
  1 sibling, 1 reply; 6+ messages in thread
From: Glenn Morris @ 2013-04-18  5:46 UTC (permalink / raw)
  To: John Marino; +Cc: 14068

John Marino wrote:

> The previously submitted patch was for release 24.3.
> The patch to add DragonFly support to version 24.3.50.112178 is much
> smaller:
> https://raw.github.com/jrmarino/DPorts/staged/editors/emacs-devel/dragonfly/patch-configure.ac

+     case "${canonical}" in
+       i[3456]86-*-dragonfly*)     machine=intel386 ;;
+       amd64-*-dragonfly*|x86_64-*-dragonfly*) machine=amdx86-64 ;;
+     esac

machine is no longer used, so these lines are unnecessary.

-   freebsd) LIBS_SYSTEM="-lutil" ;;
+   freebsd|netbsd|openbsd|dragonfly) LIBS_SYSTEM="-lutil" ;;

Why are you adding netbsd and openbsd as well?

Apart from that, it seems fine to me.
It's probably just small enough not to need a copyright assignment; but
for the ChangeLog, can you tell me who the author is?

Revised patch against current trunk:

--- configure.ac	2013-04-18 05:03:53 +0000
+++ configure.ac	2013-04-18 05:43:24 +0000
@@ -439,6 +439,11 @@
     opsys=freebsd
   ;;
 
+  ## DragonFly ports
+  *-*-dragonfly* )
+    opsys=dragonfly
+  ;;
+
   ## FreeBSD kernel + glibc based userland
   *-*-kfreebsd*gnu* )
     opsys=gnu-kfreebsd
@@ -968,7 +973,7 @@
 
 LD_SWITCH_SYSTEM=
 case "$opsys" in
-  freebsd)
+  freebsd|dragonfly)
    ## Let `ld' find image libs and similar things in /usr/local/lib.
    ## The system compiler, GCC, has apparently been modified to not
    ## look there, contrary to what a stock GCC would do.
@@ -1054,7 +1059,7 @@
   ## IBM's X11R5 uses -lIM and -liconv in AIX 3.2.2.
   aix4-2) LIBS_SYSTEM="-lrts -lIM -liconv" ;;
 
-  freebsd) LIBS_SYSTEM="-lutil" ;;
+  freebsd|dragonfly) LIBS_SYSTEM="-lutil" ;;
 
   hpux*) LIBS_SYSTEM="-l:libdld.sl" ;;
 
@@ -1095,7 +1100,7 @@
     ## Adding -lm confuses the dynamic linker, so omit it.
     LIB_MATH=
     ;;
-  freebsd )
+  freebsd | dragonfly )
     SYSTEM_TYPE=berkeley-unix
     ;;
   gnu-linux | gnu-kfreebsd )
@@ -2866,7 +2871,7 @@
 case "$opsys" in
   aix4-2) mail_lock="lockf" ;;
 
-  gnu|freebsd|netbsd|openbsd|darwin|irix6-5) mail_lock="flock" ;;
+  gnu|freebsd|dragonfly|netbsd|openbsd|darwin|irix6-5) mail_lock="flock" ;;
 
   ## On GNU/Linux systems, both methods are used by various mail programs.
   ## I assume most people are using newer mailers that have heard of flock.
@@ -3038,7 +3043,7 @@
     fi
     ;;
 
-  openbsd) LIBS_TERMCAP="-lncurses" ;;
+  openbsd | dragonfly) LIBS_TERMCAP="-lncurses" ;;
 
   ## hpux: Make sure we get select from libc rather than from libcurses
   ##  because libcurses on HPUX 10.10 has a broken version of select.
@@ -3461,7 +3466,7 @@
 esac
 
 case $opsys in
-  darwin | freebsd | netbsd | openbsd )
+  darwin | dragonfly | freebsd | netbsd | openbsd )
     AC_DEFINE(DONT_REOPEN_PTY, 1, [Define if process.c does not need to
       close a pty to make it a controlling terminal (it is already a
       controlling terminal of the subprocess, because we did ioctl TIOCSCTTY).])
@@ -3567,7 +3572,7 @@
     AC_DEFINE(FIRST_PTY_LETTER, ['p'])
     ;;
 
-  gnu-linux | gnu-kfreebsd | freebsd | netbsd )
+  gnu-linux | gnu-kfreebsd | dragonfly | freebsd | netbsd )
     dnl if HAVE_GRANTPT
     if test "x$ac_cv_func_grantpt" = xyes; then
       AC_DEFINE(UNIX98_PTYS, 1, [Define if the system has Unix98 PTYs.])
@@ -3650,7 +3655,7 @@
 case $opsys in
   dnl Perry Smith <pedz@ddivt1.austin.ibm.com> says this is correct for AIX.
   dnl thomas@mathematik.uni-bremen.de says this is needed for IRIX.
-  aix4-2 | cygwin | gnu | irix6-5 | freebsd | netbsd | openbsd | darwin )
+  aix4-2 | cygwin | gnu | irix6-5 | dragonfly | freebsd | netbsd | openbsd | darwin )
     AC_DEFINE(SIGNALS_VIA_CHARACTERS, 1)
     ;;
 
@@ -3699,7 +3704,7 @@
 case $opsys in
   darwin) AC_DEFINE(TAB3, OXTABS) ;;
 
-  gnu | freebsd | netbsd | openbsd )
+  gnu | dragonfly | freebsd | netbsd | openbsd )
     AC_DEFINE(TABDLY, OXTABS, [Undocumented.])
     AC_DEFINE(TAB3, OXTABS)
     ;;
@@ -3753,7 +3758,7 @@
 else
   case $opsys in
     dnl irix: Tested on Irix 6.5.  SCM worked on earlier versions.
-    freebsd | netbsd | openbsd | irix6-5 | sol2* )
+    dragonfly | freebsd | netbsd | openbsd | irix6-5 | sol2* )
       AC_DEFINE(GC_SETJMP_WORKS, 1)
       ;;
   esac






^ permalink raw reply	[flat|nested] 6+ messages in thread

* bug#14068: [PATCH] Officially support DragonFly BSD
  2013-04-18  5:46   ` Glenn Morris
@ 2013-04-18  7:59     ` John Marino
  2013-04-18 17:12       ` Glenn Morris
  0 siblings, 1 reply; 6+ messages in thread
From: John Marino @ 2013-04-18  7:59 UTC (permalink / raw)
  To: Glenn Morris; +Cc: 14068

On 4/18/2013 07:46, Glenn Morris wrote:
> John Marino wrote:
>
>> The previously submitted patch was for release 24.3.
>> The patch to add DragonFly support to version 24.3.50.112178 is much
>> smaller:
>> https://raw.github.com/jrmarino/DPorts/staged/editors/emacs-devel/dragonfly/patch-configure.ac
>
> +     case "${canonical}" in
> +       i[3456]86-*-dragonfly*)     machine=intel386 ;;
> +       amd64-*-dragonfly*|x86_64-*-dragonfly*) machine=amdx86-64 ;;
> +     esac
>
> machine is no longer used, so these lines are unnecessary.


Okay, good to know!


>
> -   freebsd) LIBS_SYSTEM="-lutil" ;;
> +   freebsd|netbsd|openbsd|dragonfly) LIBS_SYSTEM="-lutil" ;;
>
> Why are you adding netbsd and openbsd as well?


It was likely left over from years.  The submitted patch came from 
pkgsrc and freebsd ports.  It is appropriate to only add DragonFly (as 
you have done) and let representatives from the other BSDs speak for 
themselves.


>
> Apart from that, it seems fine to me.
> It's probably just small enough not to need a copyright assignment; but
> for the ChangeLog, can you tell me who the author is?

I think it's reasonable to call me (John Marino) the primary author.  I 
basically had to create it from scratch -- most of this information was 
in those "S" files and had to be moved to the configure script, so it's 
basically new.

>
> Revised patch against current trunk:

With a quick glance, it looks good to me.
Thanks!

John






^ permalink raw reply	[flat|nested] 6+ messages in thread

* bug#14068: [PATCH] Officially support DragonFly BSD
  2013-04-18  7:59     ` John Marino
@ 2013-04-18 17:12       ` Glenn Morris
  0 siblings, 0 replies; 6+ messages in thread
From: Glenn Morris @ 2013-04-18 17:12 UTC (permalink / raw)
  To: 14068-done

Version: 24.4

Thanks; applied to trunk.





^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2013-04-18 17:12 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-27 13:28 bug#14068: [PATCH] Officially support DragonFly BSD John Marino
2013-04-03 13:22 ` John Marino
2013-04-03 19:47   ` Stefan Monnier
2013-04-18  5:46   ` Glenn Morris
2013-04-18  7:59     ` John Marino
2013-04-18 17:12       ` Glenn Morris

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).