firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 18:43:02 +01:00
Code Issues

Make it possible to build / install with any combination of tommath versions 0/1

Browse Source
This commit is contained in:
AlexPeshkoff 2023-08-24 19:24:23 +03:00
parent 9dbb5f1158
commit 86dad8fe39
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
builds/install/arch-specific/linux/linuxLibrary.sh.in
View File

@ -530,9 +530,17 @@ haveLibrary() {
# Fix .so version of libtommath
fixTomMath() {
tm1=`checkLibName libtommath.so.1 | awk '{print $4}'`
[ -z "$LIBTOMMATH" ] && return
if [ "$LIBTOMMATH" = "libtommath.so.1" ]
then
checklib=libtommath.so.0
else
checklib=libtommath.so.1
fi
tm1=`checkLibName $checklib | awk '{print $4}'`
[ -z "$tm1" ] && return
tm0=`dirname $tm1`/`basename $tm1 .1`.0
tm0=`dirname $tm1`/$LIBTOMMATH
[ -e "$tm0" ] && return
ln -s $tm1 $tm0
}

2
builds/install/arch-specific/linux/makeInstallImage.sh.in
View File

@ -57,6 +57,8 @@ addLibs() {
echo "#!/bin/sh" >>$libTarget
echo >>$libTarget
LIB=`$OBJDUMP -p $libSdir/firebird|grep NEEDED|grep tommath|awk '{print $2;}'`
[ "$LIB" ] && echo "export LIBTOMMATH=$LIB" >>$libTarget
LIB=`$OBJDUMP -p $libSdir/firebird|grep NEEDED|grep tomcrypt|awk '{print $2;}'`
[ "$LIB" ] && echo "export LIBTOMCRYPT=$LIB" >>$libTarget
LIB=$(echo `$OBJDUMP -p $libSdir/isql|grep NEEDED|egrep "(curses|termcap|tinfo)"|awk '{print $2;}'`)

7
builds/install/posix-common/posixLibrary.sh.in
View File

@ -222,11 +222,12 @@ checkLibrary() {
#------------------------------------------------------------------------
# Make sure we have required libraries installed
checkLibraries() {
if [ "@TOMMATH_BUILD@" != "Y" -o "${fb_install_prefix}" != "${default_prefix}" ]
# if [ "@TOMMATH_BUILD@" != "Y" -o "${fb_install_prefix}" != "${default_prefix}" ]
if [ "@TOMMATH_BUILD@" != "Y" ]
then
fixTommath=
checkLibrary tommath
haveLibrary libtommath.so.0 || [ "$fixTommath" ] && $fixTommath
checkLibrary tommath # Should have at least some version of it
[ $LIBTOMMATH ] && haveLibrary $LIBTOMMATH || [ "$fixTommath" ] && $fixTommath
fi
# if [ "@TOMCRYPT_BUILD@" != "Y" -o "${fb_install_prefix}" != "${default_prefix}" ]