From patchwork Mon Feb 7 16:34:12 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Baldwin X-Patchwork-Id: 82117 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 16035B70DE for ; Tue, 8 Feb 2011 03:34:26 +1100 (EST) Received: (qmail 26937 invoked by alias); 7 Feb 2011 16:34:22 -0000 Received: (qmail 26835 invoked by uid 22791); 7 Feb 2011 16:34:21 -0000 X-SWARE-Spam-Status: No, hits=-2.1 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_LOW, SPF_HELO_PASS, T_RP_MATCHES_RCVD, URIBL_RED X-Spam-Check-By: sourceware.org Received: from smtp-out.google.com (HELO smtp-out.google.com) (74.125.121.67) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 07 Feb 2011 16:34:16 +0000 Received: from hpaq12.eem.corp.google.com (hpaq12.eem.corp.google.com [172.25.149.12]) by smtp-out.google.com with ESMTP id p17GYDxZ030812; Mon, 7 Feb 2011 08:34:13 -0800 Received: from hpgntab-ubiq73.eem.corp.google.com (hpgntab-ubiq73.eem.corp.google.com [172.25.130.115]) by hpaq12.eem.corp.google.com with ESMTP id p17GYD0s006122; Mon, 7 Feb 2011 08:34:13 -0800 Received: by hpgntab-ubiq73.eem.corp.google.com (Postfix, from userid 9603) id DCDD71C6839; Mon, 7 Feb 2011 17:34:12 +0100 (CET) To: libstdc++@gcc.gnu.org Subject: [libstdc++, google] Make bits/stamp-bits generated by libstc++-v3/include a regular file Cc: gcc-patches@gcc.gnu.org Message-Id: <20110207163412.DCDD71C6839@hpgntab-ubiq73.eem.corp.google.com> Date: Mon, 7 Feb 2011 17:34:12 +0100 (CET) From: simonb@google.com (Simon Baldwin) X-System-Of-Record: true X-IsSubscribed: yes 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 Make bits/stamp-bits generated by libstc++-v3/include a regular file. Building stamp-bits-sup in libstdc++-v3/include creates a bits/stamp-bits file. Because it's generated by 'ln -s stamp-bits .', the file is a symbolic link that points back to itself. This prevents cpio -L from copying the built tree ("Too many levels of symbolic links"). This change removes the self-referential bits/stamp-bits and replaces it with a regular timestamp file, allowing cpio -L to handle it cleanly. Primarily needed for google/integration. OK? Secondarily, equally applicable to trunk. OK there also? libstdc++-v3/ChangeLog: 2011-02-07 Simon Baldwin * include/Makefile.am: Fix links built for stamp-sup-bits. * include/Makefile.in: Rebuild. Index: libstdc++-v3/include/Makefile.am =================================================================== --- libstdc++-v3/include/Makefile.am (revision 169786) +++ libstdc++-v3/include/Makefile.am (working copy) @@ -928,6 +928,7 @@ stamp-bits: ${bits_headers} stamp-bits-sup: stamp-bits ${bits_sup_headers} @-cd ${bits_builddir} && $(LN_S) $? . 2>/dev/null + @-cd ${bits_builddir} && rm -f stamp-bits && $(STAMP) stamp-bits @$(STAMP) stamp-bits-sup stamp-c_base: ${c_base_headers} Index: libstdc++-v3/include/Makefile.in =================================================================== --- libstdc++-v3/include/Makefile.in (revision 169786) +++ libstdc++-v3/include/Makefile.in (working copy) @@ -1326,6 +1326,7 @@ stamp-bits: ${bits_headers} stamp-bits-sup: stamp-bits ${bits_sup_headers} @-cd ${bits_builddir} && $(LN_S) $? . 2>/dev/null + @-cd ${bits_builddir} && rm -f stamp-bits && $(STAMP) stamp-bits @$(STAMP) stamp-bits-sup stamp-c_base: ${c_base_headers}