mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove obsolete setuptools dependency and fix Stefan's

Browse Source 
Win32 builds.
 -----BEGIN PGP SIGNATURE-----
 
 iQFIBAABCAAyFiEE8TM4V0tmI4mGbHaCv/vSX3jHroMFAl+/uegUHHBib256aW5p
 QHJlZGhhdC5jb20ACgkQv/vSX3jHroPMiwgAj6VB/lZP10CmKfNCIC6s9TjONP2I
 ruI3ZMYBrmeiLMf/WZTDI0kRY/mmYMtn4nN+RlEHlBE9a9hSCmHWvQyZDgEIJUOA
 1bTAdl4jFAbBv4knKVVuPSu/kMDHVIkwdktEEmPhkMHunIxrI7Yobe4r0GMXXZJm
 Vu4dNtskzERu/fc+lgbdMjRU+xlXT/zYHy98L5mu+VRgKgmtY/6aF1et4t+EfM9f
 tu3vd/WEOn/HiYvOsVj55SNSR6IiXTGq0LS5d4fI2Q9B477qoO+x3QJDzjbHBo+u
 u58QkbqJa5OfO0ZoUAi+SvOjE0EhJFPL5ihVODjkTSbORpfWz3ULyAK1nQ==
 =Mdqh
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into staging

Remove obsolete setuptools dependency and fix Stefan's
Win32 builds.

# gpg: Signature made Thu 26 Nov 2020 14:21:28 GMT
# gpg:                using RSA key F13338574B662389866C7682BFFBD25F78C7AE83
# gpg:                issuer "pbonzini@redhat.com"
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full]
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>" [full]
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
#      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83

* remotes/bonzini-gitlab/tags/for-upstream:
  nsis: Fix build for 64 bit installer
  tests/docker, tests/vm: remove setuptools from images
  configure: remove python pkg_resources check
  meson: use dependency() to find libjpeg

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2020-11-26 14:25:47 +00:00
commit 6cfdaa88cf
10 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.cirrus.yml
View File

@ -87,7 +87,6 @@ windows_msys2_task:
C:\tools\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -S --needed \ C:\tools\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -S --needed \
diffutils git grep make pkg-config sed \ diffutils git grep make pkg-config sed \
mingw-w64-x86_64-python \ mingw-w64-x86_64-python \
mingw-w64-x86_64-python-setuptools \
mingw-w64-x86_64-toolchain \ mingw-w64-x86_64-toolchain \
mingw-w64-x86_64-SDL2 \ mingw-w64-x86_64-SDL2 \
mingw-w64-x86_64-SDL2_image \ mingw-w64-x86_64-SDL2_image \

3
configure vendored
View File

@ -1912,9 +1912,6 @@ fi
case "$meson" in case "$meson" in
git | internal) git | internal)
if ! $python -c 'import pkg_resources' > /dev/null 2>&1; then
error_exit "Python setuptools not found"
fi
meson="$python ${source_path}/meson/meson.py" meson="$python ${source_path}/meson/meson.py"
;; ;;
*) meson=$(command -v "$meson") ;; *) meson=$(command -v "$meson") ;;

7
meson.build
View File

@ -654,9 +654,8 @@ if get_option('vnc').enabled()
vnc = declare_dependency() # dummy dependency vnc = declare_dependency() # dummy dependency
png = dependency('libpng', required: get_option('vnc_png'), png = dependency('libpng', required: get_option('vnc_png'),
method: 'pkg-config', static: enable_static) method: 'pkg-config', static: enable_static)
jpeg = cc.find_library('jpeg', has_headers: ['jpeglib.h'], jpeg = dependency('libjpeg', required: get_option('vnc_jpeg'),
required: get_option('vnc_jpeg'), method: 'pkg-config', static: enable_static)
static: enable_static)
sasl = cc.find_library('sasl2', has_headers: ['sasl/sasl.h'], sasl = cc.find_library('sasl2', has_headers: ['sasl/sasl.h'],
required: get_option('vnc_sasl'), required: get_option('vnc_sasl'),
static: enable_static) static: enable_static)
@ -1956,7 +1955,7 @@ if host_machine.system() == 'windows'
'@OUTPUT@', '@OUTPUT@',
get_option('prefix'), get_option('prefix'),
meson.current_source_dir(), meson.current_source_dir(),
host_machine.cpu_family(), host_machine.cpu(),
'--', '--',
'-DDISPLAYVERSION=' + meson.project_version(), '-DDISPLAYVERSION=' + meson.project_version(),
] ]

1
tests/docker/dockerfiles/debian10.docker
View File

@ -30,7 +30,6 @@ RUN apt update && \
pkg-config \ pkg-config \
psmisc \ psmisc \
python3 \ python3 \
python3-setuptools \
python3-sphinx \ python3-sphinx \
$(apt-get -s build-dep qemu | egrep ^Inst | fgrep '[all]' | cut -d\ -f2) $(apt-get -s build-dep qemu | egrep ^Inst | fgrep '[all]' | cut -d\ -f2)

1
tests/docker/dockerfiles/fedora-win32-cross.docker
View File

@ -30,7 +30,6 @@ ENV PACKAGES \
perl-Test-Harness \ perl-Test-Harness \
python3 \ python3 \
python3-PyYAML \ python3-PyYAML \
python3-setuptools \
tar \ tar \
which which

1
tests/docker/dockerfiles/fedora-win64-cross.docker
View File

@ -26,7 +26,6 @@ ENV PACKAGES \
perl-Test-Harness \ perl-Test-Harness \
python3 \ python3 \
python3-PyYAML \ python3-PyYAML \
python3-setuptools \
tar \ tar \
which which

1
tests/vm/freebsd
View File

@ -33,7 +33,6 @@ class FreeBSDVM(basevm.BaseVM):
"pkgconf", "pkgconf",
"bzip2", "bzip2",
"python37", "python37",
"py37-setuptools",
"ninja", "ninja",
# gnu tools # gnu tools

1
tests/vm/haiku.x86_64
View File

@ -77,7 +77,6 @@ class HaikuVM(basevm.BaseVM):
"devel:libusb_1.0", "devel:libusb_1.0",
"devel:libz", "devel:libz",
"ninja", "ninja",
"setuptools_python3"
] ]
# https://dev.haiku-os.org/ticket/16512 virtio disk1 shows up as 0 (reversed order) # https://dev.haiku-os.org/ticket/16512 virtio disk1 shows up as 0 (reversed order)

1
tests/vm/netbsd
View File

@ -31,7 +31,6 @@ class NetBSDVM(basevm.BaseVM):
"pkgconf", "pkgconf",
"xz", "xz",
"python37", "python37",
"py37-setuptools",
"ninja-build", "ninja-build",
# gnu tools # gnu tools

1
tests/vm/openbsd
View File

@ -30,7 +30,6 @@ class OpenBSDVM(basevm.BaseVM):
"git", "git",
"pkgconf", "pkgconf",
"bzip2", "xz", "bzip2", "xz",
"py3-setuptools",
"ninja", "ninja",
# gnu tools # gnu tools