Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/subversion/patches/002-build-outputs.mk.patch
author Enrico Perla <enrico.perla@oracle.com>
Fri, 04 Nov 2016 05:32:50 -0700
changeset 7245 934578b959f0
parent 5771 990bebf35fb9
permissions -rw-r--r--
20029192 Userland should build with ld -z sx=nx* flags instead of map.noexstk 23118364 Enable ADIHEAP on security sensitive binaries 23118359 Build openssh as PIE
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5771
990bebf35fb9 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     1
 
# Disable 32-bit Perl bindings.
990bebf35fb9 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     2
 
# Solaris-specific, not for upstream.
990bebf35fb9 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     3
 
--- build-outputs.mk	2015-12-07 23:53:19.000000000 -0800
990bebf35fb9 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     4
 
+++ build-outputs.mk	2016-04-11 14:30:25.902324040 -0700
990bebf35fb9 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     5
 
@@ -486,9 +486,18 @@
990bebf35fb9 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     6
990bebf35fb9 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     7
 
 libsvn_swig_perl_PATH = subversion/bindings/swig/perl/libsvn_swig_perl
990bebf35fb9 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     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
990bebf35fb9 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     9
 
+
990bebf35fb9 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    10
 
+libsvn_swig_perl_OBJECTS :=
990bebf35fb9 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    11
 
+ifneq (,$(findstring m64,$(CXXFLAGS)))
990bebf35fb9 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    12
 
 libsvn_swig_perl_OBJECTS = swigutil_pl.lo
990bebf35fb9 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    13
 
+endif
990bebf35fb9 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    14
 
+
990bebf35fb9 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    15
 
 subversion/bindings/swig/perl/libsvn_swig_perl/libsvn_swig_perl-1.la: $(libsvn_swig_perl_DEPS)
990bebf35fb9 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    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)
990bebf35fb9 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    17
 
+	if test "`echo $(CXXFLAGS) | ggrep 'm64'`" != "" ; then \
990bebf35fb9 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    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) ; \
990bebf35fb9 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    19
 
+	else \
990bebf35fb9 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    20
 
+	  /usr/gnu/bin/touch $@ ; \
990bebf35fb9 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    21
 
+	fi
990bebf35fb9 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    22
990bebf35fb9 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    23
 
 libsvn_swig_py_PATH = subversion/bindings/swig/python/libsvn_swig_py
990bebf35fb9 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    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
990bebf35fb9 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    25
 
@@ -1253,9 +1262,10 @@
990bebf35fb9 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    26
990bebf35fb9 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    27
990bebf35fb9 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    28
 
 install-swig-pl-lib: subversion/bindings/swig/perl/libsvn_swig_perl/libsvn_swig_perl-1.la
990bebf35fb9 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    29
 
-	$(MKDIR) $(DESTDIR)$(swig_pl_libdir)
990bebf35fb9 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    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
990bebf35fb9 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    31
 
-
990bebf35fb9 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    32
 
+	if test "`echo $(CXXFLAGS) | ggrep 'm64'`" != "" ; then \
990bebf35fb9 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    33
 
+	  $(MKDIR) $(DESTDIR)$(swig_pl_libdir) ; \
990bebf35fb9 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    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 ; \
990bebf35fb9 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    35
 
+	fi
990bebf35fb9 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    36
990bebf35fb9 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    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
990bebf35fb9 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    38
 
 	$(MKDIR) $(DESTDIR)$(swig_pydir)
upstream/oracle/userland-gate