This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
Re: src-release broke with the zlib import
- From: "H.J. Lu" <hjl dot tools at gmail dot com>
- To: Hans-Peter Nilsson <hp at bitrange dot com>
- Cc: GDB <gdb-patches at sourceware dot org>, Binutils <binutils at sourceware dot org>
- Date: Sat, 28 Mar 2015 06:51:15 -0700
- Subject: Re: src-release broke with the zlib import
- Authentication-results: sourceware.org; auth=none
- References: <CAMe9rOp+5L0na923z1_jJQJuci=npuCQM6ktx7XG=gSOc1nZ+g at mail dot gmail dot com> <20150314193105 dot GB5954 at adacore dot com> <CAMe9rOpGWwu57cKZW4M8QTYdicnDsDC5-G-t7sX4fQd3YhKP7A at mail dot gmail dot com> <20150316232444 dot GB3435 at adacore dot com> <CAMe9rOqQPEkvdTr8jjcy+yNaXTkTiRvceiRY_wnazRJe=rY8nQ at mail dot gmail dot com> <20150319112336 dot GA4884 at adacore dot com> <CAMe9rOpb3eh_M2Af-GA-YrV9h7-kRhGzV5Q_a4U7sS+=pWXhvw at mail dot gmail dot com> <alpine dot BSF dot 2 dot 02 dot 1503280540170 dot 13659 at arjuna dot pair dot com>
On Sat, Mar 28, 2015 at 2:43 AM, Hans-Peter Nilsson <hp@bitrange.com> wrote:
> On Mon, 23 Mar 2015, H.J. Lu wrote:
>> I will import zlib from GCC on March 26 if there is no objection.
>
> Looks like the import broke the src-release script, at least
> for "binutils" and "sim":
>
> $ ./src-release.sh -b binutils
> [...]
> 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 1190: ./../../config-ml.in: No such file or directory
> make: *** [configure-zlib] Error 1
>
> brgds, H-P
I checked in this patch. Verified with ./src-release.sh -b binutils
and ./src-release.sh -b gdb.
--
H.J.
From 92c695a14f6a5a24b177e89624c13d7dbcbf9e1f Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Sat, 28 Mar 2015 06:48:43 -0700
Subject: [PATCH] A zlib to tarball
* src-release.sh (do_proto_toplev): Configure with --target
--with-target-subdir and --disable-multilib.
(BINUTILS_SUPPORT_DIRS): Add zlib.
(GAS_SUPPORT_DIRS): Likewise.
(GDB_SUPPORT_DIRS): Likewise.
(SIM_SUPPORT_DIRS): Likewise.
---
ChangeLog | 9 +++++++++
src-release.sh | 12 +++++++-----
2 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 9b1895b..ad04e40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2015-03-28 H.J. Lu <hongjiu.lu@intel.com>
+
+ * src-release.sh (do_proto_toplev): Configure with --target
+ --with-target-subdir and --disable-multilib.
+ (BINUTILS_SUPPORT_DIRS): Add zlib.
+ (GAS_SUPPORT_DIRS): Likewise.
+ (GDB_SUPPORT_DIRS): Likewise.
+ (SIM_SUPPORT_DIRS): Likewise.
+
2015-03-17 H.J. Lu <hongjiu.lu@intel.com>
* configure.ac (target_configdirs): Exclude target-zlib if
diff --git a/src-release.sh b/src-release.sh
index dad1649..558b012 100755
--- a/src-release.sh
+++ b/src-release.sh
@@ -83,7 +83,9 @@ do_proto_toplev()
<Makefile.in >tmp
mv -f tmp Makefile.in
#
- ./configure --target=i386-pc-linux-gnu
+ ./configure --target=i386-pc-linux-gnu \
+ --with-target-subdir=. \
+ --disable-multilib
$MAKE configure-host configure-target \
ALL_GCC="" ALL_GCC_C="" ALL_GCC_CXX="" \
CC_FOR_TARGET="$CC" CXX_FOR_TARGET="$CXX"
@@ -267,7 +269,7 @@ gdb_tar_compress()
}
# The FSF "binutils" release includes gprof and ld.
-BINUTILS_SUPPORT_DIRS="bfd gas include libiberty opcodes ld elfcpp gold gprof intl setup.com makefile.vms cpu"
+BINUTILS_SUPPORT_DIRS="bfd gas include libiberty opcodes ld elfcpp gold gprof intl setup.com makefile.vms cpu zlib"
binutils_release()
{
compressors=$1
@@ -276,7 +278,7 @@ binutils_release()
tar_compress $package $tool "$BINUTILS_SUPPORT_DIRS" "$compressors"
}
-GAS_SUPPORT_DIRS="bfd include libiberty opcodes intl setup.com makefile.vms"
+GAS_SUPPORT_DIRS="bfd include libiberty opcodes intl setup.com makefile.vms zlib"
gas_release()
{
compressors=$1
@@ -285,7 +287,7 @@ gas_release()
tar_compress $package $tool "$GAS_SUPPORT_DIRS" "$compressors"
}
-GDB_SUPPORT_DIRS="bfd include libiberty opcodes readline sim intl libdecnumber cpu"
+GDB_SUPPORT_DIRS="bfd include libiberty opcodes readline sim intl libdecnumber cpu zlib"
gdb_release()
{
compressors=$1
@@ -295,7 +297,7 @@ gdb_release()
}
# Corresponding to the CVS "sim" module.
-SIM_SUPPORT_DIRS="bfd opcodes libiberty include intl gdb/version.in makefile.vms"
+SIM_SUPPORT_DIRS="bfd opcodes libiberty include intl gdb/version.in makefile.vms zlib"
sim_release()
{
compressors=$1
--
2.1.0