Commit graph

5 commits

Author SHA1 Message Date
Grant Miller
ea16f7c523
Revert "temp/qemu: disable block-curl module" (!112)
This reverts commit c83052c9f3.
This workaround is no longer needed thanks to !109.
I have confirmed that qemu still compiles for aarch64. [skip ci]
2018-12-23 23:14:34 +01:00
Oliver Smith
c83052c9f3
temp/qemu: disable block-curl module
Workaround for a build error on aarch64, where the binary package
repository is currently stuck. Compiling it for aarch64 like this:

$ pmbootstrap build --strict --arch=aarch64 qemu

Resulted in:

>>> qemu: Analyzing dependencies...
ERROR: unsatisfiable constraints:
  openssl-dev-1.1.1a-r0:
    conflicts: libressl-dev-2.7.4-r2[pc:libcrypto=1.1.1a]
               libressl-dev-2.7.4-r2[pc:libssl=1.1.1a]
               libressl-dev-2.7.4-r2[pc:openssl=1.1.1a]
    satisfies: curl-dev-7.62.0-r2[openssl-dev]
               libssh2-dev-1.8.0-r4[pc:libcrypto]
               libssh2-dev-1.8.0-r4[pc:libssl]
               spice-dev-0.14.1-r3[pc:openssl]
  libressl-dev-2.7.4-r2:
    conflicts: openssl-dev-1.1.1a-r0[pc:libcrypto=2.7.4]
               openssl-dev-1.1.1a-r0[pc:libssl=2.7.4]
               openssl-dev-1.1.1a-r0[pc:openssl=2.7.4]
    satisfies: world[libressl-dev]
               libssh2-dev-1.8.0-r4[pc:libcrypto]
               libssh2-dev-1.8.0-r4[pc:libssl]
               spice-dev-0.14.1-r3[pc:openssl]
>>> ERROR: qemu: builddeps failed

Note that the only package not mentioned in both "satisfies" outputs is
curl-dev. The real questions are: why is libressl-dev getting pulled in
at all? (Alpine switched back from libressl to openssl, so this should
not happen). And why does this only happen for aarch64, but not for
x86_64 and armhf? But at least this patch unblocks the package builder.
2018-12-17 07:17:33 +01:00
Grant Miller
7a916698dc
temp/qemu: Update to upstream version 3.0.0-r0 (!99)
I didn't test it thoroughly, but it builds now and I can run
plasma-mobile on qemu-amd64.

[skip ci]: this takes longer than one hour to build in CI.
2018-12-13 08:27:48 +01:00
Oliver Smith
b3f1d81f35 temp/qemu: bump pkgrel (soname bump) 2018-08-17 00:52:24 +02:00
Oliver Smith
987d9c735d Move aports forked from Alpine to aports/temp
Also remove the py-requests, as the version has been updated in Alpine.

Close: #1603
2018-07-06 22:34:38 +02:00