diff options
| author | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2015-03-08 16:44:26 +0000 |
|---|---|---|
| committer | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2015-03-08 16:44:26 +0000 |
| commit | b75443845dee2547a7a6f3d8e2384de68dab6e93 (patch) | |
| tree | 88caef26c24a79f046b4112e53403550d5c5633f /debian | |
| parent | c30e47b25cfe2e8a339043f0ccfe2beb1578ee88 (diff) | |
| download | gcc-5-b75443845dee2547a7a6f3d8e2384de68dab6e93.tar.gz | |
- include libgomp in standalone gccgo builds.
git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-5@7872 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/rules.d/binary-go.mk | 13 | ||||
| -rw-r--r-- | debian/rules.defs | 4 |
3 files changed, 14 insertions, 10 deletions
diff --git a/debian/changelog b/debian/changelog index 46bb57d..daa5f6c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ -gcc-5 (5-20150303-1) experimental; urgency=medium +gcc-5 (5-20150307-1) experimental; urgency=medium - * Update to SVN 20150303. + * Update to SVN 20150307. + - Update gccgo to Go 1.4.2. * Enable libsanitizer for AArch64 and POWERPC LE (asan, ubsan). * Remove the support to build empty libsanitizer packages on powerpc and ppc64; libsanitizer should be stable on these architectures. @@ -11,7 +12,7 @@ gcc-5 (5-20150303-1) experimental; urgency=medium debug information can be stripped. * gccgo-5: Install alternatives for go and gofmt. - -- Matthias Klose <doko@debian.org> Tue, 03 Mar 2015 11:34:55 +0100 + -- Matthias Klose <doko@debian.org> Sat, 07 Mar 2015 12:20:59 +0100 gcc-5 (5-20150226-1) experimental; urgency=medium diff --git a/debian/rules.d/binary-go.mk b/debian/rules.d/binary-go.mk index 36ae6f0..549beef 100644 --- a/debian/rules.d/binary-go.mk +++ b/debian/rules.d/binary-go.mk @@ -156,6 +156,7 @@ 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 + $(call install_gccgo_lib,libgomp,$(GOMP_SONAME),$(1),$(2)) $(call install_gccgo_lib,libgo,$(GO_SONAME),$(1),$(2)) $(call __do_gccgo_libgcc,$(1),$(2),$(gcc_lib_dir$(1)),$(d)/$(usr_lib$(1))) endef @@ -209,7 +210,6 @@ $(binary_stamp)-gccgo: $(install_stamp) ifneq (,$(findstring gccgo,$(PKGSOURCE))) rm -rf $(d_go)/$(gcc_lib_dir)/include/cilk - rm -rf $(d_go)/$(gcc_lib_dir)/include/omp.h rm -rf $(d_go)/$(gcc_lib_dir)/include/openacc.h endif @@ -227,22 +227,25 @@ endif endif ifeq ($(with_standalone_go),yes) -ifneq ($(DEB_CROSS),yes) + ifneq ($(DEB_CROSS),yes) for i in gcc gcov gcc-ar gcc-nm gcc-ranlib; do \ ln -sf $$i$(pkg_ver) \ $(d_go)/$(PF)/bin/$(DEB_TARGET_GNU_TYPE)-$$i$(pkg_ver); \ ln -sf $$i$(pkg_ver) \ $(d_go)/$(PF)/bin/$(TARGET_ALIAS)-$$i$(pkg_ver); \ done -ifneq ($(GFDL_INVARIANT_FREE),yes) + ifneq ($(GFDL_INVARIANT_FREE),yes) for i in gcc gcov gcc-ar gcc-nm gcc-ranlib; do \ ln -sf gcc$(pkg_ver).1 \ $(d_go)/$(PF)/share/man/man1/$(DEB_TARGET_GNU_TYPE)-$$i$(pkg_ver).1; \ ln -sf $$i$(pkg_ver).1 \ $(d_go)/$(PF)/share/man/man1/$(TARGET_ALIAS)-$$i$(pkg_ver).1; \ done -endif -endif + endif + endif + ifeq ($(with_gomp),yes) + mv $(d)/$(usr_lib)/libgomp*.spec $(d_go)/$(gcc_lib_dir)/ + endif endif debian/dh_doclink -p$(p_go) $(p_xbase) diff --git a/debian/rules.defs b/debian/rules.defs index 0b70655..94a32d0 100644 --- a/debian/rules.defs +++ b/debian/rules.defs @@ -1421,10 +1421,10 @@ define gen_biarch with_lib$1go := yes endif - biarch_multidir_names = libiberty libgcc libbacktrace libatomic + biarch_multidir_names = libiberty libgcc libbacktrace libatomic libgomp ifneq (,$$(findstring gcc-, $$(PKGSOURCE))) biarch_multidir_names += libstdc++-v3 libobjc libgfortran libssp \ - libgomp zlib libitm \ + zlib libitm \ libsanitizer \ libcilkrts libvtv ifeq ($$(with_objc_gc),yes) |