blob: 6d21fb172f99ea9b707bac0a6e7dedfcd55f9f34 (
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
|
From bda441991252b42dc09504b87379108cfe24f1fb Mon Sep 17 00:00:00 2001
From: Seth Flynn <[email protected]>
Date: Wed, 5 Mar 2025 16:43:57 -0500
Subject: [PATCH 3/6] build: allow linking against system libffi
Adapted from https://cgit.freebsd.org/ports/commit/?id=680dc7bb031d0f708c2dd38f055ec8d63ee68b8a
---
config/linux/build.xml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/config/linux/build.xml b/config/linux/build.xml
index 11e4743ab..4500d23c0 100644
--- a/config/linux/build.xml
+++ b/config/linux/build.xml
@@ -194,16 +194,18 @@
<include name="${module.lwjgl}/jawt/src/generated/c/*.c" if:true="${binding.jawt}"/>
</fileset>
</source>
- <beforeLink>
+ <beforeLink unless:true="${use.libffi.so}">
<parallel threadsPerProcessor="2" failonany="true" unless:set="lib-dependencies-uptodate">
<update-dependency module="core" artifact="core/libffi.a"/>
</parallel>
</beforeLink>
<link>
- <fileset dir="${lib.native}/org/lwjgl">
+ <fileset dir="${lib.native}/org/lwjgl" unless:true="${use.libffi.so}">
<include name="libffi.a"/>
</fileset>
<arg value="-ldl"/>
+ <arg value="-lffi" if:true="${use.libffi.so}"/>
+ <arg value="-L${libffi.path}" if:set="libffi.path"/>
</link>
</build>
--
2.48.1
|
