Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6868 

4665906 Fix lgamma/signgam dependency (hyc)
This commit is contained in:
luigi1111 2020-10-12 20:21:18 -05:00
parent 1a9a984d26 4665906ddd
commit 8235854e8a
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
contrib/gitian/gitian-linux.yml
View File

@ -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/*