From 4b4dcdfc65d2b0689dfbfc02146dba2eab747bec Mon Sep 17 00:00:00 2001 From: Edric Milaret <edric.ladent-milaret@savoirfairelinux.com> Date: Mon, 20 Jun 2016 10:24:50 -0400 Subject: [PATCH] ios: don't build contrib uuid This functionality is provided in the kernel. Therefore conflict happens between the two uuid.h. Change-Id: I39f0c5d06896c218a8efad41c9c014a6cc73bdf7 Tuleap: #313 --- contrib/src/uuid/rules.mak | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contrib/src/uuid/rules.mak b/contrib/src/uuid/rules.mak index fa620f93ed..63f3296901 100644 --- a/contrib/src/uuid/rules.mak +++ b/contrib/src/uuid/rules.mak @@ -3,9 +3,13 @@ UUID_VERSION := 1.0.2 UUID_URL := $(SF)/libuuid/libuuid-$(UUID_VERSION).tar.gz +ifndef HAVE_IOS ifeq ($(call need_pkg,"uuid >= 2.0.0"),) PKGS_FOUND += uuid endif +else +PKGS_FOUND += uuid +endif $(TARBALLS)/libuuid-$(UUID_VERSION).tar.gz: $(call download,$(UUID_URL)) -- GitLab