diff options
| author | Tony Theodore <tonyt@logyst.com> | 2015-10-13 12:51:46 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2015-10-25 01:23:28 (GMT) |
| commit | 9732e4dc2961070ef9e9e9d839479c0e7490aa18 (patch) | |
| tree | a2b45f78df7709541e3ccdc219762a6028c6e2e8 /src/yasm.mk | |
| parent | 870e439d0f5e02b0d83930b1fb7261ec8c6a9a3b (diff) | |
| download | mxe-9732e4dc2961070ef9e9e9d839479c0e7490aa18.zip mxe-9732e4dc2961070ef9e9e9d839479c0e7490aa18.tar.gz mxe-9732e4dc2961070ef9e9e9d839479c0e7490aa18.tar.bz2 | |
pkgconf yasm: enable native builds and consolidate rules
Diffstat (limited to 'src/yasm.mk')
| -rw-r--r-- | src/yasm.mk | 22 |
1 files changed, 9 insertions, 13 deletions
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 |