[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: Bug#798123: openjdk-7: FTBFS on kfreebsd



Control: found -1 openjdk-7/7u85-2.6.1-4

Sorry - seeing that this FTBFS again on kfreebsd, I realise my patch to
debian/rules has a typo (or was an older version), and doesn't match
what I'd actually tested.  So the logic is wrong:

> +# Only Linux has libsctp-dev currently
> +ifneq (,$(filter $(DEB_HOST_ARCH_OS), linux))
> +  CONFIGURE_ARGS += --disable-system-sctp
> +endif

That ought to be ifeq (i.e. if linux is *not* in ARCH_OS).

Also, in case the build environment doesn't export DEB_HOST_ARCH_OS,
we maybe should explicitly define it, like the other DPKG_VARS.

I've attached a patch against 7u85-2.6.1-4 fixing both.  I've tested
again to be sure.

Thanks,
Regards,
-- 
Steven Chamberlain
steven@pyro.eu.org
--- debian/rules.orig	2015-10-07 15:22:46.000000000 +0100
+++ debian/rules	2015-10-07 20:35:40.818693947 +0100
@@ -15,6 +15,7 @@
 DEB_BUILD_GNU_TYPE	?= $(call vafilt,$(DPKG_VARS),DEB_BUILD_GNU_TYPE)
 DEB_HOST_ARCH		?= $(call vafilt,$(DPKG_VARS),DEB_HOST_ARCH)
 DEB_HOST_ARCH_CPU	?= $(call vafilt,$(DPKG_VARS),DEB_HOST_ARCH_CPU)
+DEB_HOST_ARCH_OS	?= $(call vafilt,$(DPKG_VARS),DEB_HOST_ARCH_OS)
 DEB_HOST_MULTIARCH	?= $(call vafilt,$(DPKG_VARS),DEB_HOST_MULTIARCH)
 
 PATH := $(CURDIR)/bin:$(PATH)
@@ -589,7 +590,7 @@
 endif
 
 # Only Linux has libsctp-dev currently
-ifneq (,$(filter $(DEB_HOST_ARCH_OS), linux))
+ifeq (,$(filter $(DEB_HOST_ARCH_OS), linux))
   CONFIGURE_ARGS += \
 	--disable-system-sctp
 endif

Attachment: signature.asc
Description: Digital signature


Reply to: