From patchwork Sun Nov 13 18:05:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Arsen_Arsenovi=C4=87?= X-Patchwork-Id: 60533 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 8C4703887F7E for ; Sun, 13 Nov 2022 18:06:16 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8C4703887F7E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1668362776; bh=9E6LGybBIOB6VktoF+CJbT1h9KZk5T5WSjxCu3syrj0=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=QeqboHMECrYoZZyudKDUDz/RA4yL49wi+NaSeRSalfcIoSylt1B1QZL+Ws1v9gejv LwPHCSnpTwi89/NibCZd+BwBib51fPfa2iGfxju8bRZSlTGY71u4sLv7OARj/dNOHZ c1z7ve43bXQLb90xdpF12j10IQ04jYUyDYJx2f5E= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mout-p-102.mailbox.org (mout-p-102.mailbox.org [80.241.56.152]) by sourceware.org (Postfix) with ESMTPS id AB92F3858436; Sun, 13 Nov 2022 18:05:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org AB92F3858436 Received: from smtp1.mailbox.org (smtp1.mailbox.org [10.196.197.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4N9L2q60qBz9sSF; Sun, 13 Nov 2022 19:05:39 +0100 (CET) To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Cc: =?utf-8?q?Arsen_Arsenovi=C4=87?= Subject: [PATCH] libstdc++: Fix python/ not making install directories Date: Sun, 13 Nov 2022 19:05:27 +0100 Message-Id: <20221113180527.2907744-1-arsen@aarsen.me> MIME-Version: 1.0 X-Spam-Status: No, score=-11.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_INFOUSMEBIZ, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: =?utf-8?q?Arsen_Arsenovi=C4=87_via_Gcc-patches?= From: =?utf-8?q?Arsen_Arsenovi=C4=87?= Reply-To: =?utf-8?q?Arsen_Arsenovi=C4=87?= Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" I'm unsure why this issue only started manifesting now with how old this code is, but this should fix it. libstdc++-v3/ChangeLog: * python/Makefile.am: Call mkinstalldirs before INSTALL_DATA when installing gdb scripts. * python/Makefile.in: Regenerate. --- Hi, Someone spotted on IRC spotted an error: if trying to install to a fresh prefix/sysroot with --enable-libstdcxx-debug, the install fails since it's intended target directories don't exist. I could replicate this on r13-3944-g43435c7eb0ff60 using $ ../gcc/configure --disable-bootstrap \ --enable-libstdcxx-debug \ --enable-languages=c,c++ \ --prefix=$(pwd)/pfx Install tested on x86_64-pc-linux-gnu with and without --enable-libstdcxx-debug. libstdc++-v3/python/Makefile.am | 4 ++++ libstdc++-v3/python/Makefile.in | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/libstdc++-v3/python/Makefile.am b/libstdc++-v3/python/Makefile.am index f523d3a44dc..7987d33e6d9 100644 --- a/libstdc++-v3/python/Makefile.am +++ b/libstdc++-v3/python/Makefile.am @@ -58,9 +58,13 @@ install-data-local: gdb.py libname=`sed -ne "/^old_library=/{s/.*='//;s/'$$//;s/ .*//;p;}" \ $(DESTDIR)$(toolexeclibdir)/libstdc++.la`; \ fi; \ + echo " $(mkinstalldirs) $(DESTDIR)$(toolexeclibdir)"; \ + $(mkinstalldirs) $(DESTDIR)$(toolexeclibdir); \ echo " $(INSTALL_DATA) gdb.py $(DESTDIR)$(toolexeclibdir)/$$libname-gdb.py"; \ $(INSTALL_DATA) gdb.py $(DESTDIR)$(toolexeclibdir)/$$libname-gdb.py ; \ if [ -n "$(debug_gdb_py)" ]; then \ sed "/^libdir = /s;'$$;/debug';" gdb.py > debug-gdb.py ; \ + echo " $(mkinstalldirs) $(DESTDIR)$(toolexeclibdir)/debug"; \ + $(mkinstalldirs) $(DESTDIR)$(toolexeclibdir)/debug; \ $(INSTALL_DATA) debug-gdb.py $(DESTDIR)$(toolexeclibdir)/debug/$$libname-gdb.py ; \ fi diff --git a/libstdc++-v3/python/Makefile.in b/libstdc++-v3/python/Makefile.in index 05e79b5ac1e..a68c1836481 100644 --- a/libstdc++-v3/python/Makefile.in +++ b/libstdc++-v3/python/Makefile.in @@ -623,10 +623,14 @@ install-data-local: gdb.py libname=`sed -ne "/^old_library=/{s/.*='//;s/'$$//;s/ .*//;p;}" \ $(DESTDIR)$(toolexeclibdir)/libstdc++.la`; \ fi; \ + echo " $(mkinstalldirs) $(DESTDIR)$(toolexeclibdir)"; \ + $(mkinstalldirs) $(DESTDIR)$(toolexeclibdir); \ echo " $(INSTALL_DATA) gdb.py $(DESTDIR)$(toolexeclibdir)/$$libname-gdb.py"; \ $(INSTALL_DATA) gdb.py $(DESTDIR)$(toolexeclibdir)/$$libname-gdb.py ; \ if [ -n "$(debug_gdb_py)" ]; then \ sed "/^libdir = /s;'$$;/debug';" gdb.py > debug-gdb.py ; \ + echo " $(mkinstalldirs) $(DESTDIR)$(toolexeclibdir)/debug"; \ + $(mkinstalldirs) $(DESTDIR)$(toolexeclibdir)/debug; \ $(INSTALL_DATA) debug-gdb.py $(DESTDIR)$(toolexeclibdir)/debug/$$libname-gdb.py ; \ fi