Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 19 Feb 2021 10:18:18 +0000 (UTC)
From:      Piotr Kubaj <pkubaj@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r566044 - head/math/scilab/files
Message-ID:  <202102191018.11JAIIvK001272@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pkubaj
Date: Fri Feb 19 10:18:18 2021
New Revision: 566044
URL: https://svnweb.freebsd.org/changeset/ports/566044

Log:
  math/scilab: partial fix for powerpc64*
  
  It still doesn't build, but makes it through configure.

Added:
  head/math/scilab/files/patch-bin_scilab   (contents, props changed)
Modified:
  head/math/scilab/files/patch-configure

Added: head/math/scilab/files/patch-bin_scilab
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/scilab/files/patch-bin_scilab	Fri Feb 19 10:18:18 2021	(r566044)
@@ -0,0 +1,33 @@
+--- bin/scilab.orig	2020-02-25 10:59:42.000000000 +0100
++++ bin/scilab	2021-01-25 02:36:29.251977000 +0100
+@@ -184,7 +187,7 @@
+         OS=$(uname -s) # Retrieve the Operating System
+     fi
+     if test "${MODEL}" = ""; then
+-        MODEL=$(uname -m) # Retrieve the model
++        MODEL=$(uname -p) # Retrieve the model
+     fi
+ 
+     if test $SCIVERBOSE -ne 0; then
+@@ -622,7 +625,20 @@
+                     set_macosx_java_vm
+                     ;;
+                 *FreeBSD*)
+-                    proc=$MODEL
++                    case $MODEL in
++                        "powerpc")
++                            proc="ppc"
++                            ;;
++                        "powerpc64")
++                            proc="ppc64"
++                            ;;
++                        "powerpc64le")
++                            proc="ppc64le"
++                            ;;
++			*)
++                    	    proc=$MODEL
++			    ;;
++		    esac
+                     ;;
+                 *)
+                     echo "Could not find the Java configuration for the OS <${OS}>. Please contact us or submit a bug report with your detailed configuration http://bugzilla.scilab.org/"

Modified: head/math/scilab/files/patch-configure
==============================================================================
--- head/math/scilab/files/patch-configure	Fri Feb 19 09:50:39 2021	(r566043)
+++ head/math/scilab/files/patch-configure	Fri Feb 19 10:18:18 2021	(r566044)
@@ -14,7 +14,7 @@
  IS_64_BITS_CPU=false
  case "$host" in
 -         x86_64-*-linux-gnu | x86_64-linux-gnu | ia64-*-linux-gnu | alpha-*-linux-gnu | alpha-*-netbsd* | x86_64-*-netbsd* | sparc64-*-netbsd*)
-+         x86_64-*-linux-gnu | x86_64-linux-gnu | ia64-*-linux-gnu | alpha-*-linux-gnu | alpha-*-netbsd* | x86_64-*-netbsd* | sparc64-*-netbsd* | amd64-*-freebsd* )
++         x86_64-*-linux-gnu | x86_64-linux-gnu | ia64-*-linux-gnu | alpha-*-linux-gnu | alpha-*-netbsd* | x86_64-*-netbsd* | sparc64-*-netbsd* | amd64-*-freebsd* | powerpc64*-*-freebsd*)
                  IS_64_BITS_CPU=true
      ;;
  esac
@@ -27,3 +27,25 @@
     ## With GNU Compiler
  
     # enable the code coverage
+@@ -13126,7 +13126,7 @@
+              ;;
+              *)
+
+-    machine=`uname -m`
++    machine=`uname -p`
+     case "$machine" in
+         i?86)
+           machine=i386
+@@ -13142,10 +13142,10 @@
+         powerpc)
+           machine=ppc
+           ;;
+-        ppc64le)
++        powerpc64le|ppc64le)
+           machine=ppc64le
+           ;;
+-        ppc64)
++        powerpc64|ppc64)
+           machine=ppc64
+           ;;
+         armv*)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202102191018.11JAIIvK001272>