diff options
| author | Volker Grabsch <vog@notjusthosting.com> | 2012-04-12 15:23:12 (GMT) |
|---|---|---|
| committer | Volker Grabsch <vog@notjusthosting.com> | 2012-04-12 15:23:12 (GMT) |
| commit | 1f86817ee82b162a1a5bd495886183ca81a68ba7 (patch) | |
| tree | 3116df65f83174295af8c6315a36583f460fe9e0 /src/ilmbase.mk | |
| parent | 0f01e5e88f720fe5073c88f5cf1803d5c283904d (diff) | |
| parent | e513258770cdc39c0d6a904437f191aa61b3175c (diff) | |
| download | mxe-2.22.zip mxe-2.22.tar.gz mxe-2.22.tar.bz2 | |
Merge all well-tested changes into the stable branchv2.22
Diffstat (limited to 'src/ilmbase.mk')
| -rw-r--r-- | src/ilmbase.mk | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/ilmbase.mk b/src/ilmbase.mk index 1747b9e..9a5b1f3 100644 --- a/src/ilmbase.mk +++ b/src/ilmbase.mk @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# IlmBase PKG := ilmbase $(PKG)_IGNORE := -$(PKG)_VERSION := 1.0.2 $(PKG)_CHECKSUM := fe6a910a90cde80137153e25e175e2b211beda36 $(PKG)_SUBDIR := ilmbase-$($(PKG)_VERSION) $(PKG)_FILE := ilmbase-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://www.openexr.com/ $(PKG)_URL := http://download.savannah.nongnu.org/releases/openexr/$($(PKG)_FILE) $(PKG)_DEPS := gcc @@ -20,8 +17,6 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - # wine confuses the cross-compiling detection, so set it explicitly - $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' # build the win32 thread sources instead of the posix thread sources $(SED) -i 's,IlmThreadPosix\.,IlmThreadWin32.,' '$(1)/IlmThread/Makefile.in' $(SED) -i 's,IlmThreadSemaphorePosix\.,IlmThreadSemaphoreWin32.,' '$(1)/IlmThread/Makefile.in' @@ -31,6 +26,7 @@ define $(PKG)_BUILD # threading. It will just disable the unwanted check for pthread. cd '$(1)' && $(SHELL) ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-threading \ |