comparison: subversion/subversion.spec
subversion/subversion.spec
- changeset 798
- 4ef5d37e8bb2
- parent 514
- b0b94589986b
equal
deleted
inserted
replaced
| 1:ba55e0b729bb | 2:43fbc4a1c236 |
|---|---|
| 94 # patch: correctly pass --disable-shared to sub-directories | 94 # patch: correctly pass --disable-shared to sub-directories |
| 95 %{l_shtool} subst \ | 95 %{l_shtool} subst \ |
| 96 -e 's;\(\$ac_abs_srcdir/configure \$ac_configure_args\);\1 --disable-shared;' \ | 96 -e 's;\(\$ac_abs_srcdir/configure \$ac_configure_args\);\1 --disable-shared;' \ |
| 97 configure | 97 configure |
| 98 | 98 |
| 99 # patch: accommodate defective sqlite3_close(3) test from configure | |
| 100 %{l_shtool} subst \ | |
| 101 -e 's;\(SVN_SQLITE_INCLUDES *= *\).*;\1`pkg-config --cflags-only-I sqlite3`;' \ | |
| 102 -e 's;\(SVN_SQLITE_LIBS *= *\).*;\1`pkg-config --libs-only-l sqlite3`;' \ | |
| 103 Makefile.in | |
| 104 | |
| 105 # patch: adjust path to configuration directory | 99 # patch: adjust path to configuration directory |
| 106 %{l_shtool} subst \ | 100 %{l_shtool} subst \ |
| 107 -e 's;/etc/subversion;%{l_prefix}/etc/subversion;g' \ | 101 -e 's;/etc/subversion;%{l_prefix}/etc/subversion;g' \ |
| 108 subversion/libsvn_subr/config_impl.h \ | 102 subversion/libsvn_subr/config_impl.h \ |
| 109 subversion/libsvn_subr/config_file.c | 103 subversion/libsvn_subr/config_file.c |
| 112 # configure package | 106 # configure package |
| 113 CC="%{l_cc}" \ | 107 CC="%{l_cc}" \ |
| 114 CFLAGS="%{l_cflags -O}" \ | 108 CFLAGS="%{l_cflags -O}" \ |
| 115 CPPFLAGS="%{l_cppflags libxml2 .} -DSQLITE_THREADSAFE=1" \ | 109 CPPFLAGS="%{l_cppflags libxml2 .} -DSQLITE_THREADSAFE=1" \ |
| 116 %if "%{with_sasl}" == "yes" && "%{with_db}" == "yes" | 110 %if "%{with_sasl}" == "yes" && "%{with_db}" == "yes" |
| 117 LDFLAGS="%{l_ldflags} `pkg-config db sasl --libs-only-L` %{l_fsl_ldflags}" \ | 111 LDFLAGS="%{l_ldflags} `pkg-config --libs-only-L db sasl sqlite3` %{l_fsl_ldflags}" \ |
| 118 LIBS="`pkg-config db sasl --libs-only-l` -lz %{l_fsl_libs}" \ | 112 LIBS="`pkg-config --libs-only-l db sasl sqlite3` -lz %{l_fsl_libs}" \ |
| 119 %else | 113 %else |
| 120 %if "%{with_sasl}" == "yes" | 114 %if "%{with_sasl}" == "yes" |
| 121 LDFLAGS="%{l_ldflags} `pkg-config sasl --libs-only-L` %{l_fsl_ldflags}" \ | 115 LDFLAGS="%{l_ldflags} `pkg-config --libs-only-L sasl sqlite3` %{l_fsl_ldflags}" \ |
| 122 LIBS="`pkg-config sasl --libs-only-l` `pkg-config apr-util-1 --libs-only-l` -lz %{l_fsl_libs}" \ | 116 LIBS="`pkg-config --libs-only-l sasl apr-util-1 sqlite3` -lz %{l_fsl_libs}" \ |
| 123 %else | 117 %else |
| 124 LDFLAGS="%{l_ldflags} %{l_fsl_ldflags}" \ | 118 LDFLAGS="%{l_ldflags} %{l_fsl_ldflags}" \ |
| 125 LIBS="`pkg-config apr-util-1 --libs-only-l` -lz %{l_fsl_libs}" \ | 119 LIBS="`pkg-config --libs-only-l apr-util-1 sqlite3` -lz %{l_fsl_libs}" \ |
| 126 %endif | 120 %endif |
| 127 %endif | 121 %endif |
| 128 CONFIG_SHELL="%{l_bash}" \ | 122 CONFIG_SHELL="%{l_bash}" \ |
| 129 ./configure \ | 123 ./configure \ |
| 130 --prefix=%{l_prefix} \ | 124 --prefix=%{l_prefix} \ |
