* [gentoo-commits] gentoo-x86 commit in sci-physics/root/files: root-5.20.00-configure.patch root-5.20.00-pic.patch root-xrootd-flags.patch root-5.16.00-afs.patch root-5.16.00-postgres.patch root-5.16.00-flags.patch
@ 2008-07-08 16:28 Sebastien Fabbro (bicatali)
0 siblings, 0 replies; only message in thread
From: Sebastien Fabbro (bicatali) @ 2008-07-08 16:28 UTC (permalink / raw
To: gentoo-commits
bicatali 08/07/08 16:28:19
Added: root-5.20.00-configure.patch root-5.20.00-pic.patch
Removed: root-xrootd-flags.patch root-5.16.00-afs.patch
root-5.16.00-postgres.patch
root-5.16.00-flags.patch
Log:
Version bump, removed some older versions. Still buggy for pre-compiled headers (use flag pch), and could not test properly with oracle flag. Masked for a testing period, see bug #230654
(Portage version: 2.1.4.4)
Revision Changes Path
1.1 sci-physics/root/files/root-5.20.00-configure.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/root/files/root-5.20.00-configure.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/root/files/root-5.20.00-configure.patch?rev=1.1&content-type=text/plain
Index: root-5.20.00-configure.patch
===================================================================
--- configure.orig 2008-07-07 09:43:12.732330045 +0100
+++ configure 2008-07-07 15:45:27.122015928 +0100
@@ -1648,7 +1648,7 @@
if pkg-config --exists ftgl ; then
result "ok"
ftglincdir=`pkg-config --cflags-only-I ftgl | sed 's/-I//g'`
- ftgllibs=`pkg-config --libs-only-l ftgl | sed s'/-lftgl/-lftgl_pic/'`
+ ftgllibs=`pkg-config --libs-only-l ftgl`
ftgllibdir=`pkg-config --libs-only-L ftgl | sed 's/-L//g'`
enable_builtin_ftgl=no
else
@@ -2753,12 +2753,12 @@
found_dirz=""
# libz must be before libpng, if libz is not found don't
# add libpng which needs libz
- # note that failure to find system libungif is not fatal since
- # libAfterImage contains embedded libungif source if needed
+ # note that failure to find system libgif is not fatal since
+ # libAfterImage contains embedded libgif source if needed
if test ! "x$enable_astiff" = "xno" ; then
- aslibs="libjpeg libtiff libungif libz libpng"
+ aslibs="libjpeg libtiff libgif libz libpng"
else
- aslibs="libjpeg libungif libz libpng"
+ aslibs="libjpeg libgif libz libpng"
fi
for k in $aslibs ; do
check_library $k "$enable_shared" "" \
@@ -2771,7 +2771,7 @@
if test "x$k" = "xlibpng" && test "x$found_libz" = "x" ; then
break;
fi
- if test "x$k" = "xlibungif" && test "x$found_lib" = "x" ; then
+ if test "x$k" = "xlibgif" && test "x$found_lib" = "x" ; then
asgifincdir=""
fi
if test ! "x$found_lib" = "x" ; then
1.1 sci-physics/root/files/root-5.20.00-pic.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/root/files/root-5.20.00-pic.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/root/files/root-5.20.00-pic.patch?rev=1.1&content-type=text/plain
Index: root-5.20.00-pic.patch
===================================================================
--- ./net/xrootd/src/xrootd/configure.classic.orig 2008-06-25 07:24:15.000000000 +0100
+++ ./net/xrootd/src/xrootd/configure.classic 2008-07-04 20:06:20.537658375 +0100
@@ -342,7 +342,8 @@
# Assert that we got enough arguments
if test $# -ne 3 ; then
- echo "check_symbol: Not 3 arguments"
+ echo "check_symbol: not 3 arguments"
+ found_symbol=0
return 1
fi
@@ -351,34 +352,105 @@
symbollib=$1 ; shift
symboldir=$1
+ if test "x$symbollib" = "x" ; then
+ found_symbol=0
+ return 1
+ fi
+
+ symbollib=`echo $symbollib | sed -e 's/^-l/lib/'`
+
+ if test ! "x$symboldir" = "x" ; then
+ symboldir=`echo $symboldir | sed -e 's/^-L//'`
+ fi
+
# Check if we got a specific argument as to where the library
# is to be found
symbolfile=$symbollib
- if test ! "x$symboldir" = "x" ; then
- symbolfile=$symboldir/$symbollib
- if test ! -r $symbolfile ; then
- for i in .a .so .lib ; do
- if test -r $symbolfile$i ; then
- symbolfile=$symbolfile$i
- break
+ exts=".so .lib"
+ if test ! "x$shared" = "xno" ; then
+ exts="$exts .a"
+ else
+ exts=".a $exts"
+ fi
+
+ usrlib="/usr/lib"
+ # look first in the lib32 directories
+ if test "x$checklib32" = "xyes" ; then
+ usrlib="/usr/lib32 $usrlib"
+ fi
+ # look first in the lib64 directories
+ if test "x$checklib64" = "xyes" ; then
+ usrlib="/usr/lib64 $usrlib"
+ fi
+ # look only in the lib64 directories
+ if test "x$checkonlylib64" = "xyes" ; then
+ usrlib="/usr/lib64"
+ fi
+ # look only in the hpux64 directories
+ if test "x$checkhpux64" = "xyes" ; then
+ usrlib="/usr/lib/hpux64"
+ fi
+
+ for d in "$symboldir" $usrlib ; do
+ echo " Checking in $d"
+ if test ! -r $d/$symbollib ; then
+ echo " $d/$symbollib not readable"
+ for i in $exts ; do
+ echo " Checking extension $i with $d/$symbollib"
+ if test -r $d/$symbollib$i ; then
+ echo " $d/$symbollib$i readable"
+ symbolfile=$d/$symbollib$i
+ break 2
fi
done
+ else
+ echo "$d/$symbollib readable"
+ symbolfile=$d/$symbollib
+ break
fi
- fi
+ done
if test "x$symbolfile" = "x" || test ! -r $symbolfile ; then
found_symbol=0
+ echo " Symbol not found"
return 1
fi
- symbol_in_lib=`nm $symbolfile | grep $symbol > /dev/null 2>&1`
+ checking_msg "$symbol in $symbolfile"
+ nm $symbolfile 2>&1 | grep $symbol > /dev/null 2>&1
if test $? -eq 0 ; then
found_symbol=1
+ echo " Symbol found"
else
- found_symbol=0
+ nm $symbolfile 2>&1 | grep "no symbols" > /dev/null 2>&1
+ if test $? -eq 0 ; then
+ echo " $symbolfile is stripped, trying a link"
+ # stripped library - only safe test is to link against the
+ # library! However, we do not know what compiler to use
+ # so we can not do the test. Assume the symbol is in
+ cat <<EOF > conftest.mk
+conftest:conftest.c $symbolfile
+ \$(CC) \$(CFLAGS) \$(LDFLAGS) $symbolfile \$< -o \$@
+
+conftest.c:
+ echo "extern int $symbol (); " > \$@
+ echo "int main() { $symbol (); return 0; }" >> \$@
+EOF
+ make -f conftest.mk >> config.log 2>&1
+ if test $? -eq 0 ; then
+ found_symbol=1
+ echo " Link OK"
+ else
+ found_symbol=0
+ echo " Failed code was"
+ cat conftest.mk >> config.log
+ fi
+ rm -rf conftest.c conftest.mk conftest
+ else
+ found_symbol=0
+ fi
fi
}
-
#_____________________________________________________________________
guess_architecture () {
# Try to guess the architecture of the host system
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-07-08 16:28 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-07-08 16:28 [gentoo-commits] gentoo-x86 commit in sci-physics/root/files: root-5.20.00-configure.patch root-5.20.00-pic.patch root-xrootd-flags.patch root-5.16.00-afs.patch root-5.16.00-postgres.patch root-5.16.00-flags.patch Sebastien Fabbro (bicatali)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox