diff options
| author | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2015-08-21 14:53:09 +0000 |
|---|---|---|
| committer | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2015-08-21 14:53:09 +0000 |
| commit | bc80576a454830982ec42aa48b78cdce4d0b91ac (patch) | |
| tree | fbb5625d797d5425de04af437ebfb3f2b6973456 | |
| parent | f4118ea05e5ee0aa74f80e4b07a21018e10cddc2 (diff) | |
| download | gcc-5-bc80576a454830982ec42aa48b78cdce4d0b91ac.tar.gz | |
* libstdc++-dev: Install libstdc++fs.a.
* libgo-dev: Install libgolibbegin.a.
git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-5@8205 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/rules.d/binary-go.mk | 1 | ||||
| -rw-r--r-- | debian/rules.d/binary-libstdcxx.mk | 10 |
3 files changed, 11 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 9493a13..0140edf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,11 @@ gcc-5 (5.2.1-16) UNRELEASED; urgency=medium * Update to SVN 20150820 (r227033, 5.2.1) from the gcc-5-branch. + - Backport the filesystem TS library. + * libstdc++-dev: Install libstdc++fs.a. * Again, configure with --enable-targets=powerpcle-linux on ppc64el. * Apply proposed patch for PR target/67211 (ppc64el). + * libgo-dev: Install libgolibbegin.a. -- Matthias Klose <doko@debian.org> Wed, 19 Aug 2015 18:04:00 +0200 diff --git a/debian/rules.d/binary-go.mk b/debian/rules.d/binary-go.mk index 370acef..0e26135 100644 --- a/debian/rules.d/binary-go.mk +++ b/debian/rules.d/binary-go.mk @@ -145,6 +145,7 @@ do_gccgo = $(call __do_gccgo,lib$(1)go$(GO_SONAME),$(1)) define install_gccgo_lib mv $(d)/$(usr_lib$(3))/$(1).a debian/$(4)/$(gcc_lib_dir$(3))/ + mv $(d)/$(usr_lib$(3))/$(1)libbegin.a debian/$(4)/$(gcc_lib_dir$(3))/ rm -f $(d)/$(usr_lib$(3))/$(1)*.{la,so} dh_link -p$(4) \ /$(usr_lib$(3))/$(1).so.$(2) /$(gcc_lib_dir$(3))/$(1).so diff --git a/debian/rules.d/binary-libstdcxx.mk b/debian/rules.d/binary-libstdcxx.mk index 5127cd2..467c297 100644 --- a/debian/rules.d/binary-libstdcxx.mk +++ b/debian/rules.d/binary-libstdcxx.mk @@ -111,7 +111,8 @@ dirs_dev = \ files_dev = \ $(PFL)/include/c++/$(BASE_VERSION) \ $(gcc_lib_dir)/libstdc++.{a,so} \ - $(gcc_lib_dir)/libsupc++.a + $(gcc_lib_dir)/libsupc++.a \ + $(gcc_lib_dir)/libstdc++fs.a ifeq ($(with_multiarch_cxxheaders),yes) dirs_dev += \ @@ -127,7 +128,8 @@ dirs_dbg = \ $(PF)/share/gdb/auto-load/$(usr_lib)/debug \ $(gcc_lib_dir) files_dbg = \ - $(usr_lib)/debug/libstdc++.{a,so*} + $(usr_lib)/debug/libstdc++.{a,so*} \ + $(usr_lib)/debug/libstdc++fs.a dirs_pic = \ $(docdir) \ @@ -281,7 +283,7 @@ define __do_libstdcxx_dev dh_testroot mv $(install_stamp) $(install_stamp)-tmp - mv $(d)/$(usr_lib$(2))/libstdc++.a $(d)/$(usr_lib$(2))/libsupc++.a \ + mv $(d)/$(usr_lib$(2))/libstdc++.a $(d)/$(usr_lib$(2))/libstdc++fs.a $(d)/$(usr_lib$(2))/libsupc++.a \ $(d)/$(gcc_lib_dir$(2))/ rm -rf $(d_l) @@ -289,6 +291,7 @@ define __do_libstdcxx_dev DH_COMPAT=2 dh_movefiles -p$(p_l) \ $(gcc_lib_dir$(2))/libstdc++.a \ + $(gcc_lib_dir$(2))/libstdc++fs.a \ $(gcc_lib_dir$(2))/libsupc++.a \ $(if $(with_multiarch_cxxheaders),$(PF)/include/$(DEB_TARGET_MULTIARCH)/c++/$(BASE_VERSION)/$(2)) $(call install_gcc_lib,libstdc++,$(CXX_SONAME),$(2),$(p_l)) @@ -391,6 +394,7 @@ $(binary_stamp)-libstdcxx-dev: $(libcxxdev_deps) : # - correct libstdc++-v3 file locations mv $(d)/$(usr_lib)/libsupc++.a $(d)/$(gcc_lib_dir)/ + mv $(d)/$(usr_lib)/libstdc++fs.a $(d)/$(gcc_lib_dir)/ mv $(d)/$(usr_lib)/libstdc++.{a,so} $(d)/$(gcc_lib_dir)/ ln -sf ../../../$(DEB_TARGET_GNU_TYPE)/libstdc++.so.$(CXX_SONAME) \ $(d)/$(gcc_lib_dir)/libstdc++.so |