TheCloud/angelauramc-openjdk-build
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/angelauramc-openjdk-build.git synced 2025-08-03 15:46:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

[FIX] xattr command failing for JDK 8 iOS

Browse Source 
Some versions of macOS on some machines might fail the build when xattr is invoked without sudo.
Since the reason xattr is invoked is to help with testing, and the attribute it is removing
is not relevant for iOS, this line can be safely removed from the build.
This commit is contained in:
Eva Isabella Luna 2025-07-02 22:17:07 -06:00
parent 2c9325e911
commit 3cda3c1ed5
No known key found for this signature in database
GPG Key ID: 3716ACDC524F1879
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
buildjdk.sh
View File

@ -75,6 +75,7 @@ if [[ "$BUILD_IOS" != "1" ]]; then
fi
else
git apply --reject --whitespace=fix ../patches/jdk8u_ios.diff || echo "git apply failed (ios patch set)"
git apply --reject --whitespace=fix ../patches/jdk8u_ios_xattr.diff || echo "git apply failed (ios xattr patch set)"
git apply --reject --whitespace=fix ../patches/jdk8u_ios_fix_clang.diff || echo "git apply failed (ios clang fix patch set)"
fi

12
patches/jdk8u_ios_xattr.diff Normal file
View File

@ -0,0 +1,12 @@
diff --git a/make/common/MakeBase.gmk b/make/common/MakeBase.gmk
index f31da150..710db352 100644
--- a/make/common/MakeBase.gmk
+++ b/make/common/MakeBase.gmk
@@ -375,7 +375,6 @@ else ifeq ($(OPENJDK_TARGET_OS),macosx)
define install-file
$(MKDIR) -p $(@D)
$(CP) -fRP '$<' '$@'
- if [ -n "`$(XATTR) -l '$@'`" ]; then $(XATTR) -c '$@'; fi
endef
else
define install-file