From d4a8d3f9bf716ed657609c47c567214e9d655db3 Mon Sep 17 00:00:00 2001 From: Jan Vrany Date: Sun, 8 Oct 2023 11:16:26 +0100 Subject: [PATCH] Remove dependency on OSUnixSubprocess in favour of LibCompat LibCompat since commit 76a8f9fdb5 [1] uses LibUnix instead of OSUnixSubprocess to implement OSProcess used by test shells to spawn QEMU or Gem5. Worse, due to unfortunate implementation of OSUnixSubprocess (see the aforementioned commit message) it cannot coexist with OSUnixSubprocess. This commit follows this change in LibCompat and removes dependency on OSUnixSubprocess in favour of LibUnix. [1]: https://github.com/janvrany/pharo-hacks/commit/76a8f9fdb5eeafaf54be0cdf2369be0e70a81812 --- pharo/GNUmakefile | 1 + src/BaselineOfTinyrossa/BaselineOfTinyrossa.class.st | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pharo/GNUmakefile b/pharo/GNUmakefile index d52f453..d103a42 100644 --- a/pharo/GNUmakefile +++ b/pharo/GNUmakefile @@ -56,6 +56,7 @@ $(PROJECT).image: ../src/*/*.st $(call pharo-load-local, $@, MachineArithmetic,$(MACHINEARITHMETIC_DIR)) $(call pharo-load-local, $@, ArchC, $(ARCHC_DIR)/src) $(call pharo-load-local, $@, SmallRSP, $(SMALLRSP_DIR)/src) + $(call pharo-load-local, $@, LibUnix, $(PHARO_HACKS_DIR)/src) $(call pharo-load-local, $@, LibCompat, $(PHARO_HACKS_DIR)/src) $(call pharo-load-local, $@, Tinyrossa, ../src) diff --git a/src/BaselineOfTinyrossa/BaselineOfTinyrossa.class.st b/src/BaselineOfTinyrossa/BaselineOfTinyrossa.class.st index 5229538..8d32fa7 100644 --- a/src/BaselineOfTinyrossa/BaselineOfTinyrossa.class.st +++ b/src/BaselineOfTinyrossa/BaselineOfTinyrossa.class.st @@ -18,18 +18,18 @@ BaselineOfTinyrossa >> baseline: spec [ spec repository: 'github://shingarov/SmallRSP:microwatt' ]. - spec baseline: 'OSSubprocess' with: [ - spec repository: 'github://pharo-contributions/OSSubprocess:v1.3.0' + spec baseline: 'LibCompat' with: [ + spec repository: 'github://janvrany/pharo-hacks'. ]. - spec baseline: 'LibCompat' with: [ + spec baseline: 'LibUnix' with: [ spec repository: 'github://janvrany/pharo-hacks'. ]. spec package: #'Tinyrossa' with:[ - "LibCompat requires OSSubprocess for its OSProcess implementation." - spec requires: 'OSSubprocess'. + "LibCompat's implementation of OSProcess requires LibUnix" + spec requires: 'LibUnix'. spec requires: 'LibCompat'. spec requires: 'ArchC' ];