components/subversion/patches/002-build-outputs.mk.patch
changeset 5854 a31f17a6ce08
parent 5771 990bebf35fb9
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/subversion/patches/002-build-outputs.mk.patch	Wed Apr 27 11:46:57 2016 -0700
@@ -0,0 +1,38 @@
+# Disable 32-bit Perl bindings.
+# Solaris-specific, not for upstream.
+--- build-outputs.mk	2015-12-07 23:53:19.000000000 -0800
++++ build-outputs.mk	2016-04-11 14:30:25.902324040 -0700
+@@ -486,9 +486,18 @@
+ 
+ libsvn_swig_perl_PATH = subversion/bindings/swig/perl/libsvn_swig_perl
+ libsvn_swig_perl_DEPS = subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.lo subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_subr/libsvn_subr-1.la
++
++libsvn_swig_perl_OBJECTS :=
++ifneq (,$(findstring m64,$(CXXFLAGS)))
+ libsvn_swig_perl_OBJECTS = swigutil_pl.lo
++endif
++
+ subversion/bindings/swig/perl/libsvn_swig_perl/libsvn_swig_perl-1.la: $(libsvn_swig_perl_DEPS)
+-	cd subversion/bindings/swig/perl/libsvn_swig_perl && $(LINK_LIB) $(libsvn_swig_perl_LDFLAGS) -o libsvn_swig_perl-1.la $(LT_NO_UNDEFINED) $(libsvn_swig_perl_OBJECTS) ../../../../../subversion/libsvn_delta/libsvn_delta-1.la ../../../../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(SVN_PERL_LIBS) $(SVN_SWIG_LIBS) $(LIBS)
++	if test "`echo $(CXXFLAGS) | ggrep 'm64'`" != "" ; then \
++	  cd subversion/bindings/swig/perl/libsvn_swig_perl && $(LINK_LIB) $(libsvn_swig_perl_LDFLAGS) -o libsvn_swig_perl-1.la $(LT_NO_UNDEFINED) $(libsvn_swig_perl_OBJECTS) ../../../../../subversion/libsvn_delta/libsvn_delta-1.la ../../../../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(SVN_PERL_LIBS) $(SVN_SWIG_LIBS) $(LIBS) ; \
++	else \
++	  /usr/gnu/bin/touch $@ ; \
++	fi
+ 
+ libsvn_swig_py_PATH = subversion/bindings/swig/python/libsvn_swig_py
+ libsvn_swig_py_DEPS = subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.lo subversion/libsvn_client/libsvn_client-1.la subversion/libsvn_wc/libsvn_wc-1.la subversion/libsvn_ra/libsvn_ra-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_subr/libsvn_subr-1.la
+@@ -1253,9 +1262,10 @@
+ 	
+ 
+ install-swig-pl-lib: subversion/bindings/swig/perl/libsvn_swig_perl/libsvn_swig_perl-1.la
+-	$(MKDIR) $(DESTDIR)$(swig_pl_libdir)
+-	cd subversion/bindings/swig/perl/libsvn_swig_perl ; $(INSTALL_SWIG_PL_LIB) libsvn_swig_perl-1.la $(DESTDIR)$(swig_pl_libdir)/libsvn_swig_perl-1.la
+-	
++	if test "`echo $(CXXFLAGS) | ggrep 'm64'`" != "" ; then \
++	  $(MKDIR) $(DESTDIR)$(swig_pl_libdir) ; \
++	  cd subversion/bindings/swig/perl/libsvn_swig_perl ; $(INSTALL_SWIG_PL_LIB) libsvn_swig_perl-1.la $(DESTDIR)$(swig_pl_libdir)/libsvn_swig_perl-1.la ; \
++	fi
+ 
+ install-swig-py: subversion/bindings/swig/python/_core.la subversion/bindings/swig/python/_client.la subversion/bindings/swig/python/_delta.la subversion/bindings/swig/python/_diff.la subversion/bindings/swig/python/_fs.la subversion/bindings/swig/python/_ra.la subversion/bindings/swig/python/_repos.la subversion/bindings/swig/python/_wc.la
+ 	$(MKDIR) $(DESTDIR)$(swig_pydir)