From: Stephane Glondu Date: Thu, 21 Jun 2012 11:36:19 +0000 (+0200) Subject: Fix natdynlink detection on sparc X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~3^2~232 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=76249a897bc43219db362e6bc7593fbcafe70a43;p=ocaml.git Fix natdynlink detection on sparc --- diff --git a/debian/patches/0007-Natdynlink-works-on-powerpc-and-hurd-i386.patch b/debian/patches/0007-Natdynlink-works-on-powerpc-and-hurd-i386.patch deleted file mode 100644 index d446364d..00000000 --- a/debian/patches/0007-Natdynlink-works-on-powerpc-and-hurd-i386.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: Stephane Glondu -Date: Sat, 16 Apr 2011 23:41:23 +0200 -Subject: Natdynlink works on powerpc and hurd-i386 - -Rationale: ssreflect used to work with natdynlink on powerpc and hurd -with ocaml 3.11.2 / coq 8.2... - -Note: there is no native compiler for powerpc64! This must be a -typo... - -Bug: http://caml.inria.fr/mantis/view.php?id=5255 -Signed-off-by: Stephane Glondu ---- - configure | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/configure b/configure -index afca5b0..e1d32dd 100755 ---- a/configure -+++ b/configure -@@ -630,6 +630,7 @@ if test $withsharedlibs = "yes"; then - case "$host" in - *-*-cygwin*) natdynlink=true;; - i[3456]86-*-linux*) natdynlink=true;; -+ i[3456]86-*-gnu*) natdynlink=true;; - x86_64-*-linux*) natdynlink=true;; - i[3456]86-*-darwin[89].*) natdynlink=true;; - i[3456]86-*-darwin*) -@@ -638,6 +639,7 @@ if test $withsharedlibs = "yes"; then - fi;; - x86_64-*-darwin*) natdynlink=true;; - powerpc64-*-linux*) natdynlink=true;; -+ powerpc-*-linux*) natdynlink=true;; - sparc-*-linux*) natdynlink=true;; - i686-*-kfreebsd*) natdynlink=true;; - x86_64-*-kfreebsd*) natdynlink=true;; --- diff --git a/debian/patches/0007-Natdynlink-works-on-powerpc-hurd-i386-and-sparc.patch b/debian/patches/0007-Natdynlink-works-on-powerpc-hurd-i386-and-sparc.patch new file mode 100644 index 00000000..0487ef2d --- /dev/null +++ b/debian/patches/0007-Natdynlink-works-on-powerpc-hurd-i386-and-sparc.patch @@ -0,0 +1,40 @@ +From: Stephane Glondu +Date: Thu, 21 Jun 2012 13:35:22 +0200 +Subject: Natdynlink works on powerpc, hurd-i386 and sparc + +Rationale: ssreflect used to work with natdynlink there with ocaml +3.11.2 / coq 8.2... + +Note: on my test machine for sparc (64-bit kernel, 32-bit userland), +$host is sparc64-unknown-linux-gnu. + +Bug: http://caml.inria.fr/mantis/view.php?id=5255 +Signed-off-by: Stephane Glondu +--- + configure | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index afca5b0..663eae1 100755 +--- a/configure ++++ b/configure +@@ -630,6 +630,7 @@ if test $withsharedlibs = "yes"; then + case "$host" in + *-*-cygwin*) natdynlink=true;; + i[3456]86-*-linux*) natdynlink=true;; ++ i[3456]86-*-gnu*) natdynlink=true;; + x86_64-*-linux*) natdynlink=true;; + i[3456]86-*-darwin[89].*) natdynlink=true;; + i[3456]86-*-darwin*) +@@ -637,8 +638,8 @@ if test $withsharedlibs = "yes"; then + natdynlink=true + fi;; + x86_64-*-darwin*) natdynlink=true;; +- powerpc64-*-linux*) natdynlink=true;; +- sparc-*-linux*) natdynlink=true;; ++ powerpc*-*-linux*) natdynlink=true;; ++ sparc*-*-linux*) natdynlink=true;; + i686-*-kfreebsd*) natdynlink=true;; + x86_64-*-kfreebsd*) natdynlink=true;; + i[345]86-*-freebsd*) natdynlink=true;; +-- diff --git a/debian/patches/series b/debian/patches/series index 3e1391f2..15eabd4d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,7 +4,7 @@ 0004-Put-manpages-in-section-3o-instead-of-3.patch 0005-Patch-config.sh-for-installation.patch 0006-Install-ocamlbuild-as-a-link-on-either-.native-or-.b.patch -0007-Natdynlink-works-on-powerpc-and-hurd-i386.patch +0007-Natdynlink-works-on-powerpc-hurd-i386-and-sparc.patch 0008-Declare-primitive-name-table-as-const-char.patch 0009-Avoid-multiple-declarations-in-generated-.c-files-in.patch 0010-Properly-initialize-executable-name-in-caml_startup_.patch