diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/pkgconf.mk | 19 | ||||
-rw-r--r-- | src/yasm.mk | 22 |
2 files changed, 19 insertions, 22 deletions
diff --git a/src/pkgconf.mk b/src/pkgconf.mk index dffbfc9..657d995 100644 --- a/src/pkgconf.mk +++ b/src/pkgconf.mk @@ -8,10 +8,9 @@ $(PKG)_CHECKSUM := 91b2e5d7ce06583d5920c373b61d7d6554cd085cbd61ed176c7ff7ff30325 $(PKG)_SUBDIR := $(PKG)-$(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://github.com/$(PKG)/$(PKG)/tarball/$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS) $(PKG)_DEPS := -$(PKG)_DEPS_$(BUILD) := automake - $(PKG)_UPDATE = $(call MXE_GET_GITHUB_SHA, pkgconf/pkgconf, master) define $(PKG)_UPDATE @@ -20,15 +19,9 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)' && ./autogen.sh - cd '$(1)' && ./configure \ - --prefix='$(PREFIX)/$(TARGET)' - $(MAKE) -C '$(1)' -j '$(JOBS)' - $(MAKE) -C '$(1)' -j 1 install - # create pkg-config script (echo '#!/bin/sh'; \ - echo 'PKG_CONFIG_PATH="$(PREFIX)/$(TARGET)/qt5/lib/pkgconfig":"$$PKG_CONFIG_PATH_$(subst .,_,$(subst -,_,$(TARGET)))" PKG_CONFIG_LIBDIR='\''$(PREFIX)/$(TARGET)/lib/pkgconfig'\'' exec '$(PREFIX)/$(TARGET)/bin/pkgconf' $(if $(BUILD_STATIC),--static) "$$@"') \ + echo 'PKG_CONFIG_PATH="$(PREFIX)/$(TARGET)/qt5/lib/pkgconfig":"$$PKG_CONFIG_PATH_$(subst .,_,$(subst -,_,$(TARGET)))" PKG_CONFIG_LIBDIR='\''$(PREFIX)/$(TARGET)/lib/pkgconfig'\'' exec '$(PREFIX)/$(BUILD)/bin/pkgconf' $(if $(BUILD_STATIC),--static) "$$@"') \ > '$(PREFIX)/bin/$(TARGET)-pkg-config' chmod 0755 '$(PREFIX)/bin/$(TARGET)-pkg-config' @@ -37,3 +30,11 @@ define $(PKG)_BUILD > '$(CMAKE_TOOLCHAIN_DIR)/pkgconf.cmake' endef + +define $(PKG)_BUILD_$(BUILD) + cd '$(1)' && ./autogen.sh + cd '$(1)' && ./configure \ + --prefix='$(PREFIX)/$(TARGET)' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef diff --git a/src/yasm.mk b/src/yasm.mk index dc21cb6..92c4c90 100644 --- a/src/yasm.mk +++ b/src/yasm.mk @@ -7,8 +7,11 @@ $(PKG)_CHECKSUM := 3dce6601b495f5b3d45b59f7d2492a340ee7e84b5beca17e48f862502bd56 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.tortall.net/projects/$(PKG)/releases/$($(PKG)_FILE) +$(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS) $(PKG)_DEPS := gcc +$(PKG)_DEPS_$(BUILD) := + define $(PKG)_UPDATE $(WGET) -q -O- 'https://github.com/yasm/yasm/tags' | \ $(SED) -n 's,.*href="/yasm/yasm/archive/v\([0-9][^"]*\)\.tar.*,\1,p' | \ @@ -16,21 +19,14 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - # native build of yasm - will the same for all targets - # but we don't want to conflict with an un-prefixed version - mkdir '$(1).native' - cd '$(1).native' && '$(1)/configure' \ - --prefix='$(PREFIX)' \ - --program-prefix='$(TARGET)-' \ - --disable-nls \ - --disable-python - $(MAKE) -C '$(1).native' -j '$(JOBS)' install + # link to native yasm compiler on cross builds + $(if $(call sne,$(TARGET),$(BUILD)), + ln -sf '$(PREFIX)/$(BUILD)/bin/yasm' '$(PREFIX)/bin/$(TARGET)-yasm') # yasm is always static cd '$(1)' && '$(1)/configure' \ - --host='$(TARGET)' \ - --build="`config.guess`" \ - --prefix='$(PREFIX)/$(TARGET)' \ - --disable-nls + $(MXE_CONFIGURE_OPTS) \ + --disable-nls \ + --disable-python $(MAKE) -C '$(1)' -j '$(JOBS)' install endef |