diff options
| author | Tony Theodore <tonyt@logyst.com> | 2014-12-06 17:22:19 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2014-12-06 17:22:19 (GMT) |
| commit | 2ff374c64ea4eba51a7f46d8439cfbd68cfd638d (patch) | |
| tree | a2ff3e7a7c5538129cd1930aea830c4c699d0f98 | |
| parent | fb586f07d7d5e65d9f176c63fc2c2234316ffa18 (diff) | |
| download | mxe-2ff374c64ea4eba51a7f46d8439cfbd68cfd638d.zip mxe-2ff374c64ea4eba51a7f46d8439cfbd68cfd638d.tar.gz mxe-2ff374c64ea4eba51a7f46d8439cfbd68cfd638d.tar.bz2 | |
boost:fix for naming convention and removal of previous libs
| -rw-r--r-- | src/boost.mk | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/src/boost.mk b/src/boost.mk index e8b5f9c..a418bbf 100644 --- a/src/boost.mk +++ b/src/boost.mk @@ -20,7 +20,7 @@ endef define $(PKG)_BUILD # old version appears to interfere rm -rf '$(PREFIX)/$(TARGET)/include/boost/' - rm -f "$(PREFIX)/$(TARGET)/lib/libboost*" + rm -f "$(PREFIX)/$(TARGET)/lib/libboost"* # create user-config echo 'using gcc : mxe : $(TARGET)-g++ : <rc>$(TARGET)-windres <archiver>$(TARGET)-ar <ranlib>$(TARGET)-ranlib ;' > '$(1)/user-config.jam' @@ -39,8 +39,8 @@ define $(PKG)_BUILD address-model=$(BITS) \ architecture=x86 \ binary-format=pe \ - link=$(if $(BUILD_STATIC),static,shared) \ - runtime-link=$(if $(BUILD_STATIC),static,shared) \ + link=@boost-link@ \ + runtime-link=@boost-link@ \ target-os=windows \ threadapi=win32 \ threading=multi \ @@ -65,8 +65,13 @@ define $(PKG)_BUILD -W -Wall -Werror -ansi -U__STRICT_ANSI__ -pedantic \ '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-boost.exe' \ -DBOOST_THREAD_USE_LIB \ - -lboost_serialization-mt \ - -lboost_thread_win32-mt \ - -lboost_system-mt \ - -lboost_chrono-mt + -lboost_serialization@boost-lib-suffix@ \ + -lboost_thread_win32@boost-lib-suffix@ \ + -lboost_system@boost-lib-suffix@ \ + -lboost_chrono@boost-lib-suffix@ endef + +$(PKG)_BUILD_STATIC = $(subst @boost-link@,static,\ + $(subst @boost-lib-suffix@,-mt-s,$($(PKG)_BUILD))) +$(PKG)_BUILD_SHARED = $(subst @boost-link@,shared,\ + $(subst @boost-lib-suffix@,-mt,$($(PKG)_BUILD))) |