Unverified Commit cc64e7b4 authored by 7c6f434c's avatar 7c6f434c Committed by GitHub
Browse files

clisp: 2.50pre20230112 -> 2.49.95-unstable-2024-12-28 (#377410)

parents 143c01ae e7354817
Loading
Loading
Loading
Loading
+5 −27
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@
  lib,
  stdenv,
  fetchFromGitLab,
  autoconf269,
  autoconf,
  automake,
  bash,
  libtool,
@@ -56,24 +56,22 @@ assert

let
  ffcallAvailable = stdenv.hostPlatform.isLinux && (libffcall != null);
  # Some modules need autoreconf called in their directory.
  shouldReconfModule = name: name != "asdf";
in

stdenv.mkDerivation {
  version = "2.50pre20230112";
  version = "2.49.95-unstable-2024-12-28";
  pname = "clisp";

  src = fetchFromGitLab {
    owner = "gnu-clisp";
    repo = "clisp";
    rev = "bf72805c4dace982a6d3399ff4e7f7d5e77ab99a";
    hash = "sha256-sQoN2FUg9BPaCgvCF91lFsU/zLja1NrgWsEIr2cPiqo=";
    rev = "c3ec11bab87cfdbeba01523ed88ac2a16b22304d";
    hash = "sha256-xXGx2FlS0l9huVMHqNbcAViLjxK8szOFPT0J8MpGp9w=";
  };

  strictDeps = true;
  nativeBuildInputs = [
    autoconf269
    autoconf
    automake
    libtool
  ];
@@ -98,10 +96,6 @@ stdenv.mkDerivation {
      libXext
    ];

  patches = [
    ./gnulib_aarch64.patch
  ];

  # First, replace port 9090 (rather low, can be used)
  # with 64237 (much higher, IANA private area, not
  # anything rememberable).
@@ -112,22 +106,6 @@ stdenv.mkDerivation {
    find . -type f | xargs sed -e 's/-lICE/-lXau &/' -i
  '';

  preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin (
    ''
      (
        cd src
        autoreconf -f -i -I m4 -I glm4
      )
    ''
    + lib.concatMapStrings (x: ''
      (
        root="$PWD"
        cd modules/${x}
        autoreconf -f -i -I "$root/src" -I "$root/src/m4" -I "$root/src/glm4"
      )
    '') (builtins.filter shouldReconfModule withModules)
  );

  configureFlags =
    [ "builddir" ]
    ++ lib.optional (!dllSupport) "--without-dynamic-modules"
+0 −13
Original line number Diff line number Diff line
diff --git a/src/gllib/vma-iter.c b/src/gllib/vma-iter.c
index 6045f21d7..d50a3a398 100644
--- a/src/gllib/vma-iter.c
+++ b/src/gllib/vma-iter.c
@@ -1327,7 +1327,7 @@ vma_iterate (vma_iterate_callback_fn callback, void *data)
          In 64-bit processes, we could use vm_region_64 or mach_vm_region.
          I choose vm_region_64 because it uses the same types as vm_region,
          resulting in less conditional code.  */
-# if defined __ppc64__ || defined __x86_64__
+# if defined __aarch64__ || defined __ppc64__ || defined __x86_64__
       struct vm_region_basic_info_64 info;
       mach_msg_type_number_t info_count = VM_REGION_BASIC_INFO_COUNT_64;