From 1b64aa17d9df75e695c78a5bb14822b6a9283680 Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Glondu?= Date: Mon, 27 Jan 2025 13:17:27 +0100 Subject: [PATCH] Enable natdynlink on hurd-amd64 (Closes: #1094334) --- ...ve-backend-and-dynlink-on-hurd-amd64.patch | 32 +++++++++++++++++++ ...-Enable-native-backend-on-hurd-amd64.patch | 23 ------------- debian/patches/series | 2 +- 3 files changed, 33 insertions(+), 24 deletions(-) create mode 100644 debian/patches/0007-Enable-native-backend-and-dynlink-on-hurd-amd64.patch delete mode 100644 debian/patches/0007-Enable-native-backend-on-hurd-amd64.patch diff --git a/debian/patches/0007-Enable-native-backend-and-dynlink-on-hurd-amd64.patch b/debian/patches/0007-Enable-native-backend-and-dynlink-on-hurd-amd64.patch new file mode 100644 index 00000000..6daf5d88 --- /dev/null +++ b/debian/patches/0007-Enable-native-backend-and-dynlink-on-hurd-amd64.patch @@ -0,0 +1,32 @@ +From: Samuel Thibault +Date: Wed, 15 Jan 2025 08:23:51 +0100 +Subject: Enable native backend and dynlink on hurd-amd64 + +Bug-Debian: https://bugs.debian.org/1086600 +Bug-Debian: https://bugs.debian.org/1094334 +Forwarded: https://github.com/ocaml/ocaml/pull/13587 +--- + configure.ac | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index af1ea7b..705ab8a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1369,6 +1369,7 @@ AS_IF([test x"$supports_shared_libraries" = 'xtrue'], + [*-pc-windows], [natdynlink=true], + [[i[3456]86-*-linux*]], [natdynlink=true], + [[i[3456]86-*-gnu*]], [natdynlink=true], ++ [[x86_64-*-gnu*]], [natdynlink=true], + [[x86_64-*-linux*]], [natdynlink=true], + [arm64-*-darwin*], [natdynlink=true], + [aarch64-*-darwin*], [natdynlink=true], +@@ -1490,7 +1491,7 @@ AS_CASE([$host], + [x86_64-*-linux*], + [has_native_backend=yes; arch=amd64; system=linux], + [x86_64-*-gnu*], +- [arch=amd64; system=gnu], ++ [has_native_backend=yes; arch=amd64; system=gnu], + [x86_64-*-dragonfly*], + [arch=amd64; system=dragonfly], + [x86_64-*-solaris*], diff --git a/debian/patches/0007-Enable-native-backend-on-hurd-amd64.patch b/debian/patches/0007-Enable-native-backend-on-hurd-amd64.patch deleted file mode 100644 index acd5d1f0..00000000 --- a/debian/patches/0007-Enable-native-backend-on-hurd-amd64.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Samuel Thibault -Date: Wed, 15 Jan 2025 08:23:51 +0100 -Subject: Enable native backend on hurd-amd64 - -Bug-Debian: https://bugs.debian.org/1086600 -Forwarded: https://github.com/ocaml/ocaml/pull/13587 ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index af1ea7b..2f5d2a1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1490,7 +1490,7 @@ AS_CASE([$host], - [x86_64-*-linux*], - [has_native_backend=yes; arch=amd64; system=linux], - [x86_64-*-gnu*], -- [arch=amd64; system=gnu], -+ [has_native_backend=yes; arch=amd64; system=gnu], - [x86_64-*-dragonfly*], - [arch=amd64; system=dragonfly], - [x86_64-*-solaris*], diff --git a/debian/patches/series b/debian/patches/series index d3644c2b..946c47d6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,4 +4,4 @@ 0004-Use-CCLINKFLAGS-for-linking-all-executables-and-shar.patch 0005-Check-for-definition-of-AT_SECURE-before-using-it.patch 0006-Disable-DT_TEXTREL-warnings-on-Linux-i386.patch -0007-Enable-native-backend-on-hurd-amd64.patch +0007-Enable-native-backend-and-dynlink-on-hurd-amd64.patch -- 2.30.2