Message ID | a55729f1-7167-0ac9-d3cf-4f0cc5a5b3d3@ubuntu.com |
---|---|
State | New, archived |
Headers |
Received: (qmail 3040 invoked by alias); 23 Jan 2017 09:10:42 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: <gdb-patches.sourceware.org> List-Unsubscribe: <mailto:gdb-patches-unsubscribe-##L=##H@sourceware.org> List-Subscribe: <mailto:gdb-patches-subscribe@sourceware.org> List-Archive: <http://sourceware.org/ml/gdb-patches/> List-Post: <mailto:gdb-patches@sourceware.org> List-Help: <mailto:gdb-patches-help@sourceware.org>, <http://sourceware.org/ml/#faqs> Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 3003 invoked by uid 89); 23 Jan 2017 09:10:40 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.5 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.2 spammy=UD:zlib.h, zlib.h, zlibh, Hx-languages-length:1997 X-Spam-User: qpsmtpd, 2 recipients X-HELO: einhorn.in-berlin.de Received: from einhorn.in-berlin.de (HELO einhorn.in-berlin.de) (192.109.42.8) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 23 Jan 2017 09:10:29 +0000 X-Envelope-From: doko@ubuntu.com Received: from [192.168.178.26] (ip5f5af7ce.dynamic.kabel-deutschland.de [95.90.247.206]) (authenticated bits=0) by einhorn.in-berlin.de (8.14.4/8.14.4/Debian-8+deb8u1) with ESMTP id v0N9AJJR014822 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT); Mon, 23 Jan 2017 10:10:19 +0100 Subject: Re: [patch] update zlib to the 1.2.10 release. To: Joel Brobecker <brobecker@adacore.com> References: <ec939349-8200-2cd3-c7c8-cc2abe70d722@ubuntu.com> <02ad1804-017b-3637-a532-aa6c7b8aa2a9@redhat.com> <ef0a09d9-8d24-0440-92f1-1822f6ec7e06@ubuntu.com> <20170123040915.knf76kwgwxji2ng4@adacore.com> Cc: Jeff Law <law@redhat.com>, gdb-patches@sourceware.org, binutils <binutils@sourceware.org>, Nick Clifton <nickc@redhat.com> From: Matthias Klose <doko@ubuntu.com> Message-ID: <a55729f1-7167-0ac9-d3cf-4f0cc5a5b3d3@ubuntu.com> Date: Mon, 23 Jan 2017 10:10:14 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.5.1 MIME-Version: 1.0 In-Reply-To: <20170123040915.knf76kwgwxji2ng4@adacore.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit |
Commit Message
Matthias Klose
Jan. 23, 2017, 9:10 a.m. UTC
On 23.01.2017 05:09, Joel Brobecker wrote: >> On 12.01.2017 22:17, Jeff Law wrote: >>> On 01/05/2017 07:45 AM, Matthias Klose wrote: >>>> These are the changes updating zlib from 1.2.8 to 1.2.10. It is only used when >>>> building without a system zlib. The new release includes fixes for security >>>> issues CVE-2016-9840, CVE-2016-9841, CVE-2016-9842, CVE-2016-9843. >>>> >>>> Checked with a build with disabled system-zlib. Ok for the trunk? >>> Were there any changes that we needed to carry forward or any changes you needed >>> to make to the upstream sources? >> >> I backed out the changes to the configure* and Makefile* changes (and >> only these), which are completely different to zlib upstream. There >> are no additions/deletions to zlib source files, so these build >> changes still work with the updated zlib. > > Can you tell us what these changes are? Currently nightly source > packaging is broken while configuring zlib. > > Here is what I am seeing: > > $ cd /path/to/gdb/sources > $ ./configure --target=i386-pc-linux-gnu > $ make configure-host configure-target > [...] > checking for strerror... yes > checking for unistd.h... (cached) yes > configure: updating cache ./config.cache > configure: creating ./config.status > config.status: creating Makefile > config.status: executing default-1 commands > ./config.status: line 1191: ./../../config-ml.in: No such file or directory > Makefile:10001: recipe for target 'configure-zlib' failed > make: *** [configure-zlib] Error 1 I didn't change the configure and Makefile files at all. I see that Nick synced the configure.ac from the GCC tree, and that introduced one extra change: Builds with srcdir != builddir still work. Matthias
--- a/zlib/configure.ac +++ b/zlib/configure.ac @@ -4,9 +4,7 @@ AC_PREREQ(2.64) AC_INIT AC_CONFIG_SRCDIR([zlib.h]) -if test -n "${with_target_subdir}"; then - AM_ENABLE_MULTILIB(, ..) -fi +AM_ENABLE_MULTILIB(, ..) AC_CANONICAL_SYSTEM