From 801a979011689878d010741c1863c7fb17c63dfd Mon Sep 17 00:00:00 2001 From: Kirk Scheper Date: Wed, 16 May 2018 23:39:31 +0200 Subject: [PATCH] extend workaround lablgtk fix to all 2.18 versions (#2264) --- sw/ground_segment/cockpit/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sw/ground_segment/cockpit/Makefile b/sw/ground_segment/cockpit/Makefile index 3744d4b9373..dc4d6aca4f4 100644 --- a/sw/ground_segment/cockpit/Makefile +++ b/sw/ground_segment/cockpit/Makefile @@ -51,7 +51,7 @@ endif # see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=822949 and https://bugs.launchpad.net/ubuntu/+source/lablgtk2/+bug/1577236 # Ubuntu 16.04: 2.18.3+dfsg-1 Ubuntu 16.10: 2.18.3+dfsg-2 LABLGTK2_DEB := $(shell LC_ALL=C apt-cache policy liblablgtk2-ocaml | grep Installed | awk '{print $$2}' 2>/dev/null) -ifneq (,$(findstring 2.18.3+dfsg, $(LABLGTK2_DEB))) +ifneq (,$(findstring 2.18, $(LABLGTK2_DEB))) CAMLP4_DEFS = -DGDK_NATIVE_WINDOW endif CAMLP4_DEFS ?=