Attachment 232043 Details for Bug 261180 – File oatch-src__ext_ocaml-patches_0001-Fix-relocation-ocaml-32-bit.patch

[patch] File oatch-src__ext_ocaml-patches_0001-Fix-relocation-ocaml-32-bit.patch

patch-src__ext_ocaml-patches_0001-Fix-relocation-ocaml-32-bit.patch (text/plain), 1.89 KB, created by Hannes Mehnert on 2022-02-23 14:07:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hannes Mehnert

Created: 2022-02-23 14:07:25 UTC

Size: 1.89 KB

patch

obsolete

>--- src_ext/ocaml-patches/0001-Fix-relocation-ocaml-32-bit.patch.orig	2021-12-25 16:24:31 UTC
>+++ src_ext/ocaml-patches/0001-Fix-relocation-ocaml-32-bit.patch
>@@ -0,0 +1,60 @@
>+diff --git a/configure b/configure
>+index b1e287aed..4754e8ab2 100755
>+--- a/configure
>++++ b/configure
>+@@ -13901,6 +13901,8 @@ fi; system=elf ;; #(
>+     arch=arm; model=armv6; system=linux_eabi ;; #(
>+   armv6*-*-freebsd*) :
>+     arch=arm; model=armv6; system=freebsd ;; #(
>++  armv7*-*-freebsd*) :
>++    arch=arm; model=armv7; system=freebsd ;; #(
>+   earmv6*-*-netbsd*) :
>+     arch=arm; model=armv6; system=netbsd ;; #(
>+   earmv7*-*-netbsd*) :
>+@@ -14120,6 +14122,17 @@ case $arch in #(
>+ esac ;;
>+ esac
>+ 
>++# Disable DT_TEXTREL warnings
>++# See https://github.com/ocaml/ocaml/issues/9800
>++
>++case "$arch,$system" in #(
>++  *,linux_elf|*,bsd_elf|arm,freebsd) :
>++    mksharedlib="$mksharedlib -Wl,-z,notext"
>++    mkmaindll="$mkmaindll -Wl,-z,notext" ;; #(
>++  *) :
>++     ;;
>++esac
>++
>+ # Assembler
>+ 
>+ if test -n "$host_alias"; then :
>+diff --git a/configure.ac b/configure.ac
>+index 656ffe20c..1c9694805 100644
>+--- a/configure.ac
>++++ b/configure.ac
>+@@ -971,6 +971,8 @@ AS_CASE([$host],
>+     [arch=arm; model=armv6; system=linux_eabi],
>+   [armv6*-*-freebsd*],
>+     [arch=arm; model=armv6; system=freebsd],
>++  [armv7*-*-freebsd*],
>++    [arch=arm; model=armv7; system=freebsd],
>+   [earmv6*-*-netbsd*],
>+     [arch=arm; model=armv6; system=netbsd],
>+   [earmv7*-*-netbsd*],
>+@@ -1070,6 +1072,15 @@ AS_CASE([$arch],
>+        [common_cflags="-no-pie $common_cflags"],
>+     [])])
>+ 
>++# Disable DT_TEXTREL warnings
>++# See https://github.com/ocaml/ocaml/issues/9800
>++
>++AS_CASE(["$arch,$system"],
>++  [*,linux_elf|*,bsd_elf|arm,freebsd],
>++    [mksharedlib="$mksharedlib -Wl,-z,notext"
>++    mkmaindll="$mkmaindll -Wl,-z,notext"],
>++  [])
>++
>+ # Assembler
>+ 
>+ AS_IF([test -n "$host_alias"], [toolpref="${host_alias}-"], [toolpref=""])

Flags:

hannes: maintainer-approval+

Actions: View | Diff

Attachments on bug 261180: 230990 | 231075 | 231080 | 231087 | 232043 | 232044 | 248241 | 248242 | 248259 | 248260 | 248261 | 248262