Fixups for 1.1.0.
This commit is contained in:
parent
cbe0f4646d
commit
c772272f13
@ -38,7 +38,7 @@ object built with -pie.
|
|||||||
|
|
||||||
-COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES)
|
-COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES)
|
||||||
+BASE_COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES)
|
+BASE_COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES)
|
||||||
+COMPILE = $(COMPILE) -fpie
|
+COMPILE = $(BASE_COMPILE) -fpie
|
||||||
COMPILE_CXX = $(CXX) $(CPPFLAGS) $(CFLAGS) $(CXXFLAGS) $(INCLUDES)
|
COMPILE_CXX = $(CXX) $(CPPFLAGS) $(CFLAGS) $(CXXFLAGS) $(INCLUDES)
|
||||||
-LT_COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE)
|
-LT_COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE)
|
||||||
+LT_COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(BASE_COMPILE)
|
+LT_COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(BASE_COMPILE)
|
||||||
|
@ -88,20 +88,14 @@ export CC=gcc CXX=g++
|
|||||||
%configure --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
|
%configure --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
|
||||||
--with-swig --with-neon=%{_prefix} \
|
--with-swig --with-neon=%{_prefix} \
|
||||||
--with-apxs=%{_sbindir}/apxs --disable-mod-activation
|
--with-apxs=%{_sbindir}/apxs --disable-mod-activation
|
||||||
make %{?_smp_mflags} all swig-py %{swigdirs} swig-pl-lib
|
make %{?_smp_mflags} all swig-py %{swigdirs} swig-pl-lib swig-pl
|
||||||
|
|
||||||
# build the perl modules
|
|
||||||
pushd subversion/bindings/swig/perl
|
|
||||||
CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor
|
|
||||||
make %{?_smp_mflags}
|
|
||||||
popd
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
rm -rf ${RPM_BUILD_ROOT}
|
rm -rf ${RPM_BUILD_ROOT}
|
||||||
make install install-swig-py install-swig-pl-lib \
|
make install install-swig-py install-swig-pl-lib \
|
||||||
DESTDIR=$RPM_BUILD_ROOT %{swigdirs}
|
DESTDIR=$RPM_BUILD_ROOT %{swigdirs}
|
||||||
|
|
||||||
make pure_install -C subversion/bindings/swig/perl \
|
make pure_install -C subversion/bindings/swig/perl/native \
|
||||||
PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
|
PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
|
||||||
|
|
||||||
# Add subversion.conf configuration file into httpd/conf.d directory.
|
# Add subversion.conf configuration file into httpd/conf.d directory.
|
||||||
@ -139,8 +133,7 @@ ln -f subversion/mod_authz_svn/INSTALL mod_authz_svn-INSTALL
|
|||||||
|
|
||||||
%if %{make_check}
|
%if %{make_check}
|
||||||
%check
|
%check
|
||||||
make check CLEANUP=yes
|
make check check-swig-pl CLEANUP=yes
|
||||||
make -C subversion/bindings/swig/perl test
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%clean
|
%clean
|
||||||
@ -158,7 +151,7 @@ rm -rf ${RPM_BUILD_ROOT}
|
|||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%doc BUGS COMMITTERS COPYING HACKING INSTALL README CHANGES
|
%doc BUGS COMMITTERS COPYING HACKING INSTALL README CHANGES
|
||||||
%doc tools subversion/LICENSE mod_authz_svn-INSTALL
|
%doc tools subversion/LICENSE mod_authz_svn-INSTALL
|
||||||
%doc doc/book/book/book.html doc/book/book/images
|
%doc doc/book/book/svn-book.html doc/book/book/images
|
||||||
%doc contrib/client-side/svn_load_dirs{.pl,_*,.README}
|
%doc contrib/client-side/svn_load_dirs{.pl,_*,.README}
|
||||||
%{_bindir}/*
|
%{_bindir}/*
|
||||||
%{_libdir}/libsvn_*.so.*
|
%{_libdir}/libsvn_*.so.*
|
||||||
|
Loading…
Reference in New Issue
Block a user