d0s3t3ch
/
mxe
mirror of https://git.wownero.com/dsc/mxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cmake-conf pkgconf: fixups for dep ordering

This commit is contained in:
Tony Theodore 2017-11-26 05:00:40 +11:00
parent 45e66ce85f
commit 05be27ff7c
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/cmake-conf.mk
View File

@ -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

3
src/pkgconf.mk
View File

@ -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'