Correct defective configure script SQLite detection and depend on make.

Fri, 10 Aug 2012 14:35:10 +0200

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Fri, 10 Aug 2012 14:35:10 +0200
changeset 514
b0b94589986b
parent 513
138803117c57
child 515
2f4b17c140a1

Correct defective configure script SQLite detection and depend on make.

subversion/subversion.spec file | annotate | diff | comparison | revisions
     1.1 --- a/subversion/subversion.spec	Fri Aug 10 14:34:00 2012 +0200
     1.2 +++ b/subversion/subversion.spec	Fri Aug 10 14:35:10 2012 +0200
     1.3 @@ -38,7 +38,7 @@
     1.4  Group:        SCM
     1.5  License:      Apache/BSD
     1.6  Version:      %{V_opkg}
     1.7 -Release:      20120714
     1.8 +Release:      20120800
     1.9  
    1.10  #   package options
    1.11  %option       with_fsl      yes
    1.12 @@ -93,9 +93,15 @@
    1.13  
    1.14      #   patch: correctly pass --disable-shared to sub-directories
    1.15      %{l_shtool} subst \
    1.16 -        -e 's;\($ac_abs_srcdir/configure $ac_configure_args\);\1 --disable-shared;' \
    1.17 +        -e 's;\(\$ac_abs_srcdir/configure \$ac_configure_args\);\1 --disable-shared;' \
    1.18          configure
    1.19  
    1.20 +    #   patch: accommodate defective sqlite3_close(3) test from configure
    1.21 +    %{l_shtool} subst \
    1.22 +        -e 's;\(SVN_SQLITE_INCLUDES *= *\).*;\1`pkg-config --cflags-only-I sqlite3`;' \
    1.23 +        -e 's;\(SVN_SQLITE_LIBS *= *\).*;\1`pkg-config --libs-only-l sqlite3`;' \
    1.24 +        Makefile.in
    1.25 +
    1.26      #   patch: adjust path to configuration directory
    1.27      %{l_shtool} subst \
    1.28          -e 's;/etc/subversion;%{l_prefix}/etc/subversion;g' \
    1.29 @@ -147,7 +153,7 @@
    1.30          --enable-static
    1.31  
    1.32      #   build package
    1.33 -    %{l_make} %{l_mflags}
    1.34 +    %{l_make} %{l_mflags -O}
    1.35  
    1.36  %install
    1.37      #   install package

mercurial