summaryrefslogtreecommitdiff
path: root/debian/patches/libstdc++-pic.diff
diff options
context:
space:
mode:
authorIgor Pashev <pashev.igor@gmail.com>2019-11-18 15:53:29 +0300
committerIgor Pashev <pashev.igor@gmail.com>2019-11-18 15:53:29 +0300
commit8f6c4b0033c72f8ac14694c419a99458339dd6a9 (patch)
tree06c106e622a58100aa85a381b9b65d222b076df4 /debian/patches/libstdc++-pic.diff
parent42156b5190f4fa150e1fab6777eb81e69d4db8c9 (diff)
downloadgcc-9-debian.tar.gz
Import gcc-9 (9.2.1-19)debian/9.2.1-19debian
Diffstat (limited to 'debian/patches/libstdc++-pic.diff')
-rw-r--r--debian/patches/libstdc++-pic.diff22
1 files changed, 9 insertions, 13 deletions
diff --git a/debian/patches/libstdc++-pic.diff b/debian/patches/libstdc++-pic.diff
index 552e315..f3d6395 100644
--- a/debian/patches/libstdc++-pic.diff
+++ b/debian/patches/libstdc++-pic.diff
@@ -1,10 +1,8 @@
# DP: Build and install libstdc++_pic.a library.
-Index: b/src/libstdc++-v3/src/Makefile.am
-===================================================================
--- a/src/libstdc++-v3/src/Makefile.am
+++ b/src/libstdc++-v3/src/Makefile.am
-@@ -311,10 +311,12 @@ if GLIBCXX_BUILD_DEBUG
+@@ -315,10 +315,12 @@ if GLIBCXX_BUILD_DEBUG
STAMP_DEBUG = build-debug
STAMP_INSTALL_DEBUG = install-debug
CLEAN_DEBUG = debug
@@ -17,7 +15,7 @@ Index: b/src/libstdc++-v3/src/Makefile.am
endif
# Build a debug variant.
-@@ -349,6 +351,7 @@ build-debug: stamp-debug
+@@ -353,6 +355,7 @@ build-debug: stamp-debug
mv Makefile Makefile.tmp; \
sed -e 's,all-local: all-once,all-local:,' \
-e 's,install-data-local: install-data-once,install-data-local:,' \
@@ -25,7 +23,7 @@ Index: b/src/libstdc++-v3/src/Makefile.am
-e '/vpath/!s,src/c,src/debug/c,' \
< Makefile.tmp > Makefile ; \
rm -f Makefile.tmp ; \
-@@ -359,3 +362,8 @@ build-debug: stamp-debug
+@@ -363,3 +366,8 @@ build-debug: stamp-debug
install-debug: build-debug
(cd ${debugdir} && $(MAKE) CXXFLAGS='$(DEBUG_FLAGS)' \
toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install) ;
@@ -34,11 +32,9 @@ Index: b/src/libstdc++-v3/src/Makefile.am
+$(STAMP_INSTALL_PIC):
+ $(MKDIR_P) $(DESTDIR)$(toolexeclibdir)
+ $(INSTALL_DATA) .libs/libstdc++convenience.a $(DESTDIR)$(toolexeclibdir)/libstdc++_pic.a
-Index: b/src/libstdc++-v3/src/Makefile.in
-===================================================================
--- a/src/libstdc++-v3/src/Makefile.in
+++ b/src/libstdc++-v3/src/Makefile.in
-@@ -531,6 +531,8 @@ CXXLINK = \
+@@ -619,6 +619,8 @@ CXXLINK = \
@GLIBCXX_BUILD_DEBUG_TRUE@STAMP_INSTALL_DEBUG = install-debug
@GLIBCXX_BUILD_DEBUG_FALSE@CLEAN_DEBUG =
@GLIBCXX_BUILD_DEBUG_TRUE@CLEAN_DEBUG = debug
@@ -47,7 +43,7 @@ Index: b/src/libstdc++-v3/src/Makefile.in
# Build a debug variant.
# Take care to fix all possibly-relative paths.
-@@ -829,7 +831,7 @@ install-dvi: install-dvi-recursive
+@@ -885,7 +887,7 @@ install-dvi: install-dvi-recursive
install-dvi-am:
@@ -56,7 +52,7 @@ Index: b/src/libstdc++-v3/src/Makefile.in
install-html: install-html-recursive
-@@ -880,11 +882,11 @@ uninstall-am: uninstall-toolexeclibLTLIB
+@@ -935,11 +937,11 @@ uninstall-am: uninstall-toolexeclibLTLIB
distclean-libtool distclean-tags dvi dvi-am html html-am info \
info-am install install-am install-data install-data-am \
install-data-local install-dvi install-dvi-am install-exec \
@@ -72,8 +68,8 @@ Index: b/src/libstdc++-v3/src/Makefile.in
+ installcheck-am installdirs installdirs-am maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags tags-recursive uninstall uninstall-am \
-@@ -1017,6 +1019,7 @@ build-debug: stamp-debug
+ tags tags-am uninstall uninstall-am \
+@@ -1075,6 +1077,7 @@ build-debug: stamp-debug
mv Makefile Makefile.tmp; \
sed -e 's,all-local: all-once,all-local:,' \
-e 's,install-data-local: install-data-once,install-data-local:,' \
@@ -81,7 +77,7 @@ Index: b/src/libstdc++-v3/src/Makefile.in
-e '/vpath/!s,src/c,src/debug/c,' \
< Makefile.tmp > Makefile ; \
rm -f Makefile.tmp ; \
-@@ -1028,6 +1031,11 @@ install-debug: build-debug
+@@ -1086,6 +1089,11 @@ install-debug: build-debug
(cd ${debugdir} && $(MAKE) CXXFLAGS='$(DEBUG_FLAGS)' \
toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install) ;