projects/guix·blob java-team · refs

123 lines · 3.8 KiB

1Copyright (C) 2025-2026 Nigko Yerden <[email protected]>
2
3Index: autogen.sh
4===================================================================
5diff --git a/autogen.sh b/autogen.sh
6--- a/autogen.sh (revision 7333)
7+++ b/autogen.sh (working copy)
8@@ -143,18 +143,6 @@
9 ;;
10 *--with-csl* | *--with-both*)
11 L="$L ./csl ./csl/cslbase ./csl/cslbase-nothrow ./libraries/SoftFloat-3a/source"
12-# On Apple m1 (ie arm64) I will want to build a universal version of the
13-# libffi library and that is done in a way that differs from standrad builds.
14- case "`uname -s` `uname -m`" in
15- *Darwin*arm64*)
16- L="$L ./libraries/libffi-for-mac/libffi-3.3-arm64"
17- L="$L ./libraries/libffi-for-mac/libffi-3.3-x86_64"
18- L="$L ./libraries/libffi"
19- ;;
20- *)
21- L="$L ./libraries/libffi"
22- ;;
23- esac
24 case $a in
25 *--without-fox* | *with-fox=no* | \
26 *--without-gui* | *with-gui=no*)
27Index: configure.ac
28===================================================================
29diff --git a/configure.ac b/configure.ac
30--- a/configure.ac (revision 7333)
31+++ b/configure.ac (working copy)
32@@ -1542,33 +1542,6 @@
33 cd "$builddir"
34 fi
35
36-# On the Macintosh I will use a version of libffi provided either by
37-# macports or by homebrew, so I do not want to configure to build a
38-# private copy.
39-if test `uname` != "Darwin"
40-then
41- AC_MSG_NOTICE([About to configure libffi])
42- mkdir -p libffi
43- cd libffi
44- setpasscc
45- doconfig="$SHELL $abssrcdir/libraries/libffi/configure -C $filtered \
46- $pass_host \
47- CPPFLAGS=\"$CPPFLAGS\" \
48- CFLAGS=\"$CFLAGS\" \
49- CXXFLAGS=\"$CXXFLAGS\" \
50- LDFLAGS=\"$LDFLAGS\" \
51- $passcc \
52- --disable-multi-os-directory \
53- --disable-docs \
54- --prefix=\"$builddir\" \
55- --libdir=\"$builddir/lib\" \
56- --includedir=\"$builddir/include\""
57- AC_MSG_NOTICE([doconfig = $doconfig])
58- printf "\n\n+++ About to configure libffi +++\n\n"
59- eval "$doconfig"
60- cd "$builddir"
61-fi
62-
63 AC_MSG_NOTICE([About to configure libsoftfloat])
64 mkdir -p softfloat
65 cd softfloat
66Index: csl/cslbase/Makefile.am
67===================================================================
68diff --git a/csl/cslbase/Makefile.am b/csl/cslbase/Makefile.am
69--- a/csl/cslbase/Makefile.am (revision 7333)
70+++ b/csl/cslbase/Makefile.am (working copy)
71@@ -897,38 +897,6 @@
72
73 else !mac_framework
74
75-LIBFFIDEPS=../lib/libffi.a ../include/ffi.h
76-
77-FFIDEP = ../include/ffi.h
78-FFIINC = -I../include
79-AM_CPPFLAGS += $(FFINC)
80-reduce_CPPFLAGS += $(FFINC)
81-reduce_web_CPPFLAGS += $(FFINC)
82-bootstrapreduce_CPPFLAGS += $(FFINC)
83-csl_CPPFLAGS += $(FFINC)
84-flatcsl_CPPFLAGS += $(FFINC)
85-
86-# The following ugly dependencies are here so that one can go, for
87-# instance, "make csl.o" in a clean tree and libffi building will get
88-# triggered.
89-
90-csl_LDADD += ../lib/libffi.a
91-flatcsl_LDADD += ../lib/libffi.a
92-bootstrapreduce_LDADD += ../lib/libffi.a
93-reduce_LDADD += ../lib/libffi.a
94-reduce_web_LDADD += ../lib/libffi.a
95-
96-csl_DEPENDENCIES += $(LIBFFIDEPS)
97-flatcsl_DEPENDENCIES += $(LIBFFIDEPS)
98-bootstrapreduce_DEPENDENCIES += $(LIBFFIDEPS)
99-reduce_DEPENDENCIES += $(LIBFFIDEPS)
100-reduce_web_DEPENDENCIES += $(LIBFFIDEPS)
101-
102-$(LIBFFIDEPS):
103- @printf "About to build libffi for %s ($@)\n" `pwd`
104- printf "\n\n=== About to build libffi library\n\n";
105- -$(TRACE)@$(MAKE) -C ../libffi install
106-
107 endif !mac_framework
108
109 SOFTFLOATDEPS=../lib/libsoftfloat.a ../include/softfloat.h
110Index: csl/cslbase/configure.ac
111===================================================================
112diff --git a/csl/cslbase/configure.ac b/csl/cslbase/configure.ac
113--- a/csl/cslbase/configure.ac (revision 7333)
114+++ b/csl/cslbase/configure.ac (working copy)
115@@ -146,6 +146,8 @@
116 AC_DEFINE(WITHOUT_FFI, [1], [remove the foreign function support])
117 fi
118
119+AC_SEARCH_LIBS([ffi_call], [ffi])
120+
121 # What host am I on?
122 AC_CANONICAL_HOST()
123