summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaron Kent-Dobias <jaron@kent-dobias.com>2020-10-30 18:10:09 +0100
committerJaron Kent-Dobias <jaron@kent-dobias.com>2020-10-30 18:10:09 +0100
commit82ea520c06015a05e9711b05126757f468b6b271 (patch)
tree9add0a41c04395d4433c0598ff75670b70538453
parent5a3ab4f2d17983a4e2c99c74083d786f6c440e64 (diff)
downloadwolfram-engine-aarch64-82ea520c06015a05e9711b05126757f468b6b271.tar.gz
wolfram-engine-aarch64-82ea520c06015a05e9711b05126757f468b6b271.tar.bz2
wolfram-engine-aarch64-82ea520c06015a05e9711b05126757f468b6b271.zip
Fixed package.HEADmaster
-rw-r--r--PKGBUILD10
-rw-r--r--wolfram-engine-aarch64-ld_library.patch124
2 files changed, 131 insertions, 3 deletions
diff --git a/PKGBUILD b/PKGBUILD
index a5badd7..f88c6f9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,9 +7,11 @@ pkgrel=1
arch=('aarch64')
url="https://www.wolfram.com/raspberry-pi/"
license=('proprietary')
-depends=('armv6h-libs')
-source=("https://files.wolframcdn.com/raspbian/12.1.1.0/wolfram-engine_12.1.1+2020081901_armhf.deb")
-md5sums=('aed07c54dd14d9a4d87b7d266649ff80')
+depends=(armv6h-libs)
+source=("https://files.wolframcdn.com/raspbian/12.1.1.0/wolfram-engine_12.1.1+2020081901_armhf.deb"
+ "wolfram-engine-aarch64-ld_library.patch")
+md5sums=('aed07c54dd14d9a4d87b7d266649ff80'
+ '1ddf68872597028fa477a9448c769885')
options=(!strip)
# Compressing takes a long time and is not helpful for local installations.
@@ -23,6 +25,8 @@ package() {
cd ${pkgdir}
tar -xf ${srcdir}/data.tar.xz
+ patch --forward --strip=1 --input=${srcdir}/wolfram-engine-aarch64-ld_library.patch
+
mkdir usr/bin
ln -s /opt/Wolfram/WolframEngine/12.1/Executables/MathKernel usr/bin/MathKernel
ln -s /opt/Wolfram/WolframEngine/12.1/Executables/Mathematica usr/bin/Mathematica
diff --git a/wolfram-engine-aarch64-ld_library.patch b/wolfram-engine-aarch64-ld_library.patch
new file mode 100644
index 0000000..e550f28
--- /dev/null
+++ b/wolfram-engine-aarch64-ld_library.patch
@@ -0,0 +1,124 @@
+diff '--color=auto' --unified --recursive --text old/opt/Wolfram/WolframEngine/12.1/Executables/math new/opt/Wolfram/WolframEngine/12.1/Executables/math
+--- old/opt/Wolfram/WolframEngine/12.1/Executables/math 2020-10-23 23:44:09.000000000 +0200
++++ new/opt/Wolfram/WolframEngine/12.1/Executables/math 2020-10-30 10:59:39.644088685 +0100
+@@ -75,15 +75,7 @@
+ fi
+
+ # Set up library paths
+- if [ -n "${USE_WOLFRAM_LD_LIBRARY_PATH}" ]; then
+- M_LIBRARY_PATH="${TopDirectory}/SystemFiles/Libraries/${SystemID}"
+- if [ -z "${LD_LIBRARY_PATH}" ]; then
+- LD_LIBRARY_PATH="${M_LIBRARY_PATH}:${M_LIBRARY_PATH}/Qt/lib"
+- else
+- LD_LIBRARY_PATH="${M_LIBRARY_PATH}:${M_LIBRARY_PATH}/Qt/lib:${LD_LIBRARY_PATH}"
+- fi
+- export LD_LIBRARY_PATH
+- fi
++ export LD_LIBRARY_PATH="/usr/libv6h:${LD_LIBRARY_PATH}"
+
+ if [ "${fail}" = "0" ]; then
+ break
+diff '--color=auto' --unified --recursive --text old/opt/Wolfram/WolframEngine/12.1/Executables/MathKernel new/opt/Wolfram/WolframEngine/12.1/Executables/MathKernel
+--- old/opt/Wolfram/WolframEngine/12.1/Executables/MathKernel 2020-10-23 23:44:09.000000000 +0200
++++ new/opt/Wolfram/WolframEngine/12.1/Executables/MathKernel 2020-10-30 11:00:35.906797153 +0100
+@@ -75,15 +75,7 @@
+ fi
+
+ # Set up library paths
+- if [ -n "${USE_WOLFRAM_LD_LIBRARY_PATH}" ]; then
+- M_LIBRARY_PATH="${TopDirectory}/SystemFiles/Libraries/${SystemID}"
+- if [ -z "${LD_LIBRARY_PATH}" ]; then
+- LD_LIBRARY_PATH="${M_LIBRARY_PATH}:${M_LIBRARY_PATH}/Qt/lib"
+- else
+- LD_LIBRARY_PATH="${M_LIBRARY_PATH}:${M_LIBRARY_PATH}/Qt/lib:${LD_LIBRARY_PATH}"
+- fi
+- export LD_LIBRARY_PATH
+- fi
++ export LD_LIBRARY_PATH="/usr/libv6h:${LD_LIBRARY_PATH}"
+
+ if [ "${fail}" = "0" ]; then
+ break
+diff '--color=auto' --unified --recursive --text old/opt/Wolfram/WolframEngine/12.1/Executables/mcc new/opt/Wolfram/WolframEngine/12.1/Executables/mcc
+--- old/opt/Wolfram/WolframEngine/12.1/Executables/mcc 2020-10-23 23:44:09.000000000 +0200
++++ new/opt/Wolfram/WolframEngine/12.1/Executables/mcc 2020-10-30 11:03:06.584003219 +0100
+@@ -19,6 +19,8 @@
+ SystemIDList="Linux-x86-64 Linux";;
+ armv?l)
+ SystemIDList="Linux-ARM";;
++ aarch64)
++ SystemIDList="Linux-ARM";;
+ *)
+ SystemIDList="Unknown";;
+ esac;;
+diff '--color=auto' --unified --recursive --text old/opt/Wolfram/WolframEngine/12.1/Executables/wolfram new/opt/Wolfram/WolframEngine/12.1/Executables/wolfram
+--- old/opt/Wolfram/WolframEngine/12.1/Executables/wolfram 2020-10-23 23:44:09.000000000 +0200
++++ new/opt/Wolfram/WolframEngine/12.1/Executables/wolfram 2020-10-30 11:03:21.624719253 +0100
+@@ -75,15 +75,7 @@
+ fi
+
+ # Set up library paths
+- if [ -n "${USE_WOLFRAM_LD_LIBRARY_PATH}" ]; then
+- M_LIBRARY_PATH="${TopDirectory}/SystemFiles/Libraries/${SystemID}"
+- if [ -z "${LD_LIBRARY_PATH}" ]; then
+- LD_LIBRARY_PATH="${M_LIBRARY_PATH}:${M_LIBRARY_PATH}/Qt/lib"
+- else
+- LD_LIBRARY_PATH="${M_LIBRARY_PATH}:${M_LIBRARY_PATH}/Qt/lib:${LD_LIBRARY_PATH}"
+- fi
+- export LD_LIBRARY_PATH
+- fi
++ export LD_LIBRARY_PATH="/usr/libv6h:${LD_LIBRARY_PATH}"
+
+ if [ "${fail}" = "0" ]; then
+ break
+diff '--color=auto' --unified --recursive --text old/opt/Wolfram/WolframEngine/12.1/Executables/wolframfrontend new/opt/Wolfram/WolframEngine/12.1/Executables/wolframfrontend
+--- old/opt/Wolfram/WolframEngine/12.1/Executables/wolframfrontend 2020-10-23 23:44:09.000000000 +0200
++++ new/opt/Wolfram/WolframEngine/12.1/Executables/wolframfrontend 2020-10-30 11:05:07.399740738 +0100
+@@ -61,11 +61,7 @@
+ fi
+
+ # Set up library paths
+-M_LIBRARY_PATH="${TopDirectory}/SystemFiles/Libraries/${SystemID}"
+-export QT_PLUGIN_PATH="${M_LIBRARY_PATH}/Qt/plugins/"
+-if [ -n "${USE_WOLFRAM_LD_LIBRARY_PATH}" ]; then
+- export LD_LIBRARY_PATH="${M_LIBRARY_PATH}:${M_LIBRARY_PATH}/Qt/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
+-fi
++export LD_LIBRARY_PATH="/usr/libv6h:${LD_LIBRARY_PATH}"
+
+ # Ensure matching wolfram, etc., are found
+ export PATH="${ExecutablesDirectory}:${PATH}"
+diff '--color=auto' --unified --recursive --text old/opt/Wolfram/WolframEngine/12.1/Executables/WolframFrontEnd new/opt/Wolfram/WolframEngine/12.1/Executables/WolframFrontEnd
+--- old/opt/Wolfram/WolframEngine/12.1/Executables/WolframFrontEnd 2020-10-23 23:44:09.000000000 +0200
++++ new/opt/Wolfram/WolframEngine/12.1/Executables/WolframFrontEnd 2020-10-30 11:01:10.438454360 +0100
+@@ -61,11 +61,7 @@
+ fi
+
+ # Set up library paths
+-M_LIBRARY_PATH="${TopDirectory}/SystemFiles/Libraries/${SystemID}"
+-export QT_PLUGIN_PATH="${M_LIBRARY_PATH}/Qt/plugins/"
+-if [ -n "${USE_WOLFRAM_LD_LIBRARY_PATH}" ]; then
+- export LD_LIBRARY_PATH="${M_LIBRARY_PATH}:${M_LIBRARY_PATH}/Qt/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
+-fi
++export LD_LIBRARY_PATH="/usr/libv6h:${LD_LIBRARY_PATH}"
+
+ # Ensure matching wolfram, etc., are found
+ export PATH="${ExecutablesDirectory}:${PATH}"
+diff '--color=auto' --unified --recursive --text old/opt/Wolfram/WolframEngine/12.1/Executables/WolframKernel new/opt/Wolfram/WolframEngine/12.1/Executables/WolframKernel
+--- old/opt/Wolfram/WolframEngine/12.1/Executables/WolframKernel 2020-10-23 23:44:09.000000000 +0200
++++ new/opt/Wolfram/WolframEngine/12.1/Executables/WolframKernel 2020-10-30 11:01:33.169543269 +0100
+@@ -75,15 +75,7 @@
+ fi
+
+ # Set up library paths
+- if [ -n "${USE_WOLFRAM_LD_LIBRARY_PATH}" ]; then
+- M_LIBRARY_PATH="${TopDirectory}/SystemFiles/Libraries/${SystemID}"
+- if [ -z "${LD_LIBRARY_PATH}" ]; then
+- LD_LIBRARY_PATH="${M_LIBRARY_PATH}:${M_LIBRARY_PATH}/Qt/lib"
+- else
+- LD_LIBRARY_PATH="${M_LIBRARY_PATH}:${M_LIBRARY_PATH}/Qt/lib:${LD_LIBRARY_PATH}"
+- fi
+- export LD_LIBRARY_PATH
+- fi
++ export LD_LIBRARY_PATH="/usr/libv6h:${LD_LIBRARY_PATH}"
+
+ if [ "${fail}" = "0" ]; then
+ break