From nobody Wed May 14 16:29:05 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1523979806297300.39546856404866; Tue, 17 Apr 2018 08:43:26 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7081D5F7B9; Tue, 17 Apr 2018 15:43:24 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1B71C5C886; Tue, 17 Apr 2018 15:43:23 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 2BA5E1805971; Tue, 17 Apr 2018 15:43:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w3HFhI5S023598 for ; Tue, 17 Apr 2018 11:43:18 -0400 Received: by smtp.corp.redhat.com (Postfix) id AF76E2166BB2; Tue, 17 Apr 2018 15:43:18 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 531622166BAE for ; Tue, 17 Apr 2018 15:43:18 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Tue, 17 Apr 2018 17:43:11 +0200 Message-Id: <20180417154312.20837-3-abologna@redhat.com> In-Reply-To: <20180417154312.20837-1-abologna@redhat.com> References: <20180417154312.20837-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Subject: [libvirt] [jenkins-ci PATCH 2/3] jobs: Tweak autotools-mingw-job template X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Tue, 17 Apr 2018 15:43:25 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Make it more similar to the autotools-build-job by dropping the custom $PREFIX variable and redefining the standard $VIRT_PREFIX instead, which also makes $PKG_CONFIG_PATH shorter, and moving all environment variables together. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- jobs/autotools.yaml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/jobs/autotools.yaml b/jobs/autotools.yaml index 5c78e6a..ac7099f 100644 --- a/jobs/autotools.yaml +++ b/jobs/autotools.yaml @@ -228,13 +228,14 @@ # to unset it here. export CC=3D =20 + export VIRT_PREFIX=3D"$VIRT_PREFIX/i686-w64-mingw32/sys-root/min= gw" + export PKG_CONFIG_PATH=3D"$VIRT_PREFIX/lib/pkgconfig" + export PKG_CONFIG_LIBDIR=3D"/usr/i686-w64-mingw32/sys-root/mingw= /lib/pkgconfig:/usr/i686-w64-mingw32/sys-root/mingw/share/pkgconfig" + mkdir -p build32 cd build32 =20 - export PKG_CONFIG_LIBDIR=3D"/usr/i686-w64-mingw32/sys-root/mingw= /lib/pkgconfig:/usr/i686-w64-mingw32/sys-root/mingw/share/pkgconfig" - export PKG_CONFIG_PATH=3D"$VIRT_PREFIX/i686-w64-mingw32/sys-root= /mingw/lib/pkgconfig" \ - export PREFIX=3D$VIRT_PREFIX/i686-w64-mingw32/sys-root/mingw - ../autogen.sh --host=3Di686-w64-mingw32 --prefix=3D$PREFIX + ../autogen.sh --prefix=3D$VIRT_PREFIX --host=3Di686-w64-mingw32 $MAKE -j{smp} $MAKE -j{smp} install - shell: | @@ -243,13 +244,14 @@ # See above export CC=3D =20 + export VIRT_PREFIX=3D"$VIRT_PREFIX/x86_64-w64-mingw32/sys-root/m= ingw" + export PKG_CONFIG_PATH=3D"$VIRT_PREFIX/lib/pkgconfig" + export PKG_CONFIG_LIBDIR=3D"/usr/x86_64-w64-mingw32/sys-root/min= gw/lib/pkgconfig:/usr/x86_64-w64-mingw32/sys-root/mingw/share/pkgconfig" + mkdir -p build64 cd build64 =20 - export PKG_CONFIG_LIBDIR=3D"/usr/x86_64-w64-mingw32/sys-root/min= gw/lib/pkgconfig:/usr/x86_64-w64-mingw32/sys-root/mingw/share/pkgconfig" - export PKG_CONFIG_PATH=3D"$VIRT_PREFIX/x86_64-w64-mingw32/sys-ro= ot/mingw/lib/pkgconfig" \ - export PREFIX=3D$VIRT_PREFIX/x86_64-w64-mingw32/sys-root/mingw - ../autogen.sh --host=3Dx86_64-w64-mingw32 --prefix=3D$PREFIX + ../autogen.sh --prefix=3D$VIRT_PREFIX --host=3Dx86_64-w64-mingw32 $MAKE -j{smp} $MAKE -j{smp} install publishers: --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list