diff options
| author | Michel Zou | 2019-11-30 12:11:41 +0100 |
|---|---|---|
| committer | Michel Zou | 2019-11-30 12:11:41 +0100 |
| commit | dfd03861494eed65ecf6221cf9e2fbaf6a0ae62a (patch) | |
| tree | e7ec14d3246732c9dd60d0b5e00643cb2f029972 | |
| parent | 4f84df88d6943338c5236ad4b24184458a511bbe (diff) | |
| download | aur-dfd03861494eed65ecf6221cf9e2fbaf6a0ae62a.tar.gz | |
LD_PRELOAD fix
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 6 | ||||
| -rw-r--r-- | jam-wine.patch | 5 |
3 files changed, 7 insertions, 8 deletions
@@ -1,7 +1,7 @@ pkgbase = mingw-w64-boost pkgdesc = Free peer-reviewed portable C++ source libraries (mingw-w64) pkgver = 1.71.0 - pkgrel = 3 + pkgrel = 4 url = http://www.boost.org/ arch = any license = custom @@ -18,7 +18,7 @@ pkgbase = mingw-w64-boost source = jam-wine.patch sha256sums = d73a8da01e8bf8c7eda40b4c84915071a8c8a0df4a6734537ddde4a8580524ee sha256sums = 11a5c39852e0513d871a0f74c2f1224efc602a0404db7cd83190712e49a6d3bc - sha256sums = 8af7d7fb6e45b0ded273415824ff56878a73800a067188327cf0fa351352bec1 + sha256sums = 5ca770bf155dbed4f96b1fcd358d515ad77a1ca7ae5e6d6b180939beceff05af pkgname = mingw-w64-boost @@ -1,7 +1,7 @@ pkgname=mingw-w64-boost pkgver=1.71.0 _boostver=${pkgver//./_} -pkgrel=3 +pkgrel=4 pkgdesc="Free peer-reviewed portable C++ source libraries (mingw-w64)" arch=('any') url="http://www.boost.org/" @@ -13,7 +13,7 @@ source=("https://dl.bintray.com/boostorg/release/${pkgver}/source/boost_${_boost "boost-mingw.patch" "jam-wine.patch") sha256sums=('d73a8da01e8bf8c7eda40b4c84915071a8c8a0df4a6734537ddde4a8580524ee' '11a5c39852e0513d871a0f74c2f1224efc602a0404db7cd83190712e49a6d3bc' - '8af7d7fb6e45b0ded273415824ff56878a73800a067188327cf0fa351352bec1') + '5ca770bf155dbed4f96b1fcd358d515ad77a1ca7ae5e6d6b180939beceff05af') _architectures="32:i686-w64-mingw32 64:x86_64-w64-mingw32" @@ -50,7 +50,7 @@ package() { for _arch in ${_architectures}; do pushd "build-${_arch:3}" export BOOST_CROSSCOMPILING_EMULATOR=/usr/bin/${_arch:3}-wine - ./b2 -d2 -q ${MAKEFLAGS} \ + LD_PRELOAD="" ./b2 -d2 -q ${MAKEFLAGS} \ target-os=windows \ variant=release \ threading=multi \ diff --git a/jam-wine.patch b/jam-wine.patch index 91154a734090..b990004fde0c 100644 --- a/jam-wine.patch +++ b/jam-wine.patch @@ -1,5 +1,5 @@ diff --git a/build/Jamfile.v2 b/build/Jamfile.v2 -index 6d6d85a..2e53a9e 100644 +index 6d6d85a..745162d 100644 --- a/libs/stacktrace/build/Jamfile.v2 +++ b/libs/stacktrace/build/Jamfile.v2 @@ -15,6 +15,7 @@ lib dl ; @@ -10,7 +10,7 @@ index 6d6d85a..2e53a9e 100644 local LIBBACKTRACE_PATH = [ modules.peek : LIBBACKTRACE_PATH ] ; -@@ -25,9 +26,12 @@ lib backtrace +@@ -25,9 +26,11 @@ lib backtrace : <include>$(LIBBACKTRACE_PATH)/include ; @@ -20,7 +20,6 @@ index 6d6d85a..2e53a9e 100644 { - $(>) > $(<) + $(BOOST_CROSSCOMPILING_EMULATOR) $(>) > $(<) -+ ls $(<) } rule mp-run-simple ( sources + : args * : input-files * : requirements * : target-name ) |