summaryrefslogtreecommitdiff
path: root/wolfram-engine-aarch64-ld_library.patch
blob: e550f28b992381236e0ed67e19bcb5f8ea341f04 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
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