You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2014/07/09 06:00:21 UTC
svn commit: r1609004 - in /subversion/branches/1.8.x: ./ STATUS
build/ac-macros/berkeley-db.m4 build/ac-macros/serf.m4
Author: svn-role
Date: Wed Jul 9 04:00:20 2014
New Revision: 1609004
URL: http://svn.apache.org/r1609004
Log:
Merge r1594156 from trunk:
* r1594156
Fix a problem with the Unix build that could result in linking to the wrong
Subversion libraries at build time or at run time.
Justification:
Building and testing should Just Work as far as possible.
Votes:
+1: julianfoad, philip, rhuijben
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/build/ac-macros/berkeley-db.m4
subversion/branches/1.8.x/build/ac-macros/serf.m4
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1594156
Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1609004&r1=1609003&r2=1609004&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Wed Jul 9 04:00:20 2014
@@ -219,11 +219,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1594156
- Fix a problem with the Unix build that could result in linking to the wrong
- Subversion libraries at build time or at run time.
- Justification:
- Building and testing should Just Work as far as possible.
- Votes:
- +1: julianfoad, philip, rhuijben
Modified: subversion/branches/1.8.x/build/ac-macros/berkeley-db.m4
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/build/ac-macros/berkeley-db.m4?rev=1609004&r1=1609003&r2=1609004&view=diff
==============================================================================
--- subversion/branches/1.8.x/build/ac-macros/berkeley-db.m4 (original)
+++ subversion/branches/1.8.x/build/ac-macros/berkeley-db.m4 Wed Jul 9 04:00:20 2014
@@ -89,7 +89,7 @@ AC_DEFUN(SVN_LIB_BERKELEY_DB,
done
SVN_DB_INCLUDES="${SVN_DB_INCLUDES## }"
for l in [`echo "$withval" | $SED -e "s/.*:[^:]*:\([^:]*\):.*/\1/"`]; do
- LDFLAGS="$LDFLAGS -L$l"
+ LDFLAGS="$LDFLAGS `SVN_REMOVE_STANDARD_LIB_DIRS(-L$l)`"
done
SVN_DB_LIBS=""
for l in [`echo "$withval" | $SED -e "s/.*:\([^:]*\)/\1/"`]; do
Modified: subversion/branches/1.8.x/build/ac-macros/serf.m4
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/build/ac-macros/serf.m4?rev=1609004&r1=1609003&r2=1609004&view=diff
==============================================================================
--- subversion/branches/1.8.x/build/ac-macros/serf.m4 (original)
+++ subversion/branches/1.8.x/build/ac-macros/serf.m4 Wed Jul 9 04:00:20 2014
@@ -98,7 +98,7 @@ AC_DEFUN(SVN_SERF_PREFIX_CONFIG,
CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES $SVN_APRUTIL_INCLUDES -I$serf_prefix/include/$serf_major"
AC_CHECK_HEADERS(serf.h,[
save_ldflags="$LDFLAGS"
- LDFLAGS="$LDFLAGS -L$serf_prefix/lib"
+ LDFLAGS="$LDFLAGS `SVN_REMOVE_STANDARD_LIB_DIRS(-L$serf_prefix/lib)`"
AC_CHECK_LIB($serf_major, serf_context_create,[
AC_TRY_COMPILE([
#include <stdlib.h>
@@ -121,7 +121,7 @@ AC_DEFUN(SVN_SERF_PREFIX_CONFIG,
SVN_SERF_LIBS="$serf_prefix/lib/lib$serf_major.la"
else
SVN_SERF_LIBS="-l$serf_major"
- LDFLAGS="$LDFLAGS -L$serf_prefix/lib"
+ LDFLAGS="$LDFLAGS `SVN_REMOVE_STANDARD_LIB_DIRS(-L$serf_prefix/lib)`"
fi
fi
])