mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-29 06:06:32 +00:00
some fixes from Gentoo
This commit is contained in:
parent
ea8a91e8d3
commit
e7460e04eb
@ -1,20 +1,22 @@
|
|||||||
# DP: Build and install libstdc++_pic.a library.
|
# DP: Build and install libstdc++_pic.a library.
|
||||||
|
|
||||||
--- gcc-4.1.0/libstdc++-v3/src/Makefile.am 2004-11-15 17:33:05.000000000 -0600
|
--- gcc/libstdc++-v3/src/Makefile.am
|
||||||
+++ gcc-4.1.0-patched/libstdc++-v3/src/Makefile.am 2005-04-25 20:05:59.186930896 -0500
|
+++ gcc/libstdc++-v3/src/Makefile.am
|
||||||
@@ -214,6 +214,10 @@
|
@@ -214,6 +214,12 @@
|
||||||
$(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LDFLAGS) -o $@
|
$(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.
|
# Added bits to build debug library.
|
||||||
if GLIBCXX_BUILD_DEBUG
|
if GLIBCXX_BUILD_DEBUG
|
||||||
all-local: build_debug
|
all-local: build_debug
|
||||||
--- gcc-4.1.0/libstdc++-v3/src/Makefile.in 2005-04-11 19:13:08.000000000 -0500
|
--- gcc/libstdc++-v3/src/Makefile.in
|
||||||
+++ gcc-4.1.0-patched/libstdc++-v3/src/Makefile.in 2005-04-25 20:12:33.284316275 -0500
|
+++ gcc/libstdc++-v3/src/Makefile.in
|
||||||
@@ -627,7 +627,7 @@
|
@@ -627,7 +627,7 @@
|
||||||
|
|
||||||
install-data-am: install-data-local
|
install-data-am: install-data-local
|
||||||
@ -32,14 +34,16 @@
|
|||||||
install-exec-am install-info install-info-am install-man \
|
install-exec-am install-info install-info-am install-man \
|
||||||
install-strip install-toolexeclibLTLIBRARIES installcheck \
|
install-strip install-toolexeclibLTLIBRARIES installcheck \
|
||||||
installcheck-am installdirs maintainer-clean \
|
installcheck-am installdirs maintainer-clean \
|
||||||
@@ -745,6 +746,11 @@
|
@@ -743,6 +743,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:
|
||||||
+ $(AR) cru libstdc++_pic.a .libs/*.o $(top_builddir)/libsupc++/*.o
|
+ifeq ($(enable_shared),yes)
|
||||||
|
+ $(AR) cru libstdc++_pic.a *.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.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user