Re: [patch] update zlib to the 1.2.10 release.

[Matthias Klose <doko@ubuntu.com>]

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:

--- 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


Builds with srcdir != builddir still work.

Matthias