stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8307110: zero build broken after JDK-8304265

Browse Source 
Reviewed-by: erikj
This commit is contained in:
Jorn Vernee 2023-04-28 21:43:33 +00:00
parent da9efee1c2
commit 4818c798bc
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
make/conf/jib-profiles.js
View File

@ -599,10 +599,11 @@ var getJibProfilesProfiles = function (input, common, data) {
"linux-aarch64-zero": { "linux-aarch64-zero": {
target_os: "linux", target_os: "linux",
target_cpu: "aarch64", target_cpu: "aarch64",
dependencies: ["devkit", "gtest"], dependencies: ["devkit", "gtest", "libffi"],
configure_args: concat(common.configure_args_64bit, [ configure_args: concat(common.configure_args_64bit, [
"--with-zlib=system", "--with-zlib=system",
"--with-jvm-variants=zero", "--with-jvm-variants=zero",
"--with-libffi=" + input.get("libffi", "home_path"),
"--enable-libffi-bundling" "--enable-libffi-bundling"
]) ])
}, },
@ -611,10 +612,11 @@ var getJibProfilesProfiles = function (input, common, data) {
target_os: "linux", target_os: "linux",
target_cpu: "x86", target_cpu: "x86",
build_cpu: "x64", build_cpu: "x64",
dependencies: ["devkit", "gtest"], dependencies: ["devkit", "gtest", "libffi"],
configure_args: concat(common.configure_args_32bit, [ configure_args: concat(common.configure_args_32bit, [
"--with-zlib=system", "--with-zlib=system",
"--with-jvm-variants=zero", "--with-jvm-variants=zero",
"--with-libffi=" + input.get("libffi", "home_path"),
"--enable-libffi-bundling" "--enable-libffi-bundling"
]) ])
} }
@ -1272,7 +1274,7 @@ var getJibProfilesDependencies = function (input, common) {
libffi: { libffi: {
organization: common.organization, organization: common.organization,
module: "libffi-" + input.build_platform, module: "libffi-" + input.target_platform,
ext: "tar.gz", ext: "tar.gz",
revision: "3.4.2+1.0" revision: "3.4.2+1.0"
}, },

2
make/devkit/createLibffiBundle.sh
View File

@ -81,6 +81,7 @@ cd $LIBFFI_DIR
if [ ! -e $LIBFFI_DIR/configure ]; then if [ ! -e $LIBFFI_DIR/configure ]; then
bash ./autogen.sh bash ./autogen.sh
fi fi
# For Linux/x86, add --build=i686-pc-linux-gnu CFLAGS=-m32 CXXFLAGS=-m32 LDFLAGS=-m32
bash ./configure --prefix=$INSTALL_DIR CC=$DEVKIT_DIR/bin/gcc CXX=$DEVKIT_DIR/bin/g++ bash ./configure --prefix=$INSTALL_DIR CC=$DEVKIT_DIR/bin/gcc CXX=$DEVKIT_DIR/bin/g++
# Run with nice to keep system usable during build. # Run with nice to keep system usable during build.
@ -91,6 +92,7 @@ mkdir -p $IMAGE_DIR
if [ ! -e $IMAGE_DIR/lib/libffi.so ]; then if [ ! -e $IMAGE_DIR/lib/libffi.so ]; then
echo "Copying libffi.so* to image" echo "Copying libffi.so* to image"
mkdir -p $IMAGE_DIR/lib mkdir -p $IMAGE_DIR/lib
# For Linux/x86 it's under /lib/ instead of /lib64/
cp -a $INSTALL_DIR/lib64/libffi.so* $IMAGE_DIR/lib/ cp -a $INSTALL_DIR/lib64/libffi.so* $IMAGE_DIR/lib/
fi fi
if [ ! -e $IMAGE_DIR/include/ ]; then if [ ! -e $IMAGE_DIR/include/ ]; then