Skip to content

Commit 080d6af

Browse files
committed
[ga] Fixed patch for libGL and libX11 for macosx
1 parent bd4a03e commit 080d6af

File tree

1 file changed

+12
-19
lines changed

1 file changed

+12
-19
lines changed

.github/workflows/fix-dylib-location.patch

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,25 @@ diff --git a/irteus/irtgl.l b/irteus/irtgl.l
22
index 4c417e61..afd606bc 100644
33
--- a/irteus/irtgl.l
44
+++ b/irteus/irtgl.l
5-
@@ -51,6 +51,8 @@
6-
(cond
7-
((probe-file "/opt/local/lib/libGL.dylib")
8-
(setq gl-lib ( load-foreign "/opt/local/lib/libGL.dylib")))
9-
+ ((probe-file "/usr/local/lib/libGL.dylib")
10-
+ (setq gl-lib ( load-foreign "/usr/local/lib/libGL.dylib")))
5+
@@ -54,6 +54,8 @@
6+
((probe-file "/usr/local/lib/libGL.dylib")
7+
(setq gl-lib ( load-foreign "/usr/local/lib/libGL.dylib")))
8+
+ ((probe-file "/opt/homebrew/lib/libGL.dylib")
9+
+ (setq gl-lib ( load-foreign "/opt/homebrew/lib/libGL.dylib")))
1110
(t
1211
(setq gl-lib ( load-foreign "/opt/X11/lib/libGL.dylib")))))
1312
#+:cygwin
1413
diff --git a/irteus/irtx.l b/irteus/irtx.l
1514
index 6a6761d4..4477b6ce 100644
1615
--- a/irteus/irtx.l
1716
+++ b/irteus/irtx.l
18-
@@ -76,9 +76,12 @@
19-
(let (x-lib pname)
20-
#+:darwin
21-
#+:darwin
22-
- (if (probe-file "/opt/local/lib/libX11.dylib")
23-
- (setq pname "/opt/local/lib/libX11.dylib")
24-
- (setq pname "/opt/X11/lib/libX11.dylib"))
25-
+ (cond ((probe-file "/opt/local/lib/libX11.dylib")
26-
+ (setq pname "/opt/local/lib/libX11.dylib"))
27-
+ ((probe-file "/usr/local/lib/libX11.dylib")
28-
+ (setq pname "/usr/local/lib/libX11.dylib"))
29-
+ (t
30-
+ (setq pname "/opt/X11/lib/libX11.dylib")))
17+
@@ -81,6 +81,8 @@
18+
((probe-file "/usr/local/lib/libX11.dylib")
19+
(setq pname "/usr/local/lib/libX11.dylib"))
20+
+ ((probe-file "/opt/homebrew/lib/libX11.dylib")
21+
+ (setq pname "/opt/homebrew/lib/libX11.dylib"))
22+
(t
23+
(setq pname "/opt/X11/lib/libX11.dylib")))
3124
#+:cygwin
3225
(if (probe-file "/usr/bin/cygX11-6.dll")
3326
(setq pname "/usr/bin/cygX11-6.dll")

0 commit comments

Comments
 (0)