| Message ID | 20221113180527.2907744-1-arsen@aarsen.me |
|---|---|
| State | Superseded |
| Headers |
Return-Path: <gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org> 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 <patchwork@sourceware.org>; 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?= <arsen@aarsen.me> 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 Content-Transfer-Encoding: 8bit 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 <gcc-patches.gcc.gnu.org> List-Unsubscribe: <https://gcc.gnu.org/mailman/options/gcc-patches>, <mailto:gcc-patches-request@gcc.gnu.org?subject=unsubscribe> List-Archive: <https://gcc.gnu.org/pipermail/gcc-patches/> List-Post: <mailto:gcc-patches@gcc.gnu.org> List-Help: <mailto:gcc-patches-request@gcc.gnu.org?subject=help> List-Subscribe: <https://gcc.gnu.org/mailman/listinfo/gcc-patches>, <mailto:gcc-patches-request@gcc.gnu.org?subject=subscribe> From: =?utf-8?q?Arsen_Arsenovi=C4=87_via_Gcc-patches?= <gcc-patches@gcc.gnu.org> Reply-To: =?utf-8?q?Arsen_Arsenovi=C4=87?= <arsen@aarsen.me> Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" <gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org> |
| Series |
libstdc++: Fix python/ not making install directories
|
|
Commit Message
Arsen Arsenović
Nov. 13, 2022, 6:05 p.m. UTC
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(+)
Comments
On Sun, 13 Nov 2022, 18:06 Arsen Arsenović via Libstdc++, < libstdc++@gcc.gnu.org> wrote: > I'm unsure why this issue only started manifesting now with how old this > code is, but this should fix it. > I just pushed a change to how the debug build makefiles are generated, which presumably uncovered this latent bug. I'll review the patch in the morning. > 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 > > -- > 2.38.1 > >
On Sun, 13 Nov 2022 19:42:52 +0000 Jonathan Wakely via Gcc-patches <gcc-patches@gcc.gnu.org> wrote: > On Sun, 13 Nov 2022, 18:06 Arsen Arsenović via Libstdc++, < > libstdc++@gcc.gnu.org> wrote: > > > I'm unsure why this issue only started manifesting now with how old this > > code is, but this should fix it. > > > > I just pushed a change to how the debug build makefiles are generated, > which presumably uncovered this latent bug. I'll review the patch in the > morning. Ah, you removed debugdir everywhere but in the install-debug rule :) I.e.: $ git diff diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am index b545ebf0dcf..bfa031ea395 100644 --- a/libstdc++-v3/src/Makefile.am +++ b/libstdc++-v3/src/Makefile.am @@ -422,5 +422,5 @@ build-debug: stamp-debug $(debug_backtrace_supported_h) # Install debug library. install-debug: build-debug - (cd ${debugdir} && $(MAKE) CXXFLAGS='$(DEBUG_FLAGS)' \ - toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install) ; + $(MAKE) -C debug CXXFLAGS='$(DEBUG_FLAGS)' \ + toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in index f54ee282fb0..8479d297389 100644 --- a/libstdc++-v3/src/Makefile.in +++ b/libstdc++-v3/src/Makefile.in @@ -1142,8 +1142,8 @@ build-debug: stamp-debug $(debug_backtrace_supported_h) # Install debug library. install-debug: build-debug - (cd ${debugdir} && $(MAKE) CXXFLAGS='$(DEBUG_FLAGS)' \ - toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install) ; + $(MAKE) -C debug CXXFLAGS='$(DEBUG_FLAGS)' \ + toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. I personally did not experience the gdb.py install bug Arsen seems to have encountered though. thanks! > > > > > 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
On Sun, 13 Nov 2022 at 20:30, Bernhard Reutner-Fischer via Libstdc++ <libstdc++@gcc.gnu.org> wrote: > > On Sun, 13 Nov 2022 19:42:52 +0000 > Jonathan Wakely via Gcc-patches <gcc-patches@gcc.gnu.org> wrote: > > > On Sun, 13 Nov 2022, 18:06 Arsen Arsenović via Libstdc++, < > > libstdc++@gcc.gnu.org> wrote: > > > > > I'm unsure why this issue only started manifesting now with how old this > > > code is, but this should fix it. > > > > > > > I just pushed a change to how the debug build makefiles are generated, > > which presumably uncovered this latent bug. I'll review the patch in the > > morning. > > Ah, you removed debugdir everywhere but in the install-debug rule :) Doh! I'll get your fix below committed in a few minutes, thanks. > I.e.: > > $ git diff > diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am > index b545ebf0dcf..bfa031ea395 100644 > --- a/libstdc++-v3/src/Makefile.am > +++ b/libstdc++-v3/src/Makefile.am > @@ -422,5 +422,5 @@ build-debug: stamp-debug $(debug_backtrace_supported_h) > > # Install debug library. > install-debug: build-debug > - (cd ${debugdir} && $(MAKE) CXXFLAGS='$(DEBUG_FLAGS)' \ > - toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install) ; > + $(MAKE) -C debug CXXFLAGS='$(DEBUG_FLAGS)' \ > + toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install > diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in > index f54ee282fb0..8479d297389 100644 > --- a/libstdc++-v3/src/Makefile.in > +++ b/libstdc++-v3/src/Makefile.in > @@ -1142,8 +1142,8 @@ build-debug: stamp-debug $(debug_backtrace_supported_h) > > # Install debug library. > install-debug: build-debug > - (cd ${debugdir} && $(MAKE) CXXFLAGS='$(DEBUG_FLAGS)' \ > - toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install) ; > + $(MAKE) -C debug CXXFLAGS='$(DEBUG_FLAGS)' \ > + toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install > > # Tell versions [3.59,3.63) of GNU make to not export all variables. > # Otherwise a system limit (for SysV at least) may be exceeded. > > I personally did not experience the gdb.py install bug Arsen seems to > have encountered though. > > thanks! > > > > > > > > > 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 >
On Sun, 13 Nov 2022 at 18:06, Arsen Arsenović via Libstdc++ <libstdc++@gcc.gnu.org> wrote: > > 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. This looks simple, and more consistent with what we already do. Does it solve your issue? commit d26dc9e37602314bf6922ac5667fff34f5559449 (HEAD -> master) Author: Jonathan Wakely <jwakely@redhat.com> Date: Mon Nov 14 10:27:15 2022 libstdc++: Add missing mkdirs for installing python files for debug lib libstdc++-v3/ChangeLog: * python/Makefile.am (intall-data-local): Use mkdirs_p for debug libdir. * python/Makefile.in: Regenerate. diff --git a/libstdc++-v3/python/Makefile.am b/libstdc++-v3/python/Makefile.am index f523d3a44dc..d5d29b398b0 100644 --- a/libstdc++-v3/python/Makefile.am +++ b/libstdc++-v3/python/Makefile.am @@ -62,5 +62,6 @@ install-data-local: 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 ; \ + $(mkdir_p) $(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..cfec788b6e3 100644 --- a/libstdc++-v3/python/Makefile.in +++ b/libstdc++-v3/python/Makefile.in @@ -627,6 +627,7 @@ install-data-local: 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 ; \ + $(mkdir_p) $(DESTDIR)$(toolexeclibdir)/debug $(INSTALL_DATA) debug-gdb.py $(DESTDIR)$(toolexeclibdir)/debug/$$libname-gdb.py ; \ fi
On Mon, 14 Nov 2022 at 10:29, Jonathan Wakely wrote: > > On Sun, 13 Nov 2022 at 18:06, Arsen Arsenović via Libstdc++ > <libstdc++@gcc.gnu.org> wrote: > > > > 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. > > > This looks simple, and more consistent with what we already do. Does > it solve your issue? Apparently it helps if I commit a fix after testing it, and don't send the unfixed commit. Try *this* one. commit 58a8ec0ce8c9231e6d8cc99a0bf8f2afd1e702de Author: Jonathan Wakely <jwakely@redhat.com> Date: Mon Nov 14 10:37:58 2022 libstdc++: Add missing mkdirs for installing python files for debug lib libstdc++-v3/ChangeLog: * python/Makefile.am (intall-data-local): Use mkdirs_p for debug libdir. * python/Makefile.in: Regenerate. diff --git a/libstdc++-v3/python/Makefile.am b/libstdc++-v3/python/Makefile.am index f523d3a44dc..df6bf508210 100644 --- a/libstdc++-v3/python/Makefile.am +++ b/libstdc++-v3/python/Makefile.am @@ -62,5 +62,6 @@ install-data-local: 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 ; \ + $(mkdir_p) $(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..c527e6cf186 100644 --- a/libstdc++-v3/python/Makefile.in +++ b/libstdc++-v3/python/Makefile.in @@ -627,6 +627,7 @@ install-data-local: 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 ; \ + $(mkdir_p) $(DESTDIR)$(toolexeclibdir)/debug ; \ $(INSTALL_DATA) debug-gdb.py $(DESTDIR)$(toolexeclibdir)/debug/$$libname-gdb.py ; \ fi
Hi, Jonathan Wakely <jwakely@redhat.com> writes: >> This looks simple, and more consistent with what we already do. Does >> it solve your issue? It does work; though, if I was more daring I'd have said that it's fine without checking, too, since it does the same operation on the same directory ;) Was the omission of the mkdir $(DESTDIR)$(toolexeclibdir) intentional? I only see TELD/debug in your revision of the patch. Chances are, it gets created elsewhere (my test was just install-target-libstdc++-v3, so not even the full install), but it might be worth being conservative about it. Thanks,
On Mon, 14 Nov 2022 at 13:20, Arsen Arsenović <arsen@aarsen.me> wrote: > > Hi, > > Jonathan Wakely <jwakely@redhat.com> writes: > >> This looks simple, and more consistent with what we already do. Does > >> it solve your issue? > > It does work; though, if I was more daring I'd have said that it's fine > without checking, too, since it does the same operation on the same > directory ;) > > Was the omission of the mkdir $(DESTDIR)$(toolexeclibdir) intentional? It's the first thing the recipe does: install-data-local: gdb.py @$(mkdir_p) $(DESTDIR)$(toolexeclibdir) That's why I'm suggesting to do the same thing for the debug dir. > I only see TELD/debug in your revision of the patch. Chances are, it > gets created elsewhere (my test was just install-target-libstdc++-v3, so > not even the full install), but it might be worth being conservative > about it. > > Thanks, > -- > Arsen Arsenović
On Mon, 14 Nov 2022 at 14:13, Jonathan Wakely <jwakely@redhat.com> wrote: > > On Mon, 14 Nov 2022 at 13:20, Arsen Arsenović <arsen@aarsen.me> wrote: > > > > Hi, > > > > Jonathan Wakely <jwakely@redhat.com> writes: > > >> This looks simple, and more consistent with what we already do. Does > > >> it solve your issue? > > > > It does work; though, if I was more daring I'd have said that it's fine > > without checking, too, since it does the same operation on the same > > directory ;) > > > > Was the omission of the mkdir $(DESTDIR)$(toolexeclibdir) intentional? > > It's the first thing the recipe does: > > install-data-local: gdb.py > @$(mkdir_p) $(DESTDIR)$(toolexeclibdir) > > That's why I'm suggesting to do the same thing for the debug dir. This presumably means it has the problems that mkinstalldirs is supposed to solve, but is that only relevant for Solaris 8, i.e. not relevant?
Jonathan Wakely <jwakely@redhat.com> writes: >> It's the first thing the recipe does: >> >> install-data-local: gdb.py >> @$(mkdir_p) $(DESTDIR)$(toolexeclibdir) >> >> That's why I'm suggesting to do the same thing for the debug dir. > > This presumably means it has the problems that mkinstalldirs is > supposed to solve, but is that only relevant for Solaris 8, i.e. not > relevant? Ah, sorry. I didn't notice that it did that at the top. Yes, mkdir -p is at least as good then. Thanks,
On Mon, 14 Nov 2022 at 15:58, Arsen Arsenović wrote: > > > Jonathan Wakely <jwakely@redhat.com> writes: > >> It's the first thing the recipe does: > >> > >> install-data-local: gdb.py > >> @$(mkdir_p) $(DESTDIR)$(toolexeclibdir) > >> > >> That's why I'm suggesting to do the same thing for the debug dir. > > > > This presumably means it has the problems that mkinstalldirs is > > supposed to solve, but is that only relevant for Solaris 8, i.e. not > > relevant? > > Ah, sorry. I didn't notice that it did that at the top. Yes, mkdir -p > is at least as good then. > I've pushed it to trunk now, thanks for finding the problem.
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