[pkgsrc/trunk]: pkgsrc/editors/emacs20 Make this compile on amd64, based on R...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/editors/emacs20 Make this compile on amd64, based on R...
From: kristerw <kristerw%pkgsrc.org@localhost>
Date: Wed, 13 Oct 2021 23:38:42 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/499dc2fc4063
branches:  trunk
changeset: 469775:499dc2fc4063
user:      kristerw <kristerw%pkgsrc.org@localhost>
date:      Sat Feb 28 20:57:48 2004 +0000

description:
Make this compile on amd64, based on Richard Rauch's patches (PR pkg/23701)
as applied to the editors/emacs package.

diffstat:

 editors/emacs20/Makefile         |    5 +-
 editors/emacs20/distinfo         |    4 +-
 editors/emacs20/files/amd64.h    |  131 +++++++++++++++++++
 editors/emacs20/patches/patch-ab |  267 ++++++++++++++++++--------------------
 4 files changed, 267 insertions(+), 140 deletions(-)

diffs (truncated from 1384 to 300 lines):

diff -r 351963e301a8 -r 499dc2fc4063 editors/emacs20/Makefile
--- a/editors/emacs20/Makefile  Sat Feb 28 20:53:53 2004 +0000
+++ b/editors/emacs20/Makefile  Sat Feb 28 20:57:48 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/01/27 00:53:11 heinz Exp $
+# $NetBSD: Makefile,v 1.11 2004/02/28 20:57:48 kristerw Exp $
 
 DISTNAME=      emacs-20.7
 PKGREVISION=   2
@@ -79,6 +79,9 @@
 
 INSTALL_PROGRAM=${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}
 
+post-extract:
+       ${CP} ${FILESDIR}/amd64.h ${WRKSRC}/src/m
+
 pre-install:
        @${FIND} ${WRKSRC} -type f -name "*.orig*" -print | ${XARGS} ${RM} -f
 
diff -r 351963e301a8 -r 499dc2fc4063 editors/emacs20/distinfo
--- a/editors/emacs20/distinfo  Sat Feb 28 20:53:53 2004 +0000
+++ b/editors/emacs20/distinfo  Sat Feb 28 20:57:48 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2004/01/13 21:58:51 kristerw Exp $
+$NetBSD: distinfo,v 1.4 2004/02/28 20:57:48 kristerw Exp $
 
 SHA1 (emacs-20.7.tar.gz) = ef0168b927fb633bc9b14e2249431f26ff8b8452
 Size (emacs-20.7.tar.gz) = 15043428 bytes
@@ -9,7 +9,7 @@
 SHA1 (emacs20-xim-20000713.diff) = 5bed39e7b8a52941f77088529566aaa3bcf06670
 Size (emacs20-xim-20000713.diff) = 21296 bytes
 SHA1 (patch-aa) = 3b3fd76c058a0a46e0458338ce4c2327a238fb3d
-SHA1 (patch-ab) = eb16c1ab30e8aac6e6877e8c0f9388961b8003b2
+SHA1 (patch-ab) = 78e013ab8adc619ec295e8bc9dc4bc133f26cf52
 SHA1 (patch-ac) = 9586951e581271664b28d5e812ee14105de508cf
 SHA1 (patch-ad) = dd21028a6360ccfb442ecced4c67717f60ea78a6
 SHA1 (patch-ae) = 7aaca5409a71f8a292ac57f828ee5ec7a07e3880
diff -r 351963e301a8 -r 499dc2fc4063 editors/emacs20/files/amd64.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/emacs20/files/amd64.h     Sat Feb 28 20:57:48 2004 +0000
@@ -0,0 +1,131 @@
+/* machine description file for AMD x86-64.
+   Copyright (C) 2002 Free Software Foundation, Inc.
+
+This file is part of GNU Emacs.
+
+GNU Emacs is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Emacs; see the file COPYING.  If not, write to
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
+
+
+/* The following line tells the configuration script what sort of 
+   operating system this machine is likely to run.
+   USUAL-OPSYS="linux"  */
+
+#define BITS_PER_LONG           64
+#define BITS_PER_EMACS_INT      64
+
+/* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
+   is the most significant byte.  */
+
+#undef WORDS_BIG_ENDIAN
+
+/* Define NO_ARG_ARRAY if you cannot take the address of the first of a
+ * group of arguments and treat it as an array of the arguments.  */
+
+#define NO_ARG_ARRAY
+
+/* Define WORD_MACHINE if addresses and such have
+ * to be corrected before they can be used as byte counts.  */
+
+/* #define WORD_MACHINE  */
+
+/* Now define a symbol for the cpu type, if your compiler
+   does not define it automatically:
+   Ones defined so far include vax, m68000, ns16000, pyramid,
+   orion, tahoe, APOLLO and many others */
+/* __x86_64 defined automatically.  */
+
+/* Use type int rather than a union, to represent Lisp_Object */
+/* This is desirable for most machines.  */
+
+#define NO_UNION_TYPE
+
+/* Define the type to use.  */
+#define EMACS_INT               long
+#define EMACS_UINT              unsigned long
+#define SPECIAL_EMACS_INT
+
+/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
+   the 24-bit bit field into an int.  In other words, if bit fields
+   are always unsigned.
+
+   If you use NO_UNION_TYPE, this flag does not matter.  */
+
+#define EXPLICIT_SIGN_EXTEND
+
+/* Data type of load average, as read out of kmem.  */
+
+#define LOAD_AVE_TYPE long
+
+/* Convert that into an integer that is 100 for a load average of 1.0  */
+
+#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
+
+/* Define CANNOT_DUMP on machines where unexec does not work.
+   Then the function dump-emacs will not be defined
+   and temacs will do (load "loadup") automatically unless told otherwise.  */
+
+/* #define CANNOT_DUMP */
+
+/* Define VIRT_ADDR_VARIES if the virtual addresses of
+   pure and impure space as loaded can vary, and even their
+   relative order cannot be relied on.
+
+   Otherwise Emacs assumes that text space precedes data space,
+   numerically.  */
+
+#define VIRT_ADDR_VARIES  /* XXX */
+
+/* Define C_ALLOCA if this machine does not support a true alloca
+   and the one written in C should be used instead.
+   Define HAVE_ALLOCA to say that the system provides a properly
+   working alloca function and it should be used.
+   Define neither one if an assembler-language alloca
+   in the file alloca.s should be used.  */
+
+/* #define C_ALLOCA */      /* XXX */
+#define HAVE_ALLOCA
+
+/* Define NO_REMAP if memory segmentation makes it not work well
+   to change the boundary between the text section and data section
+   when Emacs is dumped.  If you define this, the preloaded Lisp
+   code will not be sharable; but that's better than failing completely.  */
+
+#define NO_REMAP  /* XXX */
+
+#define PNTR_COMPARISON_TYPE unsigned long
+
+/* On the 64 bit architecture, we can use 60 bits for addresses */
+
+#define VALBITS         60
+
+/* This definition of MARKBIT is necessary because of the comparison of
+   ARRAY_MARK_FLAG and MARKBIT in an #if in lisp.h, which cpp doesn't like. */
+
+#define MARKBIT         0x8000000000000000L
+
+/* Define XINT and XUINT so that they can take arguments of type int */
+#define XINT(a)  (((long) (a) << (BITS_PER_LONG - VALBITS)) >> (BITS_PER_LONG - VALBITS))
+#define XUINT(a) ((long) (a) & VALMASK)
+
+/* Define XPNTR to avoid or'ing with DATA_SEG_BITS */
+
+#define XPNTR(a) XUINT (a)
+
+/* #undef START_FILES */ /* XXX */
+/* #define START_FILES pre-crt0.o /usr/lib64/crt1.o /usr/lib64/crti.o */ /* XXX */
+
+/* #undef LIB_STANDARD */                                    /* XXX */
+/* #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib64/crtn.o */ /* XXX */
diff -r 351963e301a8 -r 499dc2fc4063 editors/emacs20/patches/patch-ab
--- a/editors/emacs20/patches/patch-ab  Sat Feb 28 20:53:53 2004 +0000
+++ b/editors/emacs20/patches/patch-ab  Sat Feb 28 20:57:48 2004 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+$NetBSD: patch-ab,v 1.2 2004/02/28 20:57:49 kristerw Exp $
 
---- configure.orig     Mon Jun 12 22:05:56 2000
-+++ configure  Tue Oct 22 16:07:48 2002
+--- configure.orig     2000-06-12 22:05:56.000000000 +0200
++++ configure  2004-02-28 21:50:33.000000000 +0100
 @@ -20,6 +20,8 @@
  ac_help="$ac_help
    --with-x-toolkit=KIT    use an X toolkit (KIT = yes/lucid/athena/motif/no)"
@@ -11,7 +11,7 @@
    --with-x                use the X Window System"
  
  # Initialize some variables set by options.
-@@ -584,7 +586,13 @@
+@@ -584,6 +586,12 @@
  
  fi
  
@@ -20,11 +20,10 @@
 +  withval="$with_ipv6"
 +  :
 +fi
++
  
-+
  #### Make srcdir absolute, if it isn't already.  It's important to
  #### avoid running the path through pwd unnecessary, since pwd can
- #### give you automounter prefixes, which can go away.  We do all this
 @@ -657,7 +665,7 @@
  fi
  
@@ -34,7 +33,7 @@
  
  host_alias=$host
  case "$host_alias" in
-@@ -718,9 +726,13 @@
+@@ -718,9 +726,14 @@
                        machine=hp9000s300 ;;
        powerpc-apple-netbsd*) machine=macppc ;;
        mips-*-netbsd*) machine=pmax ;;
@@ -46,10 +45,11 @@
 +      sparc*-*-netbsd*)       machine=sparc ;;
        vax-*-netbsd*)  machine=vax ;;
 +      arm*-*-netbsd*) machine=arm ;;
++      x86_64-*-netbsd*)       machine=amd64 ;;
      esac
    ;;
  
-@@ -1613,7 +1625,7 @@
+@@ -1613,7 +1626,7 @@
    * ) # Extract the first word of "gcc", so it can be a program name with args.
  set dummy gcc; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -58,7 +58,7 @@
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -1643,7 +1655,7 @@
+@@ -1643,7 +1656,7 @@
    # Extract the first word of "cc", so it can be a program name with args.
  set dummy cc; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -67,7 +67,7 @@
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -1694,7 +1706,7 @@
+@@ -1694,7 +1707,7 @@
        # Extract the first word of "cl", so it can be a program name with args.
  set dummy cl; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -76,7 +76,7 @@
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -1726,7 +1738,7 @@
+@@ -1726,7 +1739,7 @@
  fi
  
  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
@@ -85,7 +85,7 @@
  
  ac_ext=c
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-@@ -1737,12 +1749,12 @@
+@@ -1737,12 +1750,12 @@
  
  cat > conftest.$ac_ext << EOF
  
@@ -100,7 +100,7 @@
    ac_cv_prog_cc_works=yes
    # If we can't run a trivial program, we are probably using a cross compiler.
    if (./conftest; exit) 2>/dev/null; then
-@@ -1768,12 +1780,12 @@
+@@ -1768,12 +1781,12 @@
    { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
  fi
  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
@@ -115,7 +115,7 @@
  if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -1782,7 +1794,7 @@
+@@ -1782,7 +1795,7 @@
    yes;
  #endif
  EOF
@@ -124,7 +124,7 @@
    ac_cv_prog_gcc=yes
  else
    ac_cv_prog_gcc=no
-@@ -1801,7 +1813,7 @@
+@@ -1801,7 +1814,7 @@
  ac_save_CFLAGS="$CFLAGS"
  CFLAGS=
  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
@@ -133,7 +133,7 @@
  if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -1881,7 +1893,7 @@
+@@ -1881,7 +1894,7 @@
  #### #undef clause to src/config.h.in for autoconf to modify.
Prev by Date: [pkgsrc/trunk]: pkgsrc/textproc/docbook-xsl Update to 1.65.0. Changes since ...
Next by Date: [pkgsrc/trunk]: pkgsrc/devel/tla Fix gdiff configure argument.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/textproc/docbook-xsl Update to 1.65.0. Changes since ...
Next by Thread: [pkgsrc/trunk]: pkgsrc/devel/tla Fix gdiff configure argument.
Indexes:
Home | Main Index | Thread Index | Old Index