mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-09 18:47:16 -08:00
dev-lang/fuzion: fix parallel build issues
Closes: https://bugs.gentoo.org/958501 Closes: https://bugs.gentoo.org/964982 Signed-off-by: Maciej Barć <xgqt@gentoo.org>
This commit is contained in:
@@ -0,0 +1,37 @@
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -574,7 +574,7 @@ $(CLASS_FILES_BE_C): $(JAVA_FILES_BE_C) $(CLASS_FILES_FUIR) $(CLASS_FILES_FUIR_
|
||||
$(JAVAC) -cp $(CLASSES_DIR) -d $(CLASSES_DIR) $(JAVA_FILES_BE_C)
|
||||
touch $@
|
||||
|
||||
-$(CLASS_FILES_BE_EFFECTS): $(JAVA_FILES_BE_EFFECTS) $(CLASS_FILES_FUIR_CFG)
|
||||
+$(CLASS_FILES_BE_EFFECTS): $(JAVA_FILES_BE_EFFECTS) $(CLASS_FILES_FUIR_CFG) $(CLASS_FILES_FUIR_ANALYSIS_DFA)
|
||||
mkdir -p $(CLASSES_DIR)
|
||||
$(JAVAC) -cp $(CLASSES_DIR) -d $(CLASSES_DIR) $(JAVA_FILES_BE_EFFECTS)
|
||||
touch $@
|
||||
@@ -685,14 +685,14 @@ $(MOD_JAVA_BASE_FZ_FILES): $(MOD_BASE) $(FZJAVA)
|
||||
$(FUZION_BIN_SH) -c "$(FZJAVA) java.base -to=$(@D) -verbose=0"
|
||||
touch $@
|
||||
|
||||
-$(MOD_JAVA_XML_FZ_FILES): $(FZJAVA)
|
||||
+$(MOD_JAVA_XML_FZ_FILES): $(FZJAVA) $(MOD_JAVA_BASE)
|
||||
rm -rf $(@D)
|
||||
mkdir -p $(@D)
|
||||
# wrapping in /bin/sh -c "..." is a workaround for building on windows (msys2)
|
||||
$(FUZION_BIN_SH) -c "$(FZJAVA) java.xml -to=$(@D) -modules=java.base -verbose=0"
|
||||
touch $@
|
||||
|
||||
-$(MOD_JAVA_DATATRANSFER_FZ_FILES): $(FZJAVA)
|
||||
+$(MOD_JAVA_DATATRANSFER_FZ_FILES): $(FZJAVA) $(MOD_JAVA_BASE) $(MOD_JAVA_XML)
|
||||
rm -rf $(@D)
|
||||
mkdir -p $(@D)
|
||||
# wrapping in /bin/sh -c "..." is a workaround for building on windows (msys2)
|
||||
@@ -703,7 +703,7 @@ $(MOD_JAVA_DATATRANSFER_FZ_FILES): $(FZJAVA)
|
||||
mv $(BUILD_DIR)/modules/java.datatransfer/Java/java/awt_pkg.fz $(BUILD_DIR)/modules/java.datatransfer/
|
||||
touch $@
|
||||
|
||||
-$(MOD_JAVA_DESKTOP_FZ_FILES): $(FZJAVA)
|
||||
+$(MOD_JAVA_DESKTOP_FZ_FILES): $(FZJAVA) $(MOD_JAVA_BASE) $(MOD_JAVA_XML) $(MOD_JAVA_DATATRANSFER)
|
||||
rm -rf $(@D)
|
||||
mkdir -p $(@D)
|
||||
# wrapping in /bin/sh -c "..." is a workaround for building on windows (msys2)
|
||||
@@ -1,4 +1,4 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Copyright 1999-2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
@@ -38,7 +38,11 @@ BDEPEND="
|
||||
)
|
||||
"
|
||||
|
||||
PATCHES=( "${FILESDIR}/fuzion-0.092-Makefile.patch" )
|
||||
PATCHES=(
|
||||
"${FILESDIR}/fuzion-0.092-Makefile.patch"
|
||||
"${FILESDIR}/fuzion-0.092-parallel-build.patch"
|
||||
)
|
||||
|
||||
DOCS=( README.md release_notes.md )
|
||||
|
||||
src_prepare() {
|
||||
|
||||
Reference in New Issue
Block a user