[Pkg-ocaml-maint-commits] [ocamlbuild] 03/03: Suppress "bss-plt forced" warnings from ld

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository ocamlbuild.

commit 09e0a530ef9558e42843286eb1e64156e1858c85
Author: Ximin Luo <infinity0 at debian.org>
Date:   Sun Jul 30 14:11:56 2017 +0200

    Suppress "bss-plt forced" warnings from ld
---
 debian/bin/ld    | 9 +++++++++
 debian/changelog | 1 +
 debian/rules     | 7 +++++++
 3 files changed, 17 insertions(+)

diff --git a/debian/bin/ld b/debian/bin/ld
new file mode 100644
index 0000000..5ac4cea
--- /dev/null
+++ b/debian/bin/ld
@@ -0,0 +1,9 @@
+#!/bin/bash
+# Suppress "bss-plt forced" warnings from ld
+# see https://github.com/ocaml/ocamlbuild/issues/254
+f() {
+	/usr/bin/ld 2>&1 1>&3 "$@" \
+	  | grep -v "bss-plt forced"
+	return ${PIPESTATUS[0]}
+}
+f "$@" 3>&1 >&2
diff --git a/debian/changelog b/debian/changelog
index aaa7b61..5be850a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ocamlbuild (0.11.0-2) UNRELEASED; urgency=medium
 
   * Only run native tests if ocamlopt is available, fixes FTBFS on arches
     without ocamlopt.
+  * Suppress "bss-plt forced" warnings from ld, fixes FTBFS on powerpc.
 
  -- Ximin Luo <infinity0 at debian.org>  Sun, 30 Jul 2017 13:20:15 +0200
 
diff --git a/debian/rules b/debian/rules
index ccc5bcc..c28ebca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,7 @@
 # output every command that modifies files on the build system.
 #export DH_VERBOSE = 1
 
+include /usr/share/dpkg/architecture.mk
 
 %:
 	dh $@ --with ocaml
@@ -27,6 +28,12 @@ OCAMLBUILD_CFG = \
 unexport OCAMLPARAM
 unexport OCAML_TOPLEVEL_PATH
 
+ifeq ($(DEB_HOST_ARCH),powerpc)
+# Suppress "bss-plt forced" warnings from ld
+# see https://github.com/ocaml/ocamlbuild/issues/254
+export PATH := $(CURDIR)/debian/bin:$(PATH)
+endif
+
 override_dh_auto_configure:
 	$(MAKE) $(OCAMLBUILD_CFG) OCAML_NATIVE=$(OCAML_NATIVE) configure
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlbuild.git