diff options
Diffstat (limited to 'emulators/qemu-user-static-devel/files')
3 files changed, 37 insertions, 11 deletions
diff --git a/emulators/qemu-user-static-devel/files/patch-configure b/emulators/qemu-user-static-devel/files/patch-configure new file mode 100644 index 000000000000..143a20b5b707 --- /dev/null +++ b/emulators/qemu-user-static-devel/files/patch-configure @@ -0,0 +1,22 @@ +--- configure.orig 2021-05-11 21:34:33 UTC ++++ configure +@@ -1964,19 +1964,6 @@ if test -z "$meson"; then + error_exit "Meson not found. Use --meson=/path/to/meson" + fi + fi +-else +- # Meson uses its own Python interpreter to invoke other Python scripts, +- # but the user wants to use the one they specified with --python. +- # +- # We do not want to override the distro Python interpreter (and sometimes +- # cannot: for example in Homebrew /usr/bin/meson is a bash script), so +- # just require --meson=git|internal together with --python. +- if test "$explicit_python" = yes; then +- case "$meson" in +- git | internal) ;; +- *) error_exit "--python requires using QEMU's embedded Meson distribution." ;; +- esac +- fi + fi + + if test "$meson" = git; then diff --git a/emulators/qemu-user-static-devel/files/patch-tests_fp_meson.build b/emulators/qemu-user-static-devel/files/patch-tests_fp_meson.build new file mode 100644 index 000000000000..97fa56ae9bf7 --- /dev/null +++ b/emulators/qemu-user-static-devel/files/patch-tests_fp_meson.build @@ -0,0 +1,15 @@ +Disable "fp" tests since they live in a subrepo and are not fetched during +"make fetch" + +--- tests/fp/meson.build.orig 2021-05-11 21:34:33 UTC ++++ tests/fp/meson.build +@@ -1,8 +1,4 @@ +-# There are namespace pollution issues on Windows, due to osdep.h +-# bringing in Windows headers that define a FLOAT128 type. +-if targetos == 'windows' +- subdir_done() +-endif ++subdir_done() + + fpcflags = [ + # softfloat defines diff --git a/emulators/qemu-user-static-devel/files/qemu_user_static.in b/emulators/qemu-user-static-devel/files/qemu_user_static.in index 5bd78868e7bb..8db8e171a22a 100644 --- a/emulators/qemu-user-static-devel/files/qemu_user_static.in +++ b/emulators/qemu-user-static-devel/files/qemu_user_static.in @@ -131,16 +131,6 @@ list_cmd="${BINMISCCTL} list" else echo "$0: interpreter ${interpreter} not found, cannot register." fi - # register sparc64 interpreter styled 'sparc64' - interpreter=${QEMU_DIR}/${QEMU_PREFIX}sparc64${QEMU_SUFFIX} - if [ -x "${interpreter}" ]; then - ${BINMISCCTL} add sparc64 --interpreter "${interpreter}" \ - --magic "\x7f\x45\x4c\x46\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2b" \ - --mask "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff" \ - --size 20 --set-enabled - else - echo "$0: interpreter ${interpreter} not found, cannot register." - fi } %%NAME%%_stop() @@ -155,7 +145,6 @@ list_cmd="${BINMISCCTL} list" ${BINMISCCTL} remove powerpc ${BINMISCCTL} remove powerpc64 ${BINMISCCTL} remove riscv64 - ${BINMISCCTL} remove sparc64 } run_rc_command "$1" |