You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2010/12/17 11:00:50 UTC
svn commit: r1050332 - /subversion/trunk/build/generator/gen_make.py
Author: philip
Date: Fri Dec 17 10:00:50 2010
New Revision: 1050332
URL: http://svn.apache.org/viewvc?rev=1050332&view=rev
Log:
Modify the libtool transformation script to attempt to fix the OpenBSD
buildbot.
* build/generator/gen_make.py
(write_transform_libtool_scripts): Look for .so.0 and .so.0.0, don't
write LD_PRELOAD lines if empty.
Modified:
subversion/trunk/build/generator/gen_make.py
Modified: subversion/trunk/build/generator/gen_make.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_make.py?rev=1050332&r1=1050331&r2=1050332&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_make.py (original)
+++ subversion/trunk/build/generator/gen_make.py Fri Dec 17 10:00:50 2010
@@ -493,24 +493,34 @@ transform()
case $LIB in
*libsvn_test-*) continue ;;
esac
- if [ -f $LIB ]; then
- if [ -z "$EXISTINGLIBS" ]; then
- EXISTINGLIBS="$LIB"
- else
- EXISTINGLIBS="$EXISTINGLIBS $LIB"
- fi
+ if [ ! -f $LIB ]; then
+ LIB=${LIB}.0
+ if [ ! -f $LIB ]; then
+ LIB=${LIB}.0
+ if [ ! -f $LIB ]; then
+ continue
+ fi
+ fi
+ fi
+
+ if [ -z "$EXISTINGLIBS" ]; then
+ EXISTINGLIBS="$LIB"
+ else
+ EXISTINGLIBS="$EXISTINGLIBS $LIB"
fi
done
- cat "$SCRIPT" |
- (
- read LINE
- echo "$LINE"
- echo "LD_PRELOAD=\\"$EXISTINGLIBS\\""
- echo "export LD_PRELOAD"
- cat
- ) < "$SCRIPT" > "$SCRIPT.new"
- mv -f "$SCRIPT.new" "$SCRIPT"
- chmod +x "$SCRIPT"
+ if [ ! -z "$EXISTINGLIBS" ]; then
+ cat "$SCRIPT" |
+ (
+ read LINE
+ echo "$LINE"
+ echo "LD_PRELOAD=\\"$EXISTINGLIBS\\""
+ echo "export LD_PRELOAD"
+ cat
+ ) < "$SCRIPT" > "$SCRIPT.new"
+ mv -f "$SCRIPT.new" "$SCRIPT"
+ chmod +x "$SCRIPT"
+ fi
fi
fi
}