From patchwork Mon Mar 2 16:35:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 2955 X-Patchwork-Delegate: kieran.bingham@ideasonboard.com Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id F194162710 for ; Mon, 2 Mar 2020 17:35:54 +0100 (CET) Received: from localhost.localdomain (cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 2BDAC9D0; Mon, 2 Mar 2020 17:35:54 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1583166954; bh=Yso1k/QkWExUa2sj3K8Pkme2zD6Ng/z/65DzMXJBBHQ=; h=From:To:Cc:Subject:Date:From; b=dq4UC66sWl8ncRFhsSk8ORVzLG8M181lcYIjMAxuc68PyKnTQM5OqHEQX06AIra4g KX/y/UtaU4i3gHcrARqUjiSgWfeeStIID+J+XOTZLuLfgIbd84h6JcAnIfTv+xnC0Z dG8z+kbGBkV8N9PBt518nd8PLVHP3POIf94oXB98= From: Kieran Bingham To: libcamera devel Date: Mon, 2 Mar 2020 16:35:50 +0000 Message-Id: <20200302163550.11640-1-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH] libcamera: Move generated control and properry ids to the API X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Mar 2020 16:35:55 -0000 As part of updating controls to support properties, the commit f870591a9bf5 ("libcamera: properties: Add location property") inadvertently moved the generated headers out of the libcamera_api dependency generation. This allowed a race condition to occur in builds where objects are attempted to be built before the API definitions had been generated. Move the headers out of the libcamera_sources variable and into the libcamera_api variable to match the other headers in this location. Fixes: f870591a9bf5 ("libcamera: properties: Add location property") Signed-off-by: Kieran Bingham --- include/libcamera/meson.build | 2 ++ src/libcamera/meson.build | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build index f58c02d2cf35..c02e1d250aff 100644 --- a/include/libcamera/meson.build +++ b/include/libcamera/meson.build @@ -43,6 +43,8 @@ foreach header : control_source_files install_dir : join_paths('include', include_dir)) endforeach +libcamera_api += control_headers + gen_header = files('gen-header.sh') libcamera_h = custom_target('gen-header', diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build index 88658ac563f7..b3a6a1aad659 100644 --- a/src/libcamera/meson.build +++ b/src/libcamera/meson.build @@ -80,7 +80,6 @@ foreach source : control_source_files command : [gen_controls, '-o', '@OUTPUT@', '@INPUT@']) endforeach -libcamera_sources += control_headers libcamera_sources += control_sources gen_version = join_paths(meson.source_root(), 'utils', 'gen-version.sh')