Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: vanokuten at uclibc.org <vanokuten@uclibc.org>
To: buildroot@busybox.net
Subject: [Buildroot] svn commit: trunk/buildroot/toolchain/gcc/3.4.6
Date: Tue,  8 Jan 2008 04:52:49 -0800 (PST)	[thread overview]
Message-ID: <20080108125249.0070F12010C@busybox.net> (raw)

Author: vanokuten
Date: 2008-01-08 04:52:49 -0800 (Tue, 08 Jan 2008)
New Revision: 20822

Log:
fix gcc 3.4.6 and libstdc++ when shared support is disabled, thanks Atle\!

Modified:
   trunk/buildroot/toolchain/gcc/3.4.6/300-libstdc++-pic.patch


Changeset:
Modified: trunk/buildroot/toolchain/gcc/3.4.6/300-libstdc++-pic.patch
===================================================================
--- trunk/buildroot/toolchain/gcc/3.4.6/300-libstdc++-pic.patch	2008-01-08 12:51:36 UTC (rev 20821)
+++ trunk/buildroot/toolchain/gcc/3.4.6/300-libstdc++-pic.patch	2008-01-08 12:52:49 UTC (rev 20822)
@@ -2,21 +2,23 @@
 
 --- gcc/libstdc++-v3/src/Makefile.am
 +++ gcc/libstdc++-v3/src/Makefile.am
-@@ -224,6 +224,10 @@
- 	  @OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@
+@@ -209,6 +209,11 @@
+ CXXLINK = $(LIBTOOL) --tag CXX --mode=link $(CXX) \
+ 	  $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LDFLAGS) -o $@
  
- 
 +install-exec-local:
++ifeq ($(enable_shared),yes)
 +	$(AR) cru libstdc++_pic.a .libs/*.o $(top_builddir)/libsupc++/*.o
 +	$(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir)
-+
++endif
+ 
  # Added bits to build debug library.
- if GLIBCPP_BUILD_DEBUG
- all-local: build_debug
-
+ if GLIBCXX_BUILD_DEBUG
 --- gcc/libstdc++-v3/src/Makefile.in
 +++ gcc/libstdc++-v3/src/Makefile.in
-@@ -585,7 +585,7 @@
+--- gcc-3.4.6/libstdc++-v3/src/Makefile.in	2004-04-16 21:08:35.000000000 +0200
++++ gcc-3.4.6-patched/libstdc++-v3/src/Makefile.in	2007-11-30 13:33:26.000000000 +0100
+@@ -592,7 +592,7 @@
  
  install-data-am: install-data-local
  
@@ -25,7 +27,7 @@
  
  install-info: install-info-am
  
-@@ -618,6 +618,7 @@
+@@ -625,6 +625,7 @@
  	distclean-tags distdir dvi dvi-am info info-am install \
  	install-am install-data install-data-am install-data-local \
  	install-exec install-exec-am install-info install-info-am \
@@ -33,14 +35,16 @@
  	install-man install-strip install-toolexeclibLTLIBRARIES \
  	installcheck installcheck-am installdirs maintainer-clean \
  	maintainer-clean-generic mostlyclean mostlyclean-compile \
-@@ -707,6 +708,11 @@
+@@ -709,6 +710,13 @@
  install_debug:
  	(cd ${debugdir} && $(MAKE) \
  	toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install)
 +
 +install-exec-local:
++ifeq ($(enable_shared),yes)
 +	$(AR) cru libstdc++_pic.a .libs/*.o $(top_builddir)/libsupc++/*.o
 +	$(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir)
++endif
 +
  # 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.

                 reply	other threads:[~2008-01-08 12:52 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080108125249.0070F12010C@busybox.net \
    --to=vanokuten@uclibc.org \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox