components/subversion/patches/002-build-outputs.mk.patch
changeset 5854 a31f17a6ce08
parent 5771 990bebf35fb9
equal deleted inserted replaced
5853:cf951496fb3a 5854:a31f17a6ce08
       
     1 # Disable 32-bit Perl bindings.
       
     2 # Solaris-specific, not for upstream.
       
     3 --- build-outputs.mk	2015-12-07 23:53:19.000000000 -0800
       
     4 +++ build-outputs.mk	2016-04-11 14:30:25.902324040 -0700
       
     5 @@ -486,9 +486,18 @@
       
     6  
       
     7  libsvn_swig_perl_PATH = subversion/bindings/swig/perl/libsvn_swig_perl
       
     8  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
       
     9 +
       
    10 +libsvn_swig_perl_OBJECTS :=
       
    11 +ifneq (,$(findstring m64,$(CXXFLAGS)))
       
    12  libsvn_swig_perl_OBJECTS = swigutil_pl.lo
       
    13 +endif
       
    14 +
       
    15  subversion/bindings/swig/perl/libsvn_swig_perl/libsvn_swig_perl-1.la: $(libsvn_swig_perl_DEPS)
       
    16 -	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)
       
    17 +	if test "`echo $(CXXFLAGS) | ggrep 'm64'`" != "" ; then \
       
    18 +	  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) ; \
       
    19 +	else \
       
    20 +	  /usr/gnu/bin/touch $@ ; \
       
    21 +	fi
       
    22  
       
    23  libsvn_swig_py_PATH = subversion/bindings/swig/python/libsvn_swig_py
       
    24  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
       
    25 @@ -1253,9 +1262,10 @@
       
    26  	
       
    27  
       
    28  install-swig-pl-lib: subversion/bindings/swig/perl/libsvn_swig_perl/libsvn_swig_perl-1.la
       
    29 -	$(MKDIR) $(DESTDIR)$(swig_pl_libdir)
       
    30 -	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
       
    31 -	
       
    32 +	if test "`echo $(CXXFLAGS) | ggrep 'm64'`" != "" ; then \
       
    33 +	  $(MKDIR) $(DESTDIR)$(swig_pl_libdir) ; \
       
    34 +	  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 ; \
       
    35 +	fi
       
    36  
       
    37  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
       
    38  	$(MKDIR) $(DESTDIR)$(swig_pydir)