Patchwork [v3] libstdc++/49829

login
register
mail settings
Submitter Matthias Klose
Date Jan. 24, 2012, 4:43 p.m.
Message ID <4F1EDFBE.1000107@ubuntu.com>
Download mbox | patch
Permalink /patch/137594/
State New
Headers show

Comments

Matthias Klose - Jan. 24, 2012, 4:43 p.m.
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

Patch

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;