diff options
| author | Thomas Orgis | 2021-09-15 16:43:05 +0200 |
|---|---|---|
| committer | Thomas Orgis | 2021-09-15 16:43:24 +0200 |
| commit | ff92cf658b0828b44dc0f2a82efd9367f0a2d2f9 (patch) | |
| tree | 84ec936873e427c85fc1255b1d3cc8a1eec7e9e3 /utils | |
| parent | 800371774a8dcf39026d196a6767f50ac18c057a (diff) | |
qemu: some build fixes (glibc)
Diffstat (limited to 'utils')
| -rwxr-xr-x | utils/qemu/BUILD | 1 | ||||
| -rwxr-xr-x | utils/qemu/DEPENDS | 2 | ||||
| -rw-r--r-- | utils/qemu/HISTORY | 5 | ||||
| -rw-r--r-- | utils/qemu/patches/musl-fix-duplicated-sysinfo.patch | 3 |
4 files changed, 8 insertions, 3 deletions
diff --git a/utils/qemu/BUILD b/utils/qemu/BUILD index 2ddbfeb364..86ad8417cf 100755 --- a/utils/qemu/BUILD +++ b/utils/qemu/BUILD @@ -20,7 +20,6 @@ esac && --localstatedir="$INSTALL_ROOT/var" \ --target-list="$QEMU_ARCHS" \ --audio-drv-list="$QEMU_AUDIO" \ - --python=python2 \ $QEMU_OPTS \ $OPTS && diff --git a/utils/qemu/DEPENDS b/utils/qemu/DEPENDS index c886c2cf4d..11331f6a29 100755 --- a/utils/qemu/DEPENDS +++ b/utils/qemu/DEPENDS @@ -170,7 +170,7 @@ optional_depends jemalloc \ --{enable,disable}-jemalloc \ 'for jemalloc support' && -optional_depends libssh2 \ +optional_depends libssh \ --{enable,disable}-libssh \ 'for SSH block device support' && diff --git a/utils/qemu/HISTORY b/utils/qemu/HISTORY index a497835ca0..048a3dd9c5 100644 --- a/utils/qemu/HISTORY +++ b/utils/qemu/HISTORY @@ -1,3 +1,8 @@ +2021-09-15 Thomas Orgis <sobukus@sourcemage.org> + * patches/musl-fix-duplicated-sysinfo.patch: fix for glibc + * DEPENDS: needs libssh, not libssh2 + * BUILD: remove python2 switch + 2021-09-10 Ismael Luceno <ismael@sourcemage.org> * DETAILS: updated spell to 6.1.0 * DEPENDS: on musl hosts request musl 1.2.2+ (sigevent API) diff --git a/utils/qemu/patches/musl-fix-duplicated-sysinfo.patch b/utils/qemu/patches/musl-fix-duplicated-sysinfo.patch index f81fa20769..ff63003ceb 100644 --- a/utils/qemu/patches/musl-fix-duplicated-sysinfo.patch +++ b/utils/qemu/patches/musl-fix-duplicated-sysinfo.patch @@ -1,9 +1,10 @@ --- a/linux-user/syscall.c +++ b/linux-user/syscall.c -@@ -16,6 +16,9 @@ +@@ -16,6 +16,10 @@ * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #define _ATFILE_SOURCE ++#include <stdint.h> /* To possibly get __GLIBC__ definition. */ +#ifndef __GLIBC__ +#define _LINUX_SYSINFO_H /* to avoid duplicated sysinfo struct definition */ +#endif |