This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to branch debian/experimental
in repository ocaml.
commit c93e473958fcc8c2f1714dcdcb477e536b32819f
Author: Ximin Luo <infini...@debian.org>
Date: Sat Jul 22 11:10:34 2017 +0200
Proper fix for kfreebsd-* not having dup3/pipe2
---
debian/rules | 18 +++++-------------
1 file changed, 5 insertions(+), 13 deletions(-)
diff --git a/debian/rules b/debian/rules
index a6b1c99..87f870e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -87,6 +87,11 @@ pre-config-stamp: $(TARBALL_TARGET)
cp -f /usr/share/misc/config.$$ext config/gnu/config.$$ext; \
fi; \
done
+# Debian kfreebsd has non-working shims for dup3/pipe2, see #827935. Upstream
+# ./configure isn't sophisticated enough to detect this so patch it out here.
+ifeq (kfreebsd,$(DEB_HOST_ARCH_OS))
+ sed -i -e '/HAS_DUP3/d' -e '/HAS_PIPE2/d' ./configure
+endif
# Create empty directory present in upstream tarball
mkdir -p compilerlibs
touch $@
@@ -276,19 +281,6 @@ ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
rm -rf testsuite/tests/tool-debugger/basic/
rm -rf testsuite/tests/tool-debugger/find-artifacts/
rm -rf testsuite/tests/tool-debugger/no_debug_event/
-ifeq (kfreebsd,$(DEB_HOST_ARCH_OS))
- # FIXME: the following tests fail because Debian kfreebsd does not have
- # dup3(2) or pipe2(2), see #827935 for related discussion.
- rm -rf testsuite/tests/lib-unix/redirections.ml
- rm -rf testsuite/tests/lib-unix/dup2.ml
- rm -rf testsuite/tests/lib-unix/cloexec.ml
- rm -rf testsuite/tests/lib-unix/test_unix_cmdline.ml
- rm -rf testsuite/tests/lib-threads/fileio.ml
- rm -rf testsuite/tests/lib-threads/torture.ml
- rm -rf testsuite/tests/lib-threads/close.ml
- rm -rf testsuite/tests/lib-unix/pipe_eof.ml
- rm -rf testsuite/tests/lib-scanf-2/
-endif
ifneq (,$(filter $(DEB_BUILD_ARCH),$(SLOW_ARCHITECTURES)))
rm -f testsuite/tests/misc-unsafe/almabench.ml
endif
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml.git
_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
