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/04/24 06:00:27 UTC
svn commit: r1589563 - in /subversion/branches/1.7.x: ./ STATUS configure.ac

Author: svn-role
Date: Thu Apr 24 04:00:26 2014
New Revision: 1589563

URL: http://svn.apache.org/r1589563
Log:
Merge r1577200 from trunk:

 * r1577200
   Fix libmagic detection with custom LDFLAGS.
   Justification:
     Fixes libmagic detection where configure relies on LDFLAGS
     to find libraries in non-standard locations.
     This should allow the bb-openbsd buildbot to compile 1.7.x.
   Votes:
    +1: stsp, rhuijben, stefan2

Modified:
    subversion/branches/1.7.x/   (props changed)
    subversion/branches/1.7.x/STATUS
    subversion/branches/1.7.x/configure.ac

Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1577200

Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1589563&r1=1589562&r2=1589563&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Thu Apr 24 04:00:26 2014
@@ -152,15 +152,6 @@ Veto-blocked changes:
 Approved changes:
 =================
 
- * r1577200
-   Fix libmagic detection with custom LDFLAGS.
-   Justification:
-     Fixes libmagic detection where configure relies on LDFLAGS
-     to find libraries in non-standard locations.
-     This should allow the bb-openbsd buildbot to compile 1.7.x.
-   Votes:
-    +1: stsp, rhuijben, stefan2
-
  * r1587968
    Maintain data[len]=0 invariant for svn_string_t.
    Justification:

Modified: subversion/branches/1.7.x/configure.ac
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/configure.ac?rev=1589563&r1=1589562&r2=1589563&view=diff
==============================================================================
--- subversion/branches/1.7.x/configure.ac (original)
+++ subversion/branches/1.7.x/configure.ac Thu Apr 24 04:00:26 2014
@@ -721,7 +721,7 @@ AC_ARG_WITH(libmagic,AS_HELP_STRING([--w
     CPPFLAGS="$CPPFLAGS -I$libmagic_prefix/include"
     AC_CHECK_HEADERS(magic.h,[
       save_ldflags="$LDFLAGS"
-      LDFLAGS="-L$libmagic_prefix/lib"
+      LDFLAGS="-L$libmagic_prefix/lib $LDFLAGS"
       AC_CHECK_LIB(magic, magic_open, [libmagic_found="yes"])
       LDFLAGS="$save_ldflags"
     ])