From patchwork Tue Jan 24 16:43:42 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Klose X-Patchwork-Id: 137594 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id 1F770B6EE8 for ; Wed, 25 Jan 2012 03:44:55 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1328028296; h=Comment: DomainKey-Signature:Received:Received:Received:Received: Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject: References:In-Reply-To:Content-Type:Mailing-List:Precedence: List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=m2cq1FtGHYYTF/D11d/IVRlIGpg=; b=vzRu9K58TSChoEv dwrYiRyx2cltv6TPfNZiu6pFBlmB5XmN23/1oRZjAv6Tv2OYW8yBb0yBSKKg7uQT 9bPY3DZfzBwByB4+N9b57IXF4vFfu2wbJe+xPNP7UpB9c36bcsVb0YzSYAgQLAd4 jqBfOkYs+/+T/XW/ETmGEVNTJG+w= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:X-Envelope-From:Received:Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject:References:In-Reply-To:Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=bECw/mXdfLZHQEJ8859VyQA9fMpg4wpDmKm2YwdNPCZP5AqiePMFV8wi71Oik9 czaJMU9azpvxx+cBGafEvZccKS65IfVPKn5DLYruHJ6dNQ4RITXrZ8T9r/9e/fun 1mUc8G4Y05z2UMeH75iK61tsiuH2r4SIjU8Plol2YMU8I=; Received: (qmail 1262 invoked by alias); 24 Jan 2012 16:44:11 -0000 Received: (qmail 1230 invoked by uid 22791); 24 Jan 2012 16:44:06 -0000 X-SWARE-Spam-Status: No, hits=-2.6 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, TW_CX, TW_DC X-Spam-Check-By: sourceware.org Received: from einhorn.in-berlin.de (HELO einhorn.in-berlin.de) (192.109.42.8) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 24 Jan 2012 16:43:53 +0000 X-Envelope-From: doko@ubuntu.com Received: from [192.168.42.210] (dslb-088-073-113-103.pools.arcor-ip.net [88.73.113.103]) (authenticated bits=0) by einhorn.in-berlin.de (8.13.6/8.13.6/Debian-1) with ESMTP id q0OGhpvU030247; Tue, 24 Jan 2012 17:43:51 +0100 Message-ID: <4F1EDFBE.1000107@ubuntu.com> Date: Tue, 24 Jan 2012 17:43:42 +0100 From: Matthias Klose User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:10.0) Gecko/20120119 Thunderbird/10.0 MIME-Version: 1.0 To: Benjamin Kosnik CC: gcc-patches@gcc.gnu.org, libstdc++@gcc.gnu.org Subject: Re: [v3] libstdc++/49829 References: <20120123152716.67be01bb@shotwell> In-Reply-To: <20120123152716.67be01bb@shotwell> Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org On 24.01.2012 00:27, Benjamin Kosnik wrote: > > This modularizes the libstdc++ sources such that the resulting library > binaries are now composed of three convenience libraries. In short: this breaks builds configured with --enable-libstdcxx-debug. Tried the following (not yet working) fix. Matthias Index: src/Makefile.am =================================================================== --- src/Makefile.am (revision 183477) +++ src/Makefile.am (working copy) @@ -194,8 +194,9 @@ # Take care to fix all possibly-relative paths. stamp-debug: if test ! -d ${debugdir}; then \ - mkdir -p ${debugdir}; \ + for d in $(SUBDIRS); do mkdir -p ${debugdir}/$$d; done; \ (cd ${debugdir}; \ + for d in . $(SUBDIRS); do \ sed -e 's/top_builddir = \.\./top_builddir = ..\/../' \ -e 's/top_build_prefix = \.\./top_build_prefix = ..\/../' \ -e 's/srcdir = \.\./srcdir = ..\/../' \ @@ -204,7 +205,8 @@ -e 's/MKDIR_P = \.\./MKDIR_P = ..\/../' \ -e 's/all-local: build_debug/all-local:/' \ -e 's/install-data-local: install_debug/install-data-local:/' \ - < ../Makefile > Makefile) ; \ + < ../$$d/Makefile > $$d/Makefile; \ + done); \ fi; \ echo `date` > stamp-debug;