From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 23664 invoked by alias); 23 Nov 2011 12:01:39 -0000 Received: (qmail 23654 invoked by uid 22791); 23 Nov 2011 12:01:36 -0000 X-SWARE-Spam-Status: No, hits=-2.6 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_LOW X-Spam-Check-By: sourceware.org Received: from mail-iy0-f169.google.com (HELO mail-iy0-f169.google.com) (209.85.210.169) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 23 Nov 2011 12:01:23 +0000 Received: by iaek3 with SMTP id k3so2108151iae.0 for ; Wed, 23 Nov 2011 04:01:22 -0800 (PST) Received: by 10.231.50.201 with SMTP id a9mr6404157ibg.1.1322049682481; Wed, 23 Nov 2011 04:01:22 -0800 (PST) Received: from [192.168.1.56] ([58.37.193.48]) by mx.google.com with ESMTPS id l28sm72719117ibc.3.2011.11.23.04.01.14 (version=SSLv3 cipher=OTHER); Wed, 23 Nov 2011 04:01:21 -0800 (PST) Message-ID: <4ECCE05C.90606@linaro.org> Date: Wed, 23 Nov 2011 12:01:00 -0000 From: Zhenqiang Chen User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:8.0) Gecko/20111105 Thunderbird/8.0 MIME-Version: 1.0 To: yann.morin.1998@anciens.enib.fr CC: crossgcc@sourceware.org Subject: [updated zlib PATCH 3 of 3] debug/gdb: use the prebuilt zlib Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-IsSubscribed: yes Mailing-List: contact crossgcc-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: crossgcc-owner@sourceware.org X-SW-Source: 2011-11/txt/msg00151.txt.bz2 # HG changeset patch # User Zhenqiang Chen # Date 1322037592 -28800 # Node ID 6b450e80f73e1d3b7b024820e5999926dd809453 # Parent d681a5a526e81fdda839a04b27fcb6bce50f65a7 debug/gdb: use the prebuilt zlib to build gdb cross to remove the dependence on system zlib. Signed-off-by: Zhenqiang Chen diff --git a/config/debug/gdb.in.cross b/config/debug/gdb.in.cross --- a/config/debug/gdb.in.cross +++ b/config/debug/gdb.in.cross @@ -8,6 +8,7 @@ prompt "Cross-gdb" default y select GDB_GDBSERVER if ! BARE_METAL + select ZLIB_NEEDED help Build and install a cross-gdb for the target, to run on host. @@ -29,6 +30,7 @@ prompt "Enable python scripting" depends on ! GDB_CROSS_STATIC default y + select ZLIB_NEEDED help Say 'y' if you want to use Python scripting inside gdb. Say 'n' if you do not want to. diff --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh --- a/scripts/build/debug/300-gdb.sh +++ b/scripts/build/debug/300-gdb.sh @@ -106,6 +106,8 @@ if [ "${CT_GDB_CROSS}" = "y" ]; then local -a cross_extra_config local gcc_version + local -a gdb_cross_CFLAGS + local -a gdb_cross_LDFLAGS CT_DoStep INFO "Installing cross-gdb" CT_DoLog EXTRA "Configuring cross-gdb" @@ -135,9 +137,17 @@ CT_DoLog DEBUG "Extra config passed: '${cross_extra_config[*]}'" + gdb_cross_CFLAGS=${CT_CFLAGS_FOR_HOST} + if [ "${CT_ZLIB_NEEDED}" = "y" ]; then + gdb_cross_CFLAGS+=" -I${CT_COMPLIBS_DIR}/zlib/include" + gdb_cross_LDFLAGS+=" -L${CT_COMPLIBS_DIR}/zlib/lib" + fi + CT_DoExecLog CFG \ CC="${CC_for_gdb}" \ LD="${LD_for_gdb}" \ + CFLAGS="${gdb_cross_CFLAGS}" \ + LDFLAGS="${gdb_cross_LDFLAGS}" \ "${gdb_cross_configure}" \ --build=${CT_BUILD} \ --host=${CT_HOST} \ -- For unsubscribe information see http://sourceware.org/lists.html#faq