diff options
Diffstat (limited to 'community/ocaml/fix-configure-musl.patch')
-rw-r--r-- | community/ocaml/fix-configure-musl.patch | 78 |
1 files changed, 0 insertions, 78 deletions
diff --git a/community/ocaml/fix-configure-musl.patch b/community/ocaml/fix-configure-musl.patch deleted file mode 100644 index f1f0cc94288..00000000000 --- a/community/ocaml/fix-configure-musl.patch +++ /dev/null @@ -1,78 +0,0 @@ ---- a/configure 2021-02-24 13:49:29.000000000 +0000 -+++ b/configure 2021-02-25 17:08:37.549751090 +0000 -@@ -13878,19 +13878,19 @@ else - fi; system=elf ;; #( - s390x*-*-linux*) : - arch=s390x; model=z10; system=elf ;; #( -- armv6*-*-linux-gnueabihf) : -+ armv6*-*-linux-*eabihf) : - arch=arm; model=armv6; system=linux_eabihf ;; #( -- armv7*-*-linux-gnueabihf) : -+ armv7*-*-linux-*eabihf) : - arch=arm; model=armv7; system=linux_eabihf ;; #( -- armv8*-*-linux-gnueabihf) : -+ armv8*-*-linux-*eabihf) : - arch=arm; model=armv8; system=linux_eabihf ;; #( -- armv8*-*-linux-gnueabi) : -+ armv8*-*-linux-*eabi) : - arch=arm; model=armv8; system=linux_eabi ;; #( -- armv7*-*-linux-gnueabi) : -+ armv7*-*-linux-*eabi) : - arch=arm; model=armv7; system=linux_eabi ;; #( -- armv6t2*-*-linux-gnueabi) : -+ armv6t2*-*-linux-*eabi) : - arch=arm; model=armv6t2; system=linux_eabi ;; #( -- armv6*-*-linux-gnueabi) : -+ armv6*-*-linux-*eabi) : - arch=arm; model=armv6; system=linux_eabi ;; #( - armv6*-*-freebsd*) : - arch=arm; model=armv6; system=freebsd ;; #( -@@ -13898,13 +13898,13 @@ fi; system=elf ;; #( - arch=arm; model=armv6; system=netbsd ;; #( - earmv7*-*-netbsd*) : - arch=arm; model=armv7; system=netbsd ;; #( -- armv5te*-*-linux-gnueabi) : -+ armv5te*-*-linux-*eabi) : - arch=arm; model=armv5te; system=linux_eabi ;; #( -- armv5*-*-linux-gnueabi) : -+ armv5*-*-linux-*eabi) : - arch=arm; model=armv5; system=linux_eabi ;; #( -- arm*-*-linux-gnueabihf) : -+ arm*-*-linux-*eabihf) : - arch=arm; system=linux_eabihf ;; #( -- arm*-*-linux-gnueabi) : -+ arm*-*-linux-*eabi) : - arch=arm; system=linux_eabi ;; #( - arm*-*-openbsd*) : - arch=arm; system=bsd ;; #( -@@ -14100,16 +14100,22 @@ fi - # e.g. Ubuntu >= 17.10 for i386, which uses the glibc dynamic loader. - - case $arch in #( -- amd64|s390x|none) : -+ amd64|aarch64|s390x|none) : - # ocamlopt generates PIC code or doesn't generate code at all -- ;; #( -+ ;; #( - *) : -- case $host in #( -- *-linux-musl) : -- # Alpine and other musl-based Linux distributions -- common_cflags="-no-pie $common_cflags" ;; #( -- *) : -- ;; -+ case $host in #( -+ i?86-*-linux-musl*) : -+ # Alpine and other musl-based Linux distributions, 32bit x86, -+ # disable DT_TEXTREL, see https://github.com/ocaml/ocaml/issues/9800 -+ common_cflags="-Wl,-z,notext -no-pie $common_cflags" -+ mksharedlib="$mksharedlib -Wl,-z,notext" -+ mkmaindll="$mkmaindll -Wl,-z,notext";; #( -+ *-linux-musl*) : -+ # Alpine and other musl-based Linux distributions -+ common_cflags="-no-pie $common_cflags" ;; #( -+ *) : -+ ;; - esac ;; - esac - |