From nobody Fri Apr 19 16:10:40 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1523833635923205.5267940878732; Sun, 15 Apr 2018 16:07:15 -0700 (PDT) Received: from localhost ([::1]:50325 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f7qjm-0007vN-Qm for importer@patchew.org; Sun, 15 Apr 2018 19:07:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58213) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f7qiL-0007BN-NY for qemu-devel@nongnu.org; Sun, 15 Apr 2018 19:05:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f7qiK-00034Z-Pa for qemu-devel@nongnu.org; Sun, 15 Apr 2018 19:05:41 -0400 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:34647) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f7qiK-00034J-KQ for qemu-devel@nongnu.org; Sun, 15 Apr 2018 19:05:40 -0400 Received: by mail-qt0-x243.google.com with SMTP id a25so7222703qtm.1 for ; Sun, 15 Apr 2018 16:05:40 -0700 (PDT) Received: from x1.local ([138.117.48.212]) by smtp.gmail.com with ESMTPSA id 1sm9303173qtr.85.2018.04.15.16.05.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 15 Apr 2018 16:05:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6ixix/PYllXoG6um6eJWBmeKpFCRUBproFDuyCG3tR8=; b=KLr4UjfxB3LL2WaeJige/kf8UF1nrWGkd1Jse4Y/NGXsfh0DJvktO0zFxNPj1HLilh UsgE3WRqAO/EYkhsDy0AIOH/Wnx/V9AjYy3sHK5rGV7TfiDQ1+iDCDjWmzg3dgHeWb23 QMTLYcNls6/HY2H6ugg+XKAaVVAI1W9YEvcVLX7/TDWizq1LCjjW3WhI/q856l/3IlDy ENUtQkWiQuYy6WSWmzh1Z5y7gfVj3SDUiJBfUNlAhTi6FXhU10RLkFJhK/Us2isjAQ5c ooCX2lPjkmkusZ5ZDC1E207AOxtDyrH4mz9fyCJ9AOzY+ebOQHuaKtqVOgbhmF6iuW8Z sDqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=6ixix/PYllXoG6um6eJWBmeKpFCRUBproFDuyCG3tR8=; b=nNxGb9IQb7hAglP9SS3nR07QrW2/1NUWvByF0/lD03IpvWZhpSTM/D1x0OWeFTzADW OuE9hJu7PI3gybUzHGfldQySvQb1wfa+R7IiTal1aYQ4BoHFoRyp6vvgWadZhIwQzP7g AAp6pjOPCJko0YBf8OMlXrDiTj2vJilBQGa7uqnhLQKM3UWvUkXHmVIPZNJ3qwZBiuhb PuF8yd//vTfS73FzHSvrgMYwPlDr5fViIesVqjJUqt74KhbMOlgc+UzUCL7MPgFo/Gry Z+7bNgoL1we16zOtCOBe5/AhFFi8LOcuQ4S/P/xOPutd7RQI3nNCcZTpvy0dCGExQ4HO +EpQ== X-Gm-Message-State: ALQs6tDGh63Ab2OyPmPvczdUO3WyLxieB+ZkzQK9H7W4p9OQInLzanyF pBGKhbJo3ietDGyn0cmGJ44= X-Google-Smtp-Source: AIpwx4+Su4afAhYnYI82kVrrjDurSRaFwVJ+O6/pAHPjxP5LHP4GGTH+pTZvjY1C+J/cwtB1+n0Ulw== X-Received: by 10.237.53.161 with SMTP id c30mr14063059qte.203.1523833540079; Sun, 15 Apr 2018 16:05:40 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Paolo Bonzini , Peter Maydell , Stefan Hajnoczi , Eric Blake , Thomas Huth , Michael Tokarev Date: Sun, 15 Apr 2018 20:05:19 -0300 Message-Id: <20180415230522.24404-2-f4bug@amsat.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180415230522.24404-1-f4bug@amsat.org> References: <20180415230522.24404-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::243 Subject: [Qemu-devel] [PATCH for-2.12? 1/4] configure: Really use local libfdt if the system one is too old X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , YunQiang Su , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 QEMU requires libfdt version >=3D 1.4.2. If the host has an older libfdt installed, the configure script will use a (git cloned) local version. Example with Debian 8: $ dpkg-query --showformat=3D'${Version}\n' --show libfdt-dev 1.4.0+dfsg-1 $ ./configure [...] fdt support yes # from git submodule 'dtc' If this case occurs, the linker will have 2 different libfdt available in the library search path. The default behavior is to search the system path first, then the local path. Even if the configure script noticed the libfdt is too old and clone a more recent locally, when linking the system library is selected first, and the link process eventually fails: LINK mips64el-softmmu/qemu-system-mips64el ../hw/core/loader-fit.o: In function `load_fit': /root/src/github.com/philmd/qemu/hw/core/loader-fit.c:278: undefined re= ference to `fdt_first_subnode' /root/src/github.com/philmd/qemu/hw/core/loader-fit.c:286: undefined re= ference to `fdt_next_subnode' /root/src/github.com/philmd/qemu/hw/core/loader-fit.c:277: undefined re= ference to `fdt_first_subnode' collect2: error: ld returned 1 exit status Makefile:201: recipe for target 'qemu-system-mips64el' failed make[1]: *** [qemu-system-mips64el] Error 1 QEMU already uses a kludge to enforce local CFLAGS before system ones for libpixman and libfdt, add a similar kludge for the LDFLAGS to enforce using the local libfdt. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth --- configure | 6 +++++- rules.mak | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 0a19b033bc..162e804b49 100755 --- a/configure +++ b/configure @@ -3773,7 +3773,8 @@ EOF symlink "$source_path/dtc/scripts" "dtc/scripts" fi fdt_cflags=3D"-I\$(SRC_PATH)/dtc/libfdt" - fdt_libs=3D"-L\$(BUILD_DIR)/dtc/libfdt $fdt_libs" + fdt_ldflags=3D"-L\$(BUILD_DIR)/dtc/libfdt" + fdt_libs=3D"$fdt_libs" elif test "$fdt" =3D "yes" ; then # Not a git build & no libfdt found, prompt for system install error_exit "DTC (libfdt) version >=3D 1.4.2 not present." \ @@ -5715,6 +5716,7 @@ echo_version() { =20 # prepend pixman and ftd flags after all config tests are done QEMU_CFLAGS=3D"$pixman_cflags $fdt_cflags $QEMU_CFLAGS" +QEMU_LDFLAGS=3D"$fdt_ldflags $QEMU_LDFLAGS" libs_softmmu=3D"$pixman_libs $libs_softmmu" =20 echo "Install prefix $prefix" @@ -5745,6 +5747,7 @@ echo "ARFLAGS $ARFLAGS" echo "CFLAGS $CFLAGS" echo "QEMU_CFLAGS $QEMU_CFLAGS" echo "LDFLAGS $LDFLAGS" +echo "QEMU_LDFLAGS $QEMU_LDFLAGS" echo "make $make" echo "install $install" echo "python $python" @@ -6679,6 +6682,7 @@ else fi echo "LDFLAGS=3D$LDFLAGS" >> $config_host_mak echo "LDFLAGS_NOPIE=3D$LDFLAGS_NOPIE" >> $config_host_mak +echo "QEMU_LDFLAGS=3D$QEMU_LDFLAGS" >> $config_host_mak echo "LD_REL_FLAGS=3D$LD_REL_FLAGS" >> $config_host_mak echo "LD_I386_EMULATION=3D$ld_i386_emulation" >> $config_host_mak echo "LIBS+=3D$LIBS" >> $config_host_mak diff --git a/rules.mak b/rules.mak index 93a07027b0..04c7f74d07 100644 --- a/rules.mak +++ b/rules.mak @@ -73,7 +73,7 @@ expand-objs =3D $(strip $(sort $(filter %.o,$1)) \ # must link with the C++ compiler, not the plain C compiler. LINKPROG =3D $(or $(CXX),$(CC)) =20 -LINK =3D $(call quiet-command, $(LINKPROG) $(QEMU_CFLAGS) $(CFLAGS) $(LDFL= AGS) -o $@ \ +LINK =3D $(call quiet-command, $(LINKPROG) $(QEMU_LDFLAGS) $(QEMU_CFLAGS) = $(CFLAGS) $(LDFLAGS) -o $@ \ $(call process-archive-undefs, $1) \ $(version-obj-y) $(call extract-libs,$1) $(LIBS),"LINK","$(TARGET_D= IR)$@") =20 --=20 2.17.0 From nobody Fri Apr 19 16:10:40 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1523833736653255.25154388217516; Sun, 15 Apr 2018 16:08:56 -0700 (PDT) Received: from localhost ([::1]:50421 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f7qlO-0000ee-MY for importer@patchew.org; Sun, 15 Apr 2018 19:08:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58257) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f7qiP-0007E5-Q7 for qemu-devel@nongnu.org; Sun, 15 Apr 2018 19:05:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f7qiO-00037G-Rn for qemu-devel@nongnu.org; Sun, 15 Apr 2018 19:05:45 -0400 Received: from mail-qk0-x241.google.com ([2607:f8b0:400d:c09::241]:40807) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f7qiO-00036Z-NZ for qemu-devel@nongnu.org; Sun, 15 Apr 2018 19:05:44 -0400 Received: by mail-qk0-x241.google.com with SMTP id o64so14721007qkl.7 for ; Sun, 15 Apr 2018 16:05:44 -0700 (PDT) Received: from x1.local ([138.117.48.212]) by smtp.gmail.com with ESMTPSA id 1sm9303173qtr.85.2018.04.15.16.05.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 15 Apr 2018 16:05:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hNwq7kRKdX4VuUr8o5NJmmyTXcaGupyc/lw7bvCINhM=; b=jOBAknfEXp3R5Wo7q9ebNTqVqnJcVN6tJM6Tv5TXJc8/t1XWVkj4M1zH4e87ETe+Yv Msp+F2XCETSDSqhfNM6Wu9nOIzg0rPZ8tp5cpCqEPCtBu+rVb79MM9nATneMy/IodpOq ik97kAhaG3fWtovvdpCh6/uhGPif+RA4fA64Oqwtxb/VTjUjpS3275nb8skqTXOXuctJ i5roLkGaqWajv9gdYSyiCKxzuOX4DIfysohcJr7JrzI5dr3jcCWRe0DwIG7G8H81Lbzu LZbbgU+KincFf9I0G+kyflJoc8DCPV2+jTo6dz6yJnG+PMzx2kFJ9gyOsOsJBmxT5IQX hFrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=hNwq7kRKdX4VuUr8o5NJmmyTXcaGupyc/lw7bvCINhM=; b=OHJ1Q73JVKlaByt2nVTEmIcmf4vXnDGzcXZRfpXTwfJiliYVsk1ppVVJYrsvtIkDqs sdMIA0o5HGFTbBgAmGobiOY4dje2OKR5QGimG9c0Rgg6t/Y9/ED9L61jkGBF7Q//FUMq PPT/8sYh2XlVF4azo9Ri/KWBDB2EmdnrFXwyLm/x5g1UP1lvOCtrd1sEWJqI+ysjPxps 7vpx4w8KNIpni2OrunB5PzvDIFYzILHVpw6YjbqmnE+RAdsTMFvbeVAemkMe9CbhUhu8 Ko4Bv2Hz2BYvxeU9xbamTDvHPQkM0RSiOU9Zkn9Ho9ND86T+R0UQl44OtDQmPAoPI1s8 SqAw== X-Gm-Message-State: ALQs6tBOoeITGOlV5Y5NWRV9WSW/60fFatdtTmTx8f5jGrRu3WfdthEx CT1zFpmp6AQyJPTRhQuKLuw= X-Google-Smtp-Source: AIpwx4/RqXfoPznM52ihQ5N5sES5dgiE6n9s+gTzBCH6b620H2bdauSWpd2xOheYeXaIH4NCvoBm2w== X-Received: by 10.55.126.195 with SMTP id z186mr14689162qkc.4.1523833544205; Sun, 15 Apr 2018 16:05:44 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Paolo Bonzini , Stefan Hajnoczi , Eric Blake , Thomas Huth , Michael Tokarev Date: Sun, 15 Apr 2018 20:05:20 -0300 Message-Id: <20180415230522.24404-3-f4bug@amsat.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180415230522.24404-1-f4bug@amsat.org> References: <20180415230522.24404-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::241 Subject: [Qemu-devel] [PATCH 2/4] configure: Display if libfdt is from system or git X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , YunQiang Su , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 The configure script outputs "yes" regardless which libfdt is used: ./configure [...] fdt support yes Sometimes you can have both system and local git version available, change the configure script to display which library got selected: debian8$ dpkg-query --showformat=3D'${Version}\n' --show libfdt-dev 1.4.0+dfsg-1 debian8$ ./configure [...] fdt support git Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- configure | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/configure b/configure index 162e804b49..056b391f22 100755 --- a/configure +++ b/configure @@ -3758,15 +3758,14 @@ int main(void) { fdt_first_subnode(0, 0); return 0;= } EOF if compile_prog "" "$fdt_libs" ; then # system DTC is good - use it - fdt=3Dyes + fdt=3Dsystem else # have GIT checkout, so activate dtc submodule if test -e "${source_path}/.git" ; then git_submodules=3D"${git_submodules} dtc" fi if test -d "${source_path}/dtc/libfdt" || test -e "${source_path}/.g= it" ; then - fdt=3Dyes - dtc_internal=3D"yes" + fdt=3Dgit mkdir -p dtc if [ "$pwd_is_source_path" !=3D "y" ] ; then symlink "$source_path/dtc/Makefile" "dtc/Makefile" @@ -6307,7 +6306,7 @@ fi if test "$preadv" =3D "yes" ; then echo "CONFIG_PREADV=3Dy" >> $config_host_mak fi -if test "$fdt" =3D "yes" ; then +if test "$fdt" !=3D "no" ; then echo "CONFIG_FDT=3Dy" >> $config_host_mak fi if test "$membarrier" =3D "yes" ; then @@ -7109,7 +7108,7 @@ echo "QEMU_CFLAGS+=3D$cflags" >> $config_target_mak =20 done # for target in $targets =20 -if [ "$dtc_internal" =3D "yes" ]; then +if [ "$fdt" =3D "git" ]; then echo "config-host.h: subdir-dtc" >> $config_host_mak fi if [ "$capstone" =3D "git" -o "$capstone" =3D "internal" ]; then --=20 2.17.0 From nobody Fri Apr 19 16:10:40 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1523833818807449.5846889117862; Sun, 15 Apr 2018 16:10:18 -0700 (PDT) Received: from localhost ([::1]:50474 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f7qmn-0001aE-Ux for importer@patchew.org; Sun, 15 Apr 2018 19:10:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58287) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f7qiT-0007Gr-0d for qemu-devel@nongnu.org; Sun, 15 Apr 2018 19:05:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f7qiR-00039C-Es for qemu-devel@nongnu.org; Sun, 15 Apr 2018 19:05:49 -0400 Received: from mail-qk0-x241.google.com ([2607:f8b0:400d:c09::241]:41171) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f7qiR-00038v-9R for qemu-devel@nongnu.org; Sun, 15 Apr 2018 19:05:47 -0400 Received: by mail-qk0-x241.google.com with SMTP id s78so14742883qkl.8 for ; Sun, 15 Apr 2018 16:05:47 -0700 (PDT) Received: from x1.local ([138.117.48.212]) by smtp.gmail.com with ESMTPSA id 1sm9303173qtr.85.2018.04.15.16.05.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 15 Apr 2018 16:05:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9KjvHWEsROsr07B+FM1NK4emX+x7VVS9lfeiGCtiLjE=; b=S5dJG1rM6HWRoQuASp0QM9mLkCESkSji8fwPkKHozfyKdzYdEXuVCjrQgC6h8nacMJ Nbusv7w/i3VfK91kvMntXeEgZWoCkH+NEbVs7VoW4qOLv5lqLYbuelKms4/2gBPVc0gn CIYNNTPIRTjW+cHc9yNfUANlOAclRVsnamRJkYSB8R/t2BdwNtMZ8y84XBCKgitM6NoE 5MW5hll0DtRupoipmAB9gg0cZbEYXQwTm5rqDl3tWz5Mii5ZFzul0E91W2wfdCFOe+L6 UvVjc7BQrUlXKr+fm5PVfYIShyZoE3FlR6qQqBwk7CTKUeurCozBNPS4OwM2U9YwLVGU sEww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=9KjvHWEsROsr07B+FM1NK4emX+x7VVS9lfeiGCtiLjE=; b=XIOPnFhK5zLK7/v+m6AZn2TFcmU7kN4jwgC/EGxJxyhpwSnNJOtxEB0Hu/BaaajlAw 0BgKtSuHrgel7XbI3hQSticz7TaiPdatDQv8qIDCMXitdilq/5hXW+bXdCGsyEVlkgf3 YnSP8T2TPpWXCni5jI5QuVJkGOJsDD5bUCL3niWdwlmWm/yituhd6O/pOy7BEyvqHw5D ToUoSHnth5HXVMrG9OADnp7X6pjpboqZUxd7yorxbRbOH9+5mJ3Lctyab8nk5A0WDigR 7CbeJAXAi37+28enWVV4xtg7lrJJ48lxxyxP6dmy6bGCLrRibAGuBGiT6n8MDQ1BGRfY QMsg== X-Gm-Message-State: ALQs6tCYeTK/+7t8Mtj0gYQjrUu2EY8gFmwOU4P5s2FsNbY69vHwHmMS nhEqLYXACFb5NROcvNagg8I= X-Google-Smtp-Source: AIpwx49KjEhwwIvKpiC1sEK5aNKMGaiEVa13GhA2urWqIJBRu0S2IEDz7dIU5n9+EGn9kSKw+syIzQ== X-Received: by 10.55.105.70 with SMTP id e67mr14076519qkc.265.1523833546827; Sun, 15 Apr 2018 16:05:46 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Michael Tokarev Date: Sun, 15 Apr 2018 20:05:21 -0300 Message-Id: <20180415230522.24404-4-f4bug@amsat.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180415230522.24404-1-f4bug@amsat.org> References: <20180415230522.24404-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::241 Subject: [Qemu-devel] [PATCH 3/4] shippable: Remove Debian 8 libfdt kludge X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: YunQiang Su , Fam Zheng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 This kludge was added in a825ca06137, but a cleaner and more generic fix is now available (see ##COMMIT_CONFIGURE_LIBFDT_LDFLAGS_SHA##). Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- If a maintainer take the whole series, I hope he'll be kind enough to update ##COMMIT_CONFIGURE_LIBFDT_LDFLAGS_SHA## with the sha of the patch #1 :) Tha= nks! .shippable.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.shippable.yml b/.shippable.yml index 60f2ce9218..f74a3de3ff 100644 --- a/.shippable.yml +++ b/.shippable.yml @@ -35,13 +35,5 @@ build: options: "-e HOME=3D/root" ci: - unset CC - # some targets require newer up to date packages, for example TARGET_L= IST matching - # aarch64*-softmmu|arm*-softmmu|ppc*-softmmu|microblaze*-softmmu|mips6= 4el-softmmu) - # see the configure script: - # error_exit "DTC (libfdt) version >=3D 1.4.2 not present. Your opt= ions:" - # " (1) Preferred: Install the DTC (libfdt) devel package" - # " (2) Fetch the DTC submodule, using:" - # " git submodule update --init dtc" - - dpkg --compare-versions `dpkg-query --showformat=3D'${Version}' --sh= ow libfdt-dev` ge 1.4.2 || git submodule update --init dtc - ./configure ${QEMU_CONFIGURE_OPTS} --target-list=3D${TARGET_LIST} - make -j$(($(getconf _NPROCESSORS_ONLN) + 1)) --=20 2.17.0 From nobody Fri Apr 19 16:10:40 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1523833905570326.5793758750556; Sun, 15 Apr 2018 16:11:45 -0700 (PDT) Received: from localhost ([::1]:50524 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f7qo9-0002Pq-4B for importer@patchew.org; Sun, 15 Apr 2018 19:11:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58310) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f7qiW-0007K4-DH for qemu-devel@nongnu.org; Sun, 15 Apr 2018 19:05:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f7qiV-0003AZ-Im for qemu-devel@nongnu.org; Sun, 15 Apr 2018 19:05:52 -0400 Received: from mail-qk0-x241.google.com ([2607:f8b0:400d:c09::241]:43245) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f7qiV-0003AJ-Dk for qemu-devel@nongnu.org; Sun, 15 Apr 2018 19:05:51 -0400 Received: by mail-qk0-x241.google.com with SMTP id v2so14725191qkh.10 for ; Sun, 15 Apr 2018 16:05:51 -0700 (PDT) Received: from x1.local ([138.117.48.212]) by smtp.gmail.com with ESMTPSA id 1sm9303173qtr.85.2018.04.15.16.05.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 15 Apr 2018 16:05:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ukb6/xq26O/h+yHk2PREWH9HnBsEFBaZFPy+8tsW1Sc=; b=neKT20/60Fn1PnC36dVJP2CBIEuTgSQ+8U7P4etU8j6wvlGO6ZDAmIZq+aLd20ZeLo ol3gTWo/kWE2stY8ZsAtApnHN2KM9cz8nZQ0VcV1hBbicBB+l9hYACeuSu27IbcvTWNr k5C0AY0KaskCmh8Rg4AunixDvYbn0DGRx/MwrWR4NvtxQePKyJHyYtCxdua8m2XBn23S X0lta8pPhnU7BcsyHyBOugK914qTnK9hbKZyWbtD3Gr2MlOdolMN9MiW8bz8pgkXFV8A phsRm4Y5t+DlWCXp6i/RvPYUKTxEcYfxQHFz8mqv2wyY6csIAb+KGOgVYt9KxI6xJCcp FKtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=ukb6/xq26O/h+yHk2PREWH9HnBsEFBaZFPy+8tsW1Sc=; b=RZ0m7wCjtRqAS1Qb6rYmyvF4U0x0WTuF8EFzBMeZK40A9lh9kuPTE8/iNCAClGhw4C syoZfh/t+AcASyEmt9STe+8EzvycwYyjiE9UUR+s4hkx9sZTr6kH6oapU5M2MCVHPaRN n+nW3Jwx7Tf8vzQXYy9oQAyStJzNs5kuI1izamYdzwwZttMgmAs3ePitcA7rv+eX4c5W 6KWvZCA1LMh0uXO4RR1M20kgWijeoqvpdPe+2MjzkBFnmNkvR9pjlJaGs1Wl7Sbu4w1t oIwp4MuWEq/L/A6tAT++PAMLeQZAGGlks04KvspM/P7aOPI63VjY129TMH+6VvrKFnar d31Q== X-Gm-Message-State: ALQs6tCth4VCgi8z0cUZdn+P3R25d9TM5emcAZpm8yDI8LkMzGSum8ot dTFsUoNXWcGfWtdKqsZok8k= X-Google-Smtp-Source: AIpwx4/MoTNI8Q7aaO/ziBC/2QNL7y0r/SroBrJ8CMeZOwQJWo5Bi3Zj0X5MeflVKIZasYTLKl2G9w== X-Received: by 10.233.232.215 with SMTP id a206mr14821606qkg.238.1523833550911; Sun, 15 Apr 2018 16:05:50 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Paolo Bonzini , Stefan Hajnoczi , Eric Blake , Thomas Huth , Michael Tokarev Date: Sun, 15 Apr 2018 20:05:22 -0300 Message-Id: <20180415230522.24404-5-f4bug@amsat.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180415230522.24404-1-f4bug@amsat.org> References: <20180415230522.24404-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::241 Subject: [Qemu-devel] [PATCH 4/4] build: Silence dtc directory creation X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jan Kiszka , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 From: Jan Kiszka Align with other mkdir calls. Signed-off-by: Jan Kiszka Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <0dd4c8f5-d60e-e564-652f-cd0101f6ee68@web.de> --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 727ef118f3..fc6f21001f 100644 --- a/Makefile +++ b/Makefile @@ -485,7 +485,7 @@ subdir-dtc: .git-submodule-status dtc/libfdt dtc/tests $(call quiet-command,$(MAKE) $(DTC_MAKE_ARGS) CPPFLAGS=3D"$(DTC_CPPFLAGS)= " CFLAGS=3D"$(DTC_CFLAGS)" LDFLAGS=3D"$(LDFLAGS)" ARFLAGS=3D"$(ARFLAGS)" CC= =3D"$(CC)" AR=3D"$(AR)" LD=3D"$(LD)" $(SUBDIR_MAKEFLAGS) libfdt/libfdt.a,) =20 dtc/%: .git-submodule-status - mkdir -p $@ + @mkdir -p $@ =20 # Overriding CFLAGS causes us to lose defines added in the sub-makefile. # Not overriding CFLAGS leads to mis-matches between compilation modes. --=20 2.17.0