mirror of
https://github.com/monero-project/monero.git
synced 2024-12-14 04:16:32 +02:00
Fix lgamma/signgam dependency
This is a new indirect dependency due to the use of poisson_distribution,
introduced in PR#6354 commit 67ade8005
This commit is contained in:
parent
3cbb44a2fd
commit
5f228e4b7d
@ -111,6 +111,11 @@ script: |
|
|||||||
rm -f $WRAP_DIR/extra_includes/i686-linux-gnu/asm
|
rm -f $WRAP_DIR/extra_includes/i686-linux-gnu/asm
|
||||||
ln -s /usr/include/x86_64-linux-gnu/asm $EXTRA_INCLUDES_BASE/i686-linux-gnu/asm
|
ln -s /usr/include/x86_64-linux-gnu/asm $EXTRA_INCLUDES_BASE/i686-linux-gnu/asm
|
||||||
|
|
||||||
|
# glibc 2.23 breaks compatibility with <=2.19 use of lgamma function.
|
||||||
|
# Hack the math header to restore the old behavior.
|
||||||
|
mkdir $EXTRA_INCLUDES_BASE/bits
|
||||||
|
sed -e '/__REDIRFROM .lgamma,/,+3s/_USE_/_DONTUSE_/g' /usr/include/x86_64-linux-gnu/bits/math-finite.h > $EXTRA_INCLUDES_BASE/bits/math-finite.h
|
||||||
|
|
||||||
# gcc 7+ honors SOURCE_DATE_EPOCH, no faketime needed
|
# gcc 7+ honors SOURCE_DATE_EPOCH, no faketime needed
|
||||||
export SOURCE_DATE_EPOCH=`date -d 2000-01-01T12:00:00 +%s`
|
export SOURCE_DATE_EPOCH=`date -d 2000-01-01T12:00:00 +%s`
|
||||||
|
|
||||||
@ -127,14 +132,14 @@ script: |
|
|||||||
# Build dependencies for each host
|
# Build dependencies for each host
|
||||||
export TAR_OPTIONS=--mtime=2000-01-01T12:00:00
|
export TAR_OPTIONS=--mtime=2000-01-01T12:00:00
|
||||||
for i in $HOSTS; do
|
for i in $HOSTS; do
|
||||||
EXTRA_INCLUDES="$EXTRA_INCLUDES_BASE/$i"
|
ARCH_INCLUDES="$EXTRA_INCLUDES_BASE/$i"
|
||||||
if [ -d "$EXTRA_INCLUDES" ]; then
|
if [ -d "$ARCH_INCLUDES" ]; then
|
||||||
export C_INCLUDE_PATH="$EXTRA_INCLUDES"
|
EXTRA_INCLUDES="${EXTRA_INCLUDES_BASE}:${ARCH_INCLUDES}"
|
||||||
export CPLUS_INCLUDE_PATH="$EXTRA_INCLUDES"
|
|
||||||
else
|
else
|
||||||
unset C_INCLUDE_PATH
|
EXTRA_INCLUDES="${EXTRA_INCLUDES_BASE}"
|
||||||
unset CPLUS_INCLUDE_PATH
|
|
||||||
fi
|
fi
|
||||||
|
export C_INCLUDE_PATH="$EXTRA_INCLUDES"
|
||||||
|
export CPLUS_INCLUDE_PATH="$EXTRA_INCLUDES"
|
||||||
make ${MAKEOPTS} -C ${BASEPREFIX} HOST="${i}" V=1
|
make ${MAKEOPTS} -C ${BASEPREFIX} HOST="${i}" V=1
|
||||||
done
|
done
|
||||||
|
|
||||||
@ -151,14 +156,14 @@ script: |
|
|||||||
for i in ${HOSTS}; do
|
for i in ${HOSTS}; do
|
||||||
export PATH=${BASEPREFIX}/${i}/native/bin:${ORIGPATH}
|
export PATH=${BASEPREFIX}/${i}/native/bin:${ORIGPATH}
|
||||||
mkdir build && cd build
|
mkdir build && cd build
|
||||||
EXTRA_INCLUDES="$EXTRA_INCLUDES_BASE/$i"
|
ARCH_INCLUDES="$EXTRA_INCLUDES_BASE/$i"
|
||||||
if [ -d "$EXTRA_INCLUDES" ]; then
|
if [ -d "$ARCH_INCLUDES" ]; then
|
||||||
export C_INCLUDE_PATH="$EXTRA_INCLUDES"
|
EXTRA_INCLUDES="${EXTRA_INCLUDES_BASE}:${ARCH_INCLUDES}"
|
||||||
export CPLUS_INCLUDE_PATH="$EXTRA_INCLUDES"
|
|
||||||
else
|
else
|
||||||
unset C_INCLUDE_PATH
|
EXTRA_INCLUDES="${EXTRA_INCLUDES_BASE}"
|
||||||
unset CPLUS_INCLUDE_PATH
|
|
||||||
fi
|
fi
|
||||||
|
export C_INCLUDE_PATH="$EXTRA_INCLUDES"
|
||||||
|
export CPLUS_INCLUDE_PATH="$EXTRA_INCLUDES"
|
||||||
cmake .. -DCMAKE_TOOLCHAIN_FILE=${BASEPREFIX}/${i}/share/toolchain.cmake -DBACKCOMPAT=ON
|
cmake .. -DCMAKE_TOOLCHAIN_FILE=${BASEPREFIX}/${i}/share/toolchain.cmake -DBACKCOMPAT=ON
|
||||||
make ${MAKEOPTS}
|
make ${MAKEOPTS}
|
||||||
chmod 755 bin/*
|
chmod 755 bin/*
|
||||||
|
Loading…
Reference in New Issue
Block a user