From 05be27ff7c67169fb168fd9deac28e718ff415b1 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Sun, 26 Nov 2017 05:00:40 +1100
Subject: cmake-conf pkgconf: fixups for dep ordering
---
src/cmake-conf.mk | 3 ++-
src/pkgconf.mk | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/cmake-conf.mk b/src/cmake-conf.mk
index 3a1c86d..fc65341 100644
--- a/src/cmake-conf.mk
+++ b/src/cmake-conf.mk
@@ -4,8 +4,9 @@ PKG := cmake-conf
$(PKG)_VERSION := 1
$(PKG)_UPDATE := echo 1
$(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS)
-$(PKG)_DEPS := $(BUILD)~cmake
+$(PKG)_DEPS := $(BUILD)~$(PKG)
$(PKG)_FILE_DEPS := $(wildcard $(PWD)/src/cmake/conf/*)
+$(PKG)_DEPS_$(BUILD) := cmake
define $(PKG)_BUILD
# create the CMake toolchain file using template
diff --git a/src/pkgconf.mk b/src/pkgconf.mk
index 409e020..8e4b7f2 100644
--- a/src/pkgconf.mk
+++ b/src/pkgconf.mk
@@ -9,7 +9,7 @@ $(PKG)_SUBDIR := $(PKG)-$(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz
$(PKG)_URL := https://github.com/$(PKG)/$(PKG)/tarball/$($(PKG)_VERSION)/$($(PKG)_FILE)
$(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS)
-$(PKG)_DEPS :=
+$(PKG)_DEPS := $(BUILD)~$(PKG)
$(PKG)_DEPS_$(BUILD) := libtool
$(PKG)_UPDATE = $(call MXE_GET_GITHUB_SHA, pkgconf/pkgconf, master)
@@ -32,6 +32,7 @@ define $(PKG)_BUILD
chmod 0755 '$(PREFIX)/bin/$(TARGET)-pkg-config'
# create cmake file
+ mkdir -p '$(CMAKE_TOOLCHAIN_DIR)'
echo 'set(PKG_CONFIG_EXECUTABLE $(PREFIX)/bin/$(TARGET)-pkg-config CACHE PATH "pkg-config executable")' \
> '$(CMAKE_TOOLCHAIN_DIR)/pkgconf.cmake'
--
cgit v0.12