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/03/28 05:01:19 UTC
svn commit: r1582591 - in /subversion/branches/1.8.x: ./ STATUS configure.ac

Author: svn-role
Date: Fri Mar 28 04:01:19 2014
New Revision: 1582591

URL: http://svn.apache.org/r1582591
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.8.x.
   Votes:
     +1: stsp, rhuijben, philip

Modified:
    subversion/branches/1.8.x/   (props changed)
    subversion/branches/1.8.x/STATUS
    subversion/branches/1.8.x/configure.ac   (contents, props changed)

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

Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1582591&r1=1582590&r2=1582591&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Fri Mar 28 04:01:19 2014
@@ -322,12 +322,3 @@ 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.8.x.
-   Votes:
-     +1: stsp, rhuijben, philip

Modified: subversion/branches/1.8.x/configure.ac
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/configure.ac?rev=1582591&r1=1582590&r2=1582591&view=diff
==============================================================================
--- subversion/branches/1.8.x/configure.ac (original)
+++ subversion/branches/1.8.x/configure.ac Fri Mar 28 04:01:19 2014
@@ -755,7 +755,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"
     ])

Propchange: subversion/branches/1.8.x/configure.ac
------------------------------------------------------------------------------
  Merged /subversion/trunk/configure.ac:r1577200