[libvirt-dockerfiles PATCH] Refresh after changes to cross-building environments

25 Feb 2020

The new configurations are simpler and more reliable.

The corresponding libvirt-jenkins-ci commit is 483dfc62c86f.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
---
As usual, this is merely the plain-text representation of a
binary patch.

Pushed under the Dockerfile update rule.

 ...denv-libosinfo-fedora-30-cross-mingw32.zip | Bin 687 -> 629 bytes
 ...denv-libosinfo-fedora-30-cross-mingw64.zip | Bin 689 -> 631 bytes
 buildenv-libvirt-debian-10-cross-aarch64.zip  | Bin 1021 -> 982 bytes
 buildenv-libvirt-debian-10-cross-armv6l.zip   | Bin 1014 -> 974 bytes
 buildenv-libvirt-debian-10-cross-armv7l.zip   | Bin 1019 -> 983 bytes
 buildenv-libvirt-debian-10-cross-i686.zip     | Bin 1016 -> 981 bytes
 buildenv-libvirt-debian-10-cross-mips.zip     | Bin 1011 -> 974 bytes
 buildenv-libvirt-debian-10-cross-mips64el.zip | Bin 1022 -> 985 bytes
 buildenv-libvirt-debian-10-cross-mipsel.zip   | Bin 1016 -> 982 bytes
 buildenv-libvirt-debian-10-cross-ppc64le.zip  | Bin 1024 -> 985 bytes
 buildenv-libvirt-debian-10-cross-s390x.zip    | Bin 1011 -> 977 bytes
 buildenv-libvirt-debian-9-cross-aarch64.zip   | Bin 1053 -> 1018 bytes
 buildenv-libvirt-debian-9-cross-armv6l.zip    | Bin 1045 -> 1009 bytes
 buildenv-libvirt-debian-9-cross-armv7l.zip    | Bin 1050 -> 1014 bytes
 buildenv-libvirt-debian-9-cross-mips.zip      | Bin 1044 -> 1010 bytes
 buildenv-libvirt-debian-9-cross-mips64el.zip  | Bin 1056 -> 1021 bytes
 buildenv-libvirt-debian-9-cross-mipsel.zip    | Bin 1048 -> 1014 bytes
 buildenv-libvirt-debian-9-cross-ppc64le.zip   | Bin 1057 -> 1017 bytes
 buildenv-libvirt-debian-9-cross-s390x.zip     | Bin 1045 -> 1013 bytes
 buildenv-libvirt-debian-sid-cross-aarch64.zip | Bin 1020 -> 986 bytes
 buildenv-libvirt-debian-sid-cross-armv6l.zip  | Bin 1013 -> 978 bytes
 buildenv-libvirt-debian-sid-cross-armv7l.zip  | Bin 1019 -> 982 bytes
 buildenv-libvirt-debian-sid-cross-i686.zip    | Bin 1016 -> 981 bytes
 ...denv-libvirt-debian-sid-cross-mips64el.zip | Bin 1022 -> 985 bytes
 buildenv-libvirt-debian-sid-cross-mipsel.zip  | Bin 1013 -> 974 bytes
 buildenv-libvirt-debian-sid-cross-ppc64le.zip | Bin 1023 -> 986 bytes
 buildenv-libvirt-debian-sid-cross-s390x.zip   | Bin 1011 -> 977 bytes
 buildenv-libvirt-fedora-30-cross-mingw32.zip  | Bin 958 -> 897 bytes
 buildenv-libvirt-fedora-30-cross-mingw64.zip  | Bin 960 -> 899 bytes
 29 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/buildenv-libosinfo-fedora-30-cross-mingw32.zip b/buildenv-libosinfo-fedora-30-cross-mingw32.zip
index f70be8d..ff8776c 100644
--- a/buildenv-libosinfo-fedora-30-cross-mingw32.zip
+++ b/buildenv-libosinfo-fedora-30-cross-mingw32.zip
@@ -65,6 +65,4 @@ RUN dnf install -y \
 ENV LANG "en_US.UTF-8"
 
 ENV ABI "i686-w64-mingw32"
-ENV CONFIGURE_OPTS "--host=i686-w64-mingw32 \
-                    --target=i686-w64-mingw32"
-ENV PKG_CONFIG_LIBDIR "/usr/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig:/usr/i686-w64-mingw32/sys-root/mingw/share/pkgconfig"
+ENV CONFIGURE_OPTS "--host=i686-w64-mingw32"
diff --git a/buildenv-libosinfo-fedora-30-cross-mingw64.zip b/buildenv-libosinfo-fedora-30-cross-mingw64.zip
index 7f75981..24f38bc 100644
--- a/buildenv-libosinfo-fedora-30-cross-mingw64.zip
+++ b/buildenv-libosinfo-fedora-30-cross-mingw64.zip
@@ -65,6 +65,4 @@ RUN dnf install -y \
 ENV LANG "en_US.UTF-8"
 
 ENV ABI "x86_64-w64-mingw32"
-ENV CONFIGURE_OPTS "--host=x86_64-w64-mingw32 \
-                    --target=x86_64-w64-mingw32"
-ENV PKG_CONFIG_LIBDIR "/usr/x86_64-w64-mingw32/sys-root/mingw/lib/pkgconfig:/usr/x86_64-w64-mingw32/sys-root/mingw/share/pkgconfig"
+ENV CONFIGURE_OPTS "--host=x86_64-w64-mingw32"
diff --git a/buildenv-libvirt-debian-10-cross-aarch64.zip b/buildenv-libvirt-debian-10-cross-aarch64.zip
index 6ae4014..9bdfe9c 100644
--- a/buildenv-libvirt-debian-10-cross-aarch64.zip
+++ b/buildenv-libvirt-debian-10-cross-aarch64.zip
@@ -64,6 +64,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     dpkg --add-architecture arm64 && \
     apt-get update && \
     apt-get dist-upgrade -y && \
+    apt-get install --no-install-recommends -y dpkg-dev && \
     apt-get install --no-install-recommends -y \
             gcc-aarch64-linux-gnu \
             libacl1-dev:arm64 \
@@ -108,6 +109,4 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
 ENV LANG "en_US.UTF-8"
 
 ENV ABI "aarch64-linux-gnu"
-ENV CONFIGURE_OPTS "--host=aarch64-linux-gnu \
-                    --target=aarch64-linux-gnu"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/aarch64-linux-gnu/pkgconfig"
+ENV CONFIGURE_OPTS "--host=aarch64-linux-gnu"
diff --git a/buildenv-libvirt-debian-10-cross-armv6l.zip b/buildenv-libvirt-debian-10-cross-armv6l.zip
index bc4512a..84df535 100644
--- a/buildenv-libvirt-debian-10-cross-armv6l.zip
+++ b/buildenv-libvirt-debian-10-cross-armv6l.zip
@@ -64,6 +64,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     dpkg --add-architecture armel && \
     apt-get update && \
     apt-get dist-upgrade -y && \
+    apt-get install --no-install-recommends -y dpkg-dev && \
     apt-get install --no-install-recommends -y \
             gcc-arm-linux-gnueabi \
             libacl1-dev:armel \
@@ -106,6 +107,4 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
 ENV LANG "en_US.UTF-8"
 
 ENV ABI "arm-linux-gnueabi"
-ENV CONFIGURE_OPTS "--host=arm-linux-gnueabi \
-                    --target=arm-linux-gnueabi"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/arm-linux-gnueabi/pkgconfig"
+ENV CONFIGURE_OPTS "--host=arm-linux-gnueabi"
diff --git a/buildenv-libvirt-debian-10-cross-armv7l.zip b/buildenv-libvirt-debian-10-cross-armv7l.zip
index ad30527..fa1b9ce 100644
--- a/buildenv-libvirt-debian-10-cross-armv7l.zip
+++ b/buildenv-libvirt-debian-10-cross-armv7l.zip
@@ -64,6 +64,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     dpkg --add-architecture armhf && \
     apt-get update && \
     apt-get dist-upgrade -y && \
+    apt-get install --no-install-recommends -y dpkg-dev && \
     apt-get install --no-install-recommends -y \
             gcc-arm-linux-gnueabihf \
             libacl1-dev:armhf \
@@ -107,6 +108,4 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
 ENV LANG "en_US.UTF-8"
 
 ENV ABI "arm-linux-gnueabihf"
-ENV CONFIGURE_OPTS "--host=arm-linux-gnueabihf \
-                    --target=arm-linux-gnueabihf"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/arm-linux-gnueabihf/pkgconfig"
+ENV CONFIGURE_OPTS "--host=arm-linux-gnueabihf"
diff --git a/buildenv-libvirt-debian-10-cross-i686.zip b/buildenv-libvirt-debian-10-cross-i686.zip
index 9cd596a..22903cf 100644
--- a/buildenv-libvirt-debian-10-cross-i686.zip
+++ b/buildenv-libvirt-debian-10-cross-i686.zip
@@ -64,6 +64,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     dpkg --add-architecture i386 && \
     apt-get update && \
     apt-get dist-upgrade -y && \
+    apt-get install --no-install-recommends -y dpkg-dev && \
     apt-get install --no-install-recommends -y \
             gcc-i686-linux-gnu \
             libacl1-dev:i386 \
@@ -107,6 +108,4 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
 ENV LANG "en_US.UTF-8"
 
 ENV ABI "i686-linux-gnu"
-ENV CONFIGURE_OPTS "--host=i686-linux-gnu \
-                    --target=i686-linux-gnu"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/i386-linux-gnu/pkgconfig"
+ENV CONFIGURE_OPTS "--host=i686-linux-gnu"
diff --git a/buildenv-libvirt-debian-10-cross-mips.zip b/buildenv-libvirt-debian-10-cross-mips.zip
index 2258a26..2beba75 100644
--- a/buildenv-libvirt-debian-10-cross-mips.zip
+++ b/buildenv-libvirt-debian-10-cross-mips.zip
@@ -64,6 +64,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     dpkg --add-architecture mips && \
     apt-get update && \
     apt-get dist-upgrade -y && \
+    apt-get install --no-install-recommends -y dpkg-dev && \
     apt-get install --no-install-recommends -y \
             gcc-mips-linux-gnu \
             libacl1-dev:mips \
@@ -107,6 +108,4 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
 ENV LANG "en_US.UTF-8"
 
 ENV ABI "mips-linux-gnu"
-ENV CONFIGURE_OPTS "--host=mips-linux-gnu \
-                    --target=mips-linux-gnu"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/mips-linux-gnu/pkgconfig"
+ENV CONFIGURE_OPTS "--host=mips-linux-gnu"
diff --git a/buildenv-libvirt-debian-10-cross-mips64el.zip b/buildenv-libvirt-debian-10-cross-mips64el.zip
index 14e5cec..c900d7a 100644
--- a/buildenv-libvirt-debian-10-cross-mips64el.zip
+++ b/buildenv-libvirt-debian-10-cross-mips64el.zip
@@ -64,6 +64,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     dpkg --add-architecture mips64el && \
     apt-get update && \
     apt-get dist-upgrade -y && \
+    apt-get install --no-install-recommends -y dpkg-dev && \
     apt-get install --no-install-recommends -y \
             gcc-mips64el-linux-gnuabi64 \
             libacl1-dev:mips64el \
@@ -107,6 +108,4 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
 ENV LANG "en_US.UTF-8"
 
 ENV ABI "mips64el-linux-gnuabi64"
-ENV CONFIGURE_OPTS "--host=mips64el-linux-gnuabi64 \
-                    --target=mips64el-linux-gnuabi64"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/mips64el-linux-gnuabi64/pkgconfig"
+ENV CONFIGURE_OPTS "--host=mips64el-linux-gnuabi64"
diff --git a/buildenv-libvirt-debian-10-cross-mipsel.zip b/buildenv-libvirt-debian-10-cross-mipsel.zip
index 4d666fc..ae436b6 100644
--- a/buildenv-libvirt-debian-10-cross-mipsel.zip
+++ b/buildenv-libvirt-debian-10-cross-mipsel.zip
@@ -64,6 +64,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     dpkg --add-architecture mipsel && \
     apt-get update && \
     apt-get dist-upgrade -y && \
+    apt-get install --no-install-recommends -y dpkg-dev && \
     apt-get install --no-install-recommends -y \
             gcc-mipsel-linux-gnu \
             libacl1-dev:mipsel \
@@ -107,6 +108,4 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
 ENV LANG "en_US.UTF-8"
 
 ENV ABI "mipsel-linux-gnu"
-ENV CONFIGURE_OPTS "--host=mipsel-linux-gnu \
-                    --target=mipsel-linux-gnu"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/mipsel-linux-gnu/pkgconfig"
+ENV CONFIGURE_OPTS "--host=mipsel-linux-gnu"
diff --git a/buildenv-libvirt-debian-10-cross-ppc64le.zip b/buildenv-libvirt-debian-10-cross-ppc64le.zip
index 03ff6a3..475681a 100644
--- a/buildenv-libvirt-debian-10-cross-ppc64le.zip
+++ b/buildenv-libvirt-debian-10-cross-ppc64le.zip
@@ -64,6 +64,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     dpkg --add-architecture ppc64el && \
     apt-get update && \
     apt-get dist-upgrade -y && \
+    apt-get install --no-install-recommends -y dpkg-dev && \
     apt-get install --no-install-recommends -y \
             gcc-powerpc64le-linux-gnu \
             libacl1-dev:ppc64el \
@@ -107,6 +108,4 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
 ENV LANG "en_US.UTF-8"
 
 ENV ABI "powerpc64le-linux-gnu"
-ENV CONFIGURE_OPTS "--host=powerpc64le-linux-gnu \
-                    --target=powerpc64le-linux-gnu"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/powerpc64le-linux-gnu/pkgconfig"
+ENV CONFIGURE_OPTS "--host=powerpc64le-linux-gnu"
diff --git a/buildenv-libvirt-debian-10-cross-s390x.zip b/buildenv-libvirt-debian-10-cross-s390x.zip
index c64bc88..6e88d47 100644
--- a/buildenv-libvirt-debian-10-cross-s390x.zip
+++ b/buildenv-libvirt-debian-10-cross-s390x.zip
@@ -64,6 +64,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     dpkg --add-architecture s390x && \
     apt-get update && \
     apt-get dist-upgrade -y && \
+    apt-get install --no-install-recommends -y dpkg-dev && \
     apt-get install --no-install-recommends -y \
             gcc-s390x-linux-gnu \
             libacl1-dev:s390x \
@@ -107,6 +108,4 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
 ENV LANG "en_US.UTF-8"
 
 ENV ABI "s390x-linux-gnu"
-ENV CONFIGURE_OPTS "--host=s390x-linux-gnu \
-                    --target=s390x-linux-gnu"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/s390x-linux-gnu/pkgconfig"
+ENV CONFIGURE_OPTS "--host=s390x-linux-gnu"
diff --git a/buildenv-libvirt-debian-9-cross-aarch64.zip b/buildenv-libvirt-debian-9-cross-aarch64.zip
index ba2709a..37752fc 100644
--- a/buildenv-libvirt-debian-9-cross-aarch64.zip
+++ b/buildenv-libvirt-debian-9-cross-aarch64.zip
@@ -65,6 +65,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     dpkg --add-architecture arm64 && \
     apt-get update && \
     apt-get dist-upgrade -y && \
+    apt-get install --no-install-recommends -y dpkg-dev && \
     apt-get install --no-install-recommends -y \
             gcc-aarch64-linux-gnu \
             glusterfs-common:arm64 \
@@ -112,6 +113,4 @@ RUN pip3 install \
 ENV LANG "en_US.UTF-8"
 
 ENV ABI "aarch64-linux-gnu"
-ENV CONFIGURE_OPTS "--host=aarch64-linux-gnu \
-                    --target=aarch64-linux-gnu"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/aarch64-linux-gnu/pkgconfig"
+ENV CONFIGURE_OPTS "--host=aarch64-linux-gnu"
diff --git a/buildenv-libvirt-debian-9-cross-armv6l.zip b/buildenv-libvirt-debian-9-cross-armv6l.zip
index d5f8f13..66c50ae 100644
--- a/buildenv-libvirt-debian-9-cross-armv6l.zip
+++ b/buildenv-libvirt-debian-9-cross-armv6l.zip
@@ -65,6 +65,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     dpkg --add-architecture armel && \
     apt-get update && \
     apt-get dist-upgrade -y && \
+    apt-get install --no-install-recommends -y dpkg-dev && \
     apt-get install --no-install-recommends -y \
             gcc-arm-linux-gnueabi \
             glusterfs-common:armel \
@@ -110,6 +111,4 @@ RUN pip3 install \
 ENV LANG "en_US.UTF-8"
 
 ENV ABI "arm-linux-gnueabi"
-ENV CONFIGURE_OPTS "--host=arm-linux-gnueabi \
-                    --target=arm-linux-gnueabi"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/arm-linux-gnueabi/pkgconfig"
+ENV CONFIGURE_OPTS "--host=arm-linux-gnueabi"
diff --git a/buildenv-libvirt-debian-9-cross-armv7l.zip b/buildenv-libvirt-debian-9-cross-armv7l.zip
index 995d558..8102db9 100644
--- a/buildenv-libvirt-debian-9-cross-armv7l.zip
+++ b/buildenv-libvirt-debian-9-cross-armv7l.zip
@@ -65,6 +65,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     dpkg --add-architecture armhf && \
     apt-get update && \
     apt-get dist-upgrade -y && \
+    apt-get install --no-install-recommends -y dpkg-dev && \
     apt-get install --no-install-recommends -y \
             gcc-arm-linux-gnueabihf \
             glusterfs-common:armhf \
@@ -111,6 +112,4 @@ RUN pip3 install \
 ENV LANG "en_US.UTF-8"
 
 ENV ABI "arm-linux-gnueabihf"
-ENV CONFIGURE_OPTS "--host=arm-linux-gnueabihf \
-                    --target=arm-linux-gnueabihf"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/arm-linux-gnueabihf/pkgconfig"
+ENV CONFIGURE_OPTS "--host=arm-linux-gnueabihf"
diff --git a/buildenv-libvirt-debian-9-cross-mips.zip b/buildenv-libvirt-debian-9-cross-mips.zip
index cf69157..739fc5e 100644
--- a/buildenv-libvirt-debian-9-cross-mips.zip
+++ b/buildenv-libvirt-debian-9-cross-mips.zip
@@ -65,6 +65,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     dpkg --add-architecture mips && \
     apt-get update && \
     apt-get dist-upgrade -y && \
+    apt-get install --no-install-recommends -y dpkg-dev && \
     apt-get install --no-install-recommends -y \
             gcc-mips-linux-gnu \
             glusterfs-common:mips \
@@ -111,6 +112,4 @@ RUN pip3 install \
 ENV LANG "en_US.UTF-8"
 
 ENV ABI "mips-linux-gnu"
-ENV CONFIGURE_OPTS "--host=mips-linux-gnu \
-                    --target=mips-linux-gnu"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/mips-linux-gnu/pkgconfig"
+ENV CONFIGURE_OPTS "--host=mips-linux-gnu"
diff --git a/buildenv-libvirt-debian-9-cross-mips64el.zip b/buildenv-libvirt-debian-9-cross-mips64el.zip
index 7f5b029..3d38e7c 100644
--- a/buildenv-libvirt-debian-9-cross-mips64el.zip
+++ b/buildenv-libvirt-debian-9-cross-mips64el.zip
@@ -65,6 +65,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     dpkg --add-architecture mips64el && \
     apt-get update && \
     apt-get dist-upgrade -y && \
+    apt-get install --no-install-recommends -y dpkg-dev && \
     apt-get install --no-install-recommends -y \
             gcc-mips64el-linux-gnuabi64 \
             glusterfs-common:mips64el \
@@ -111,6 +112,4 @@ RUN pip3 install \
 ENV LANG "en_US.UTF-8"
 
 ENV ABI "mips64el-linux-gnuabi64"
-ENV CONFIGURE_OPTS "--host=mips64el-linux-gnuabi64 \
-                    --target=mips64el-linux-gnuabi64"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/mips64el-linux-gnuabi64/pkgconfig"
+ENV CONFIGURE_OPTS "--host=mips64el-linux-gnuabi64"
diff --git a/buildenv-libvirt-debian-9-cross-mipsel.zip b/buildenv-libvirt-debian-9-cross-mipsel.zip
index 300eaed..d8af5f5 100644
--- a/buildenv-libvirt-debian-9-cross-mipsel.zip
+++ b/buildenv-libvirt-debian-9-cross-mipsel.zip
@@ -65,6 +65,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     dpkg --add-architecture mipsel && \
     apt-get update && \
     apt-get dist-upgrade -y && \
+    apt-get install --no-install-recommends -y dpkg-dev && \
     apt-get install --no-install-recommends -y \
             gcc-mipsel-linux-gnu \
             glusterfs-common:mipsel \
@@ -111,6 +112,4 @@ RUN pip3 install \
 ENV LANG "en_US.UTF-8"
 
 ENV ABI "mipsel-linux-gnu"
-ENV CONFIGURE_OPTS "--host=mipsel-linux-gnu \
-                    --target=mipsel-linux-gnu"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/mipsel-linux-gnu/pkgconfig"
+ENV CONFIGURE_OPTS "--host=mipsel-linux-gnu"
diff --git a/buildenv-libvirt-debian-9-cross-ppc64le.zip b/buildenv-libvirt-debian-9-cross-ppc64le.zip
index d889960..b53581c 100644
--- a/buildenv-libvirt-debian-9-cross-ppc64le.zip
+++ b/buildenv-libvirt-debian-9-cross-ppc64le.zip
@@ -65,6 +65,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     dpkg --add-architecture ppc64el && \
     apt-get update && \
     apt-get dist-upgrade -y && \
+    apt-get install --no-install-recommends -y dpkg-dev && \
     apt-get install --no-install-recommends -y \
             gcc-powerpc64le-linux-gnu \
             glusterfs-common:ppc64el \
@@ -111,6 +112,4 @@ RUN pip3 install \
 ENV LANG "en_US.UTF-8"
 
 ENV ABI "powerpc64le-linux-gnu"
-ENV CONFIGURE_OPTS "--host=powerpc64le-linux-gnu \
-                    --target=powerpc64le-linux-gnu"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/powerpc64le-linux-gnu/pkgconfig"
+ENV CONFIGURE_OPTS "--host=powerpc64le-linux-gnu"
diff --git a/buildenv-libvirt-debian-9-cross-s390x.zip b/buildenv-libvirt-debian-9-cross-s390x.zip
index 0c80277..2c9273f 100644
--- a/buildenv-libvirt-debian-9-cross-s390x.zip
+++ b/buildenv-libvirt-debian-9-cross-s390x.zip
@@ -65,6 +65,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     dpkg --add-architecture s390x && \
     apt-get update && \
     apt-get dist-upgrade -y && \
+    apt-get install --no-install-recommends -y dpkg-dev && \
     apt-get install --no-install-recommends -y \
             gcc-s390x-linux-gnu \
             glusterfs-common:s390x \
@@ -111,6 +112,4 @@ RUN pip3 install \
 ENV LANG "en_US.UTF-8"
 
 ENV ABI "s390x-linux-gnu"
-ENV CONFIGURE_OPTS "--host=s390x-linux-gnu \
-                    --target=s390x-linux-gnu"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/s390x-linux-gnu/pkgconfig"
+ENV CONFIGURE_OPTS "--host=s390x-linux-gnu"
diff --git a/buildenv-libvirt-debian-sid-cross-aarch64.zip b/buildenv-libvirt-debian-sid-cross-aarch64.zip
index b1c152a..79262a1 100644
--- a/buildenv-libvirt-debian-sid-cross-aarch64.zip
+++ b/buildenv-libvirt-debian-sid-cross-aarch64.zip
@@ -64,6 +64,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     dpkg --add-architecture arm64 && \
     apt-get update && \
     apt-get dist-upgrade -y && \
+    apt-get install --no-install-recommends -y dpkg-dev && \
     apt-get install --no-install-recommends -y \
             gcc-aarch64-linux-gnu \
             libacl1-dev:arm64 \
@@ -108,6 +109,4 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
 ENV LANG "en_US.UTF-8"
 
 ENV ABI "aarch64-linux-gnu"
-ENV CONFIGURE_OPTS "--host=aarch64-linux-gnu \
-                    --target=aarch64-linux-gnu"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/aarch64-linux-gnu/pkgconfig"
+ENV CONFIGURE_OPTS "--host=aarch64-linux-gnu"
diff --git a/buildenv-libvirt-debian-sid-cross-armv6l.zip b/buildenv-libvirt-debian-sid-cross-armv6l.zip
index 92921d9..682334f 100644
--- a/buildenv-libvirt-debian-sid-cross-armv6l.zip
+++ b/buildenv-libvirt-debian-sid-cross-armv6l.zip
@@ -64,6 +64,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     dpkg --add-architecture armel && \
     apt-get update && \
     apt-get dist-upgrade -y && \
+    apt-get install --no-install-recommends -y dpkg-dev && \
     apt-get install --no-install-recommends -y \
             gcc-arm-linux-gnueabi \
             libacl1-dev:armel \
@@ -106,6 +107,4 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
 ENV LANG "en_US.UTF-8"
 
 ENV ABI "arm-linux-gnueabi"
-ENV CONFIGURE_OPTS "--host=arm-linux-gnueabi \
-                    --target=arm-linux-gnueabi"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/arm-linux-gnueabi/pkgconfig"
+ENV CONFIGURE_OPTS "--host=arm-linux-gnueabi"
diff --git a/buildenv-libvirt-debian-sid-cross-armv7l.zip b/buildenv-libvirt-debian-sid-cross-armv7l.zip
index 2929d4a..529676e 100644
--- a/buildenv-libvirt-debian-sid-cross-armv7l.zip
+++ b/buildenv-libvirt-debian-sid-cross-armv7l.zip
@@ -64,6 +64,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     dpkg --add-architecture armhf && \
     apt-get update && \
     apt-get dist-upgrade -y && \
+    apt-get install --no-install-recommends -y dpkg-dev && \
     apt-get install --no-install-recommends -y \
             gcc-arm-linux-gnueabihf \
             libacl1-dev:armhf \
@@ -107,6 +108,4 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
 ENV LANG "en_US.UTF-8"
 
 ENV ABI "arm-linux-gnueabihf"
-ENV CONFIGURE_OPTS "--host=arm-linux-gnueabihf \
-                    --target=arm-linux-gnueabihf"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/arm-linux-gnueabihf/pkgconfig"
+ENV CONFIGURE_OPTS "--host=arm-linux-gnueabihf"
diff --git a/buildenv-libvirt-debian-sid-cross-i686.zip b/buildenv-libvirt-debian-sid-cross-i686.zip
index 67d620d..46abb22 100644
--- a/buildenv-libvirt-debian-sid-cross-i686.zip
+++ b/buildenv-libvirt-debian-sid-cross-i686.zip
@@ -64,6 +64,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     dpkg --add-architecture i386 && \
     apt-get update && \
     apt-get dist-upgrade -y && \
+    apt-get install --no-install-recommends -y dpkg-dev && \
     apt-get install --no-install-recommends -y \
             gcc-i686-linux-gnu \
             libacl1-dev:i386 \
@@ -107,6 +108,4 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
 ENV LANG "en_US.UTF-8"
 
 ENV ABI "i686-linux-gnu"
-ENV CONFIGURE_OPTS "--host=i686-linux-gnu \
-                    --target=i686-linux-gnu"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/i386-linux-gnu/pkgconfig"
+ENV CONFIGURE_OPTS "--host=i686-linux-gnu"
diff --git a/buildenv-libvirt-debian-sid-cross-mips64el.zip b/buildenv-libvirt-debian-sid-cross-mips64el.zip
index 3aa0305..799c6f1 100644
--- a/buildenv-libvirt-debian-sid-cross-mips64el.zip
+++ b/buildenv-libvirt-debian-sid-cross-mips64el.zip
@@ -64,6 +64,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     dpkg --add-architecture mips64el && \
     apt-get update && \
     apt-get dist-upgrade -y && \
+    apt-get install --no-install-recommends -y dpkg-dev && \
     apt-get install --no-install-recommends -y \
             gcc-mips64el-linux-gnuabi64 \
             libacl1-dev:mips64el \
@@ -107,6 +108,4 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
 ENV LANG "en_US.UTF-8"
 
 ENV ABI "mips64el-linux-gnuabi64"
-ENV CONFIGURE_OPTS "--host=mips64el-linux-gnuabi64 \
-                    --target=mips64el-linux-gnuabi64"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/mips64el-linux-gnuabi64/pkgconfig"
+ENV CONFIGURE_OPTS "--host=mips64el-linux-gnuabi64"
diff --git a/buildenv-libvirt-debian-sid-cross-mipsel.zip b/buildenv-libvirt-debian-sid-cross-mipsel.zip
index 815772b..2cfbe46 100644
--- a/buildenv-libvirt-debian-sid-cross-mipsel.zip
+++ b/buildenv-libvirt-debian-sid-cross-mipsel.zip
@@ -64,6 +64,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     dpkg --add-architecture mipsel && \
     apt-get update && \
     apt-get dist-upgrade -y && \
+    apt-get install --no-install-recommends -y dpkg-dev && \
     apt-get install --no-install-recommends -y \
             gcc-mipsel-linux-gnu \
             libacl1-dev:mipsel \
@@ -106,6 +107,4 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
 ENV LANG "en_US.UTF-8"
 
 ENV ABI "mipsel-linux-gnu"
-ENV CONFIGURE_OPTS "--host=mipsel-linux-gnu \
-                    --target=mipsel-linux-gnu"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/mipsel-linux-gnu/pkgconfig"
+ENV CONFIGURE_OPTS "--host=mipsel-linux-gnu"
diff --git a/buildenv-libvirt-debian-sid-cross-ppc64le.zip b/buildenv-libvirt-debian-sid-cross-ppc64le.zip
index 28f0a94..da70b99 100644
--- a/buildenv-libvirt-debian-sid-cross-ppc64le.zip
+++ b/buildenv-libvirt-debian-sid-cross-ppc64le.zip
@@ -64,6 +64,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     dpkg --add-architecture ppc64el && \
     apt-get update && \
     apt-get dist-upgrade -y && \
+    apt-get install --no-install-recommends -y dpkg-dev && \
     apt-get install --no-install-recommends -y \
             gcc-powerpc64le-linux-gnu \
             libacl1-dev:ppc64el \
@@ -107,6 +108,4 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
 ENV LANG "en_US.UTF-8"
 
 ENV ABI "powerpc64le-linux-gnu"
-ENV CONFIGURE_OPTS "--host=powerpc64le-linux-gnu \
-                    --target=powerpc64le-linux-gnu"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/powerpc64le-linux-gnu/pkgconfig"
+ENV CONFIGURE_OPTS "--host=powerpc64le-linux-gnu"
diff --git a/buildenv-libvirt-debian-sid-cross-s390x.zip b/buildenv-libvirt-debian-sid-cross-s390x.zip
index 7ef7862..d5b1174 100644
--- a/buildenv-libvirt-debian-sid-cross-s390x.zip
+++ b/buildenv-libvirt-debian-sid-cross-s390x.zip
@@ -64,6 +64,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     dpkg --add-architecture s390x && \
     apt-get update && \
     apt-get dist-upgrade -y && \
+    apt-get install --no-install-recommends -y dpkg-dev && \
     apt-get install --no-install-recommends -y \
             gcc-s390x-linux-gnu \
             libacl1-dev:s390x \
@@ -107,6 +108,4 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
 ENV LANG "en_US.UTF-8"
 
 ENV ABI "s390x-linux-gnu"
-ENV CONFIGURE_OPTS "--host=s390x-linux-gnu \
-                    --target=s390x-linux-gnu"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/s390x-linux-gnu/pkgconfig"
+ENV CONFIGURE_OPTS "--host=s390x-linux-gnu"
diff --git a/buildenv-libvirt-fedora-30-cross-mingw32.zip b/buildenv-libvirt-fedora-30-cross-mingw32.zip
index b933ad3..df8f7a7 100644
--- a/buildenv-libvirt-fedora-30-cross-mingw32.zip
+++ b/buildenv-libvirt-fedora-30-cross-mingw32.zip
@@ -115,6 +115,4 @@ RUN dnf install -y \
 ENV LANG "en_US.UTF-8"
 
 ENV ABI "i686-w64-mingw32"
-ENV CONFIGURE_OPTS "--host=i686-w64-mingw32 \
-                    --target=i686-w64-mingw32"
-ENV PKG_CONFIG_LIBDIR "/usr/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig:/usr/i686-w64-mingw32/sys-root/mingw/share/pkgconfig"
+ENV CONFIGURE_OPTS "--host=i686-w64-mingw32"
diff --git a/buildenv-libvirt-fedora-30-cross-mingw64.zip b/buildenv-libvirt-fedora-30-cross-mingw64.zip
index 13ebb52..d2b79b8 100644
--- a/buildenv-libvirt-fedora-30-cross-mingw64.zip
+++ b/buildenv-libvirt-fedora-30-cross-mingw64.zip
@@ -115,6 +115,4 @@ RUN dnf install -y \
 ENV LANG "en_US.UTF-8"
 
 ENV ABI "x86_64-w64-mingw32"
-ENV CONFIGURE_OPTS "--host=x86_64-w64-mingw32 \
-                    --target=x86_64-w64-mingw32"
-ENV PKG_CONFIG_LIBDIR "/usr/x86_64-w64-mingw32/sys-root/mingw/lib/pkgconfig:/usr/x86_64-w64-mingw32/sys-root/mingw/share/pkgconfig"
+ENV CONFIGURE_OPTS "--host=x86_64-w64-mingw32"

-- 
2.24.1

    

Andrea Bolognani

tags

participants (1)