From b75443845dee2547a7a6f3d8e2384de68dab6e93 Mon Sep 17 00:00:00 2001 From: doko Date: Sun, 8 Mar 2015 16:44:26 +0000 Subject: - include libgomp in standalone gccgo builds. git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-5@7872 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca --- debian/rules.d/binary-go.mk | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'debian/rules.d') 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) -- cgit v1.2.3