jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-08-10 11:57:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ivan Kuten
2008-01-08 12:52:49 +00:00
parent 1388c9ab03
commit 7a3789e41d
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
toolchain/gcc/3.4.6/300-libstdc++-pic.patch
View File

@@ -2,21 +2,23 @@
--- gcc/libstdc++-v3/src/Makefile.am --- gcc/libstdc++-v3/src/Makefile.am
+++ gcc/libstdc++-v3/src/Makefile.am +++ gcc/libstdc++-v3/src/Makefile.am
@@ -224,6 +224,10 @@ @@ -209,6 +209,11 @@
@OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@ CXXLINK = $(LIBTOOL) --tag CXX --mode=link $(CXX) \
$(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LDFLAGS) -o $@
+install-exec-local: +install-exec-local:
+ifeq ($(enable_shared),yes)
+ $(AR) cru libstdc++_pic.a .libs/*.o $(top_builddir)/libsupc++/*.o + $(AR) cru libstdc++_pic.a .libs/*.o $(top_builddir)/libsupc++/*.o
+ $(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir) + $(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir)
+ +endif
# Added bits to build debug library.
if GLIBCPP_BUILD_DEBUG
all-local: build_debug
# Added bits to build debug library.
if GLIBCXX_BUILD_DEBUG
--- gcc/libstdc++-v3/src/Makefile.in --- gcc/libstdc++-v3/src/Makefile.in
+++ 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 install-data-am: install-data-local
@@ -25,7 +27,7 @@
install-info: install-info-am install-info: install-info-am
@@ -618,6 +618,7 @@ @@ -625,6 +625,7 @@
distclean-tags distdir dvi dvi-am info info-am install \ distclean-tags distdir dvi dvi-am info info-am install \
install-am install-data install-data-am install-data-local \ install-am install-data install-data-am install-data-local \
install-exec install-exec-am install-info install-info-am \ install-exec install-exec-am install-info install-info-am \
@@ -33,14 +35,16 @@
install-man install-strip install-toolexeclibLTLIBRARIES \ install-man install-strip install-toolexeclibLTLIBRARIES \
installcheck installcheck-am installdirs maintainer-clean \ installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \ maintainer-clean-generic mostlyclean mostlyclean-compile \
@@ -707,6 +708,11 @@ @@ -709,6 +710,13 @@
install_debug: install_debug:
(cd ${debugdir} && $(MAKE) \ (cd ${debugdir} && $(MAKE) \
toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install) toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install)
+ +
+install-exec-local: +install-exec-local:
+ifeq ($(enable_shared),yes)
+ $(AR) cru libstdc++_pic.a .libs/*.o $(top_builddir)/libsupc++/*.o + $(AR) cru libstdc++_pic.a .libs/*.o $(top_builddir)/libsupc++/*.o
+ $(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir) + $(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir)
+endif
+ +
# Tell versions [3.59,3.63) of GNU make to not export all variables. # 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. # Otherwise a system limit (for SysV at least) may be exceeded.