diff options
| author | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2015-04-10 13:06:44 +0000 |
|---|---|---|
| committer | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2015-04-10 13:06:44 +0000 |
| commit | 0cd44a88064499aeaf9fc70e5c6f65edbe994543 (patch) | |
| tree | e2b0acff1ef93a640b87087ae21577897881e3a5 | |
| parent | f899d4e578a3011b0ac108916ab34232d5c83e42 (diff) | |
| download | gcc-5-0cd44a88064499aeaf9fc70e5c6f65edbe994543.tar.gz | |
* gccgo: Install libnetgo.
git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-5@7962 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/rules.d/binary-go.mk | 12 |
2 files changed, 7 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog index 7e5a1cb..ea4822e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ gcc-5 (5-20150409-1) UNRELEASED; urgency=medium [ Matthias Klose ] * Fix /usr/include/c++/5.0.0 symlink. * Re-enable building the D frontend. Closes: #782254. + * gccgo: Install libnetgo. [ Samuel Thibault ] * Fix ada builds on the Hurd and KFreeBSD. Closes: #781424. diff --git a/debian/rules.d/binary-go.mk b/debian/rules.d/binary-go.mk index 3799f45..8b484df 100644 --- a/debian/rules.d/binary-go.mk +++ b/debian/rules.d/binary-go.mk @@ -160,7 +160,7 @@ endef define do_go_dev dh_installdirs -p$(2) $(gcc_lib_dir$(1)) DH_COMPAT=2 dh_movefiles -p$(2) \ - $(gcc_lib_dir$(1))/libgobegin.a + $(gcc_lib_dir$(1))/{libgobegin,libnetgo}.a $(if $(filter yes, $(with_standalone_go)), \ $(call install_gccgo_lib,libgomp,$(GOMP_SONAME),$(1),$(2))) $(call install_gccgo_lib,libgo,$(GO_SONAME),$(1),$(2)) @@ -191,22 +191,22 @@ $(binary_stamp)-gccgo: $(install_stamp) rm -rf $(d_go) dh_installdirs -p$(p_go) $(dirs_go) - mv $(d)/$(usr_lib)/libgobegin.a \ + mv $(d)/$(usr_lib)/{libgobegin,libnetgo}.a \ $(d)/$(gcc_lib_dir)/ if [ -f $(d)/$(usr_lib64)/libgobegin.a ]; then \ - mv $(d)/$(usr_lib64)/libgobegin.a \ + mv $(d)/$(usr_lib64)/{libgobegin,libnetgo}.a \ $(d)/$(gcc_lib_dir)/64/; \ fi if [ -f $(d)/$(usr_lib32)/libgobegin.a ]; then \ - mv $(d)/$(usr_lib32)/libgobegin.a \ + mv $(d)/$(usr_lib32)/{libgobegin,libnetgo}.a \ $(d)/$(gcc_lib_dir)/32/; \ fi if [ -f $(d)/$(usr_libn32)/libgobegin.a ]; then \ - mv $(d)/$(usr_libn32)/libgobegin.a \ + mv $(d)/$(usr_libn32)/{libgobegin,libnetgo}.a \ $(d)/$(gcc_lib_dir)/n32/; \ fi if [ -f $(d)/$(usr_libx32)/libgobegin.a ]; then \ - mv $(d)/$(usr_libx32)/libgobegin.a \ + mv $(d)/$(usr_libx32)/{libgobegin,libnetgo}.a \ $(d)/$(gcc_lib_dir)/x32/; \ fi |