[Pkg-ocaml-maint-commits] [SCM] ocamlnet packaging branch, master, updated. debian/3.5.1-1-14-gdf680c0

[Stephane Glondu]

The following commit has been merged in the master branch:
commit df680c072d887b7e7f5ffee5db58f733c182f24c
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue May 7 17:01:27 2013 +0200

    Force all netsys features on Linux (LP: #257524)

diff --git a/debian/rules b/debian/rules
index 08fca02..e4e3911 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,8 @@
 
 include /usr/share/ocaml/ocamlvars.mk
 
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+
 PKGNAME = libocamlnet-ocaml-dev
 DESTDIR = $(CURDIR)/debian/tmp
 export OCAMLFIND_DESTDIR = $(DESTDIR)$(OCAML_STDLIB_DIR)
@@ -25,6 +27,19 @@ CFGFLAGS += -enable-pcre
 .PHONY: override_dh_auto_configure
 override_dh_auto_configure:
 	./configure $(CFGFLAGS)
+ifeq ($(DEB_HOST_ARCH_OS),linux)
+# In some build environments (especially cowbuilder and Ubuntu
+# autobuilders), many netsys autotests fail even though the feature is
+# available (LP: #257524)
+	@echo
+	@echo "The following netsys features will be forced:"
+	@if grep '#undef ' src/netsys/config.h; then \
+	  sed -i 's/#undef /#define /' src/netsys/config.h; \
+	else \
+	  echo "none"; \
+	fi
+	@echo
+endif
 
 .PHONY: override_dh_auto_build
 override_dh_auto_build:

-- 
ocamlnet packaging