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/000-Makefile.in.patch
author Stefan Teleman <stefan.teleman@oracle.com>
Wed, 27 Apr 2016 11:46:57 -0700
changeset 5854 a31f17a6ce08
parent 5778 d4593dbbc6ce
permissions -rw-r--r--
22853244 upgrade subversion to 1.9.3
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5854
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
     1
 
# Disable 32-bit Perl bindings.
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
     2
 
# Solaris-specific, not for upstream.
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
     3
 
--- Makefile.in	2015-09-18 05:56:29.000000000 -0700
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
     4
 
+++ Makefile.in	2016-04-11 13:04:32.722626722 -0700
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
     5
 
@@ -21,6 +21,14 @@
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
     6
 
 # ====================================================================
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
     7
 
 #
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
     8
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
     9
 
+MACH=$(shell uname -p)
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
    10
 
+MACH64=
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
    11
 
+ifeq ($(MACH),i386)
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
    12
 
+  MACH64=amd64
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
    13
 
+else
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
    14
 
+  MACH64=sparcv9
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
    15
 
+endif
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
    16
 
+
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
    17
 
 top_builddir = .
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
    18
 
 top_srcdir = @top_srcdir@
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
    19
 
 abs_builddir = @abs_builddir@
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
    20
 
@@ -82,14 +90,14 @@
200
936900594dba 7031770 libmng needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    21
 
 swig_rb_libdir = @libdir@
936900594dba 7031770 libmng needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    22
936900594dba 7031770 libmng needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    23
 
 ### these possibly need further discussion
936900594dba 7031770 libmng needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    24
 
-swig_pydir = @libdir@/svn-python/libsvn
936900594dba 7031770 libmng needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    25
 
-swig_pydir_extra = @libdir@/svn-python/svn
3911
7afc7128c98a 20649370 migrate library/python/subversion to Python 2.7
John Beck <John.Beck@Oracle.COM>
parents: 3865
diff changeset 
    26
 
+swig_pydir = /usr/lib/python2.7/vendor-packages/libsvn
7afc7128c98a 20649370 migrate library/python/subversion to Python 2.7
John Beck <John.Beck@Oracle.COM>
parents: 3865
diff changeset 
    27
 
+swig_pydir_extra = /usr/lib/python2.7/vendor-packages/svn
200
936900594dba 7031770 libmng needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    28
 
 swig_pldir = @libdir@/svn-perl
936900594dba 7031770 libmng needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    29
 
 swig_rbdir = $(SWIG_RB_SITE_ARCH_DIR)/svn/ext
845
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents: 685
diff changeset 
    30
 
 toolsdir = @bindir@/svn-tools
5854
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
    31
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
    32
 
 # where to install pkg-config files
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
    33
 
-pkgconfig_dir = $(datadir)/pkgconfig
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
    34
 
+pkgconfig_dir = @libdir@/pkgconfig
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
    35
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
    36
 
 javahl_javadir = @libdir@/svn-javahl
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
    37
 
 javahl_javahdir = @libdir@/svn-javahl/include
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
    38
 
@@ -142,9 +150,13 @@
1275
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset 
    39
 
 SWIG = @SWIG@
845
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents: 685
diff changeset 
    40
 
 SWIG_PY_INCLUDES = @SWIG_PY_INCLUDES@ -I$(SWIG_SRC_DIR)/python/libsvn_swig_py
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents: 685
diff changeset 
    41
 
 SWIG_PY_COMPILE = @SWIG_PY_COMPILE@
1275
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset 
    42
 
-SWIG_PY_LINK = @SWIG_PY_LINK@
845
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents: 685
diff changeset 
    43
 
-SWIG_PY_LIBS = @SWIG_PY_LIBS@
1275
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset 
    44
 
+SWIG_PY_LINK = @SWIG_PY_LINK@ $(CFLAGS) $(EXTRA_CFLAGS)
845
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents: 685
diff changeset 
    45
 
+SWIG_PY_LIBS = @SWIG_PY_LIBS@ $(SVN_APR_LIBS) $(SVN_APRUTIL_LIBS)
5854
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
    46
 
+
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
    47
 
+ifneq (,$(findstring m64,$(CXXFLAGS)))
845
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents: 685
diff changeset 
    48
 
 SWIG_PL_INCLUDES = @SWIG_PL_INCLUDES@
5854
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
    49
 
+endif
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
    50
 
+
845
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents: 685
diff changeset 
    51
 
 SWIG_RB_INCLUDES = @SWIG_RB_INCLUDES@ -I$(SWIG_SRC_DIR)/ruby/libsvn_swig_ruby
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents: 685
diff changeset 
    52
 
 SWIG_RB_COMPILE = @SWIG_RB_COMPILE@
5854
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
    53
 
 SWIG_RB_LINK = @SWIG_RB_LINK@
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
    54
 
@@ -185,9 +197,17 @@
845
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents: 685
diff changeset 
    55
 
 ### suppressed (but they may come from httpd or APR).
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents: 685
diff changeset 
    56
 
 CPPFLAGS = @CPPFLAGS@ $(EXTRA_CPPFLAGS)
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents: 685
diff changeset 
    57
 
 LDFLAGS = @LDFLAGS@ $(EXTRA_LDFLAGS)
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents: 685
diff changeset 
    58
 
+EXTRA_SWIG_LDFLAGS = -R$(libdir)
5854
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
    59
 
 SWIG_LDFLAGS = @SWIG_LDFLAGS@ $(EXTRA_SWIG_LDFLAGS)
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
    60
 
 SWIG_CPPFLAGS = @SWIG_CPPFLAGS@ $(EXTRA_CPPFLAGS)
845
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents: 685
diff changeset 
    61
5854
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
    62
 
+SVN_RUNPATH=
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
    63
 
+ifneq (,$(findstring m32,$(CXXFLAGS)))
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
    64
 
+  SVN_RUNPATH=/usr/lib/svn
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
    65
 
+else
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
    66
 
+  SVN_RUNPATH=/usr/lib/svn/$(MACH64)
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
    67
 
+endif
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
    68
 
+
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
    69
 
 COMPILE = $(CC) $(CMODEFLAGS) $(CPPFLAGS) $(CMAINTAINERFLAGS) $(CFLAGS) $(INCLUDES)
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
    70
 
 COMPILE_NOWARN = $(CC) $(CMODEFLAGS) $(CPPFLAGS) $(CNOWARNFLAGS) $(CFLAGS) $(INCLUDES)
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
    71
 
 COMPILE_CXX = $(CXX) $(CXXMODEFLAGS) $(CPPFLAGS) $(CXXMAINTAINERFLAGS) $(CXXFLAGS) $(INCLUDES)
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
    72
 
@@ -203,7 +223,12 @@
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
    73
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
    74
 
 # special compilation for files destined for libsvn_swig_* (e.g. swigutil_*.c)
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
    75
 
 COMPILE_SWIG_PY = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_PY_COMPILE) $(CPPFLAGS) $(LT_CFLAGS) -DSWIGPYTHON $(SWIG_PY_INCLUDES) $(INCLUDES) -o $@ -c
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
    76
 
+
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
    77
 
+COMPILE_SWIG_PL := /bin/true
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
    78
 
+ifneq (,$(findstring m64,$(CXXFLAGS)))
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
    79
 
 COMPILE_SWIG_PL = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) $(LT_CFLAGS) $(SWIG_PL_INCLUDES) $(INCLUDES) -o $@ -c
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
    80
 
+endif
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
    81
 
+
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
    82
 
 COMPILE_SWIG_RB = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_RB_COMPILE) $(CPPFLAGS) $(LT_CFLAGS) $(SWIG_RB_INCLUDES) $(INCLUDES) -o $@ -c
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
    83
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
    84
 
 # special compilation for files destined for javahl (i.e. C++)
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
    85
 
@@ -261,7 +286,7 @@
845
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents: 685
diff changeset 
    86
 
 LINK_CXX_LIB = $(LINK_CXX) $(LT_SO_VERSION)
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents: 685
diff changeset 
    87
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents: 685
diff changeset 
    88
 
 # special link rule for mod_dav_svn
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents: 685
diff changeset 
    89
 
-LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS)
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents: 685
diff changeset 
    90
 
+LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) $(SVN_APR_LIBS) $(SVN_APRUTIL_LIBS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS)
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents: 685
diff changeset 
    91
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents: 685
diff changeset 
    92
 
 # Special LDFLAGS for some libraries
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents: 685
diff changeset 
    93
 
 libsvn_auth_gnome_keyring_LDFLAGS = @libsvn_auth_gnome_keyring_LDFLAGS@
5854
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
    94
 
@@ -286,7 +311,7 @@
845
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents: 685
diff changeset 
    95
 
 COMPILE_RB_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_RB_COMPILE) $(LT_CFLAGS) $(CPPFLAGS) $(SWIG_RB_INCLUDES) -prefer-pic -c -o $@
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents: 685
diff changeset 
    96
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents: 685
diff changeset 
    97
 
 # these commands link the wrapper objects into an extension library/module
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents: 685
diff changeset 
    98
 
-LINK_PY_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=link $(SWIG_PY_LINK) $(SWIG_LDFLAGS) -rpath $(swig_pydir) -avoid-version -module
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents: 685
diff changeset 
    99
 
+LINK_PY_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=link $(SWIG_PY_LINK) $(SWIG_LDFLAGS) $(SWIG_PY_LIBS) -rpath $(swig_pydir) -avoid-version -module
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents: 685
diff changeset 
   100
 
 LINK_RB_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=link $(SWIG_RB_LINK) $(SWIG_LDFLAGS) -rpath $(swig_rbdir) -avoid-version -module
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents: 685
diff changeset 
   101
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents: 685
diff changeset 
   102
 
 LINK_JAVAHL_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS) $(LT_CXX_LIBADD) -rpath $(libdir)
5854
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   103
 
@@ -313,7 +338,12 @@
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   104
 
 ### this isn't correct yet
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   105
 
 INSTALL_SWIG_PY = $(INSTALL_LIB)
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   106
 
 INSTALL_SWIG_PY_LIB = $(INSTALL_LIB)
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   107
 
+
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   108
 
+INSTALL_SWIG_PL_LIB :=
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   109
 
+ifneq (,$(findstring m64,$(CXXFLAGS)))
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   110
 
 INSTALL_SWIG_PL_LIB = $(INSTALL_LIB)
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   111
 
+endif
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   112
 
+
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   113
 
 INSTALL_SWIG_RB = $(INSTALL_LIB)
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   114
 
 INSTALL_SWIG_RB_LIB = $(INSTALL_LIB)
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   115
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   116
 
@@ -341,12 +371,18 @@
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   117
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   118
 
 # The path to generated and complementary source files for the SWIG
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   119
 
 # bindings.
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   120
 
+# ifneq (,$(findstring m64,$(CXXFLAGS)))
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   121
 
 SWIG_PL_DIR = $(abs_builddir)/subversion/bindings/swig/perl
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   122
 
+# endif
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   123
 
+
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   124
 
 SWIG_PY_DIR = $(abs_builddir)/subversion/bindings/swig/python
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   125
 
 SWIG_RB_DIR = $(abs_builddir)/subversion/bindings/swig/ruby
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   126
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   127
 
 # The path to the source files for the SWIG bindings
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   128
 
+# ifneq (,$(findstring m64,$(CXXFLAGS)))
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   129
 
 SWIG_PL_SRC_DIR = $(abs_srcdir)/subversion/bindings/swig/perl
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   130
 
+# endif
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   131
 
+
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   132
 
 SWIG_PY_SRC_DIR = $(abs_srcdir)/subversion/bindings/swig/python
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   133
 
 SWIG_RB_SRC_DIR = $(abs_srcdir)/subversion/bindings/swig/ruby
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   134
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   135
 
@@ -833,33 +869,67 @@
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   136
 
 	$(EXTRACLEAN_SWIG_HEADERS)
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   137
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   138
 
 $(SWIG_PL_DIR)/native/Makefile.PL: $(SWIG_SRC_DIR)/perl/native/Makefile.PL.in
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   139
 
-	./config.status subversion/bindings/swig/perl/native/Makefile.PL
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   140
 
+	if test "`echo $(CXXFLAGS) | ggrep 'm64'`" != "" ; then \
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   141
 
+	  ./config.status subversion/bindings/swig/perl/native/Makefile.PL ; \
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   142
 
+	fi
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   143
 
+
206
a4474882bf60 7010355 python needs to be packaged to separate out non-core dependencies
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 200
diff changeset 
   144
a4474882bf60 7010355 python needs to be packaged to separate out non-core dependencies
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 200
diff changeset 
   145
 
 $(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL
5854
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   146
 
-	cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL PREFIX=$(prefix)
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   147
 
+	if test "`echo $(CXXFLAGS) | ggrep 'm64'`" != "" ; then \
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   148
 
+	  cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL PREFIX=$(prefix) ; \
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   149
 
+	fi
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   150
 
+	( if test "`echo $(CXXFLAGS) | ggrep 'm64'`" != "" ; then \
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   151
 
+	  cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL ; fi )
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   152
 
+	( if test "`echo $(CXXFLAGS) | ggrep 'm64'`" != "" ; then \
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   153
 
+	  cd $(SWIG_PL_DIR)/native; \
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   154
 
+	  for file in Makefile Makefile.client Makefile.delta \
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   155
 
+	  Makefile.fs Makefile.ra Makefile.repos Makefile.wc ; do \
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   156
 
+	  cp -f $$file $$file.orig ; \
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   157
 
+	  sed -e 's;^LD_RUN_PATH.*$$;LD_RUN_PATH=$(SVN_RUNPATH);g' $$file.orig >$$file ; \
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   158
 
+	  rm -f $$file.orig ; \
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   159
 
+	  done ; fi )
206
a4474882bf60 7010355 python needs to be packaged to separate out non-core dependencies
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 200
diff changeset 
   160
a4474882bf60 7010355 python needs to be packaged to separate out non-core dependencies
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 200
diff changeset 
   161
 
 # There is a "readlink -f" command on some systems for the same purpose,
a4474882bf60 7010355 python needs to be packaged to separate out non-core dependencies
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 200
diff changeset 
   162
 
 # but it's not as portable (e.g. Mac OS X doesn't have it).  These should
5854
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   163
 
 # only be used where Python/Perl are known to be available.
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   164
 
 READLINK_PY=$(PYTHON) -c 'import sys,os; print(os.path.realpath(sys.argv[1]))'
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   165
 
+READLINK_PL :=
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   166
 
+ifneq (,$(findstring m64,$(CXXFLAGS)))
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   167
 
 READLINK_PL=$(PERL) -e 'use Cwd; print Cwd::realpath(shift)'
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   168
 
+endif
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   169
 
+
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   170
 
+swig-pl_DEPS :=
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   171
 
+ifneq (,$(findstring m64,$(CXXFLAGS)))
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   172
 
+  swig-pl_DEPS = autogen-swig-pl libsvn_swig_perl $(SWIG_PL_DIR)/native/Makefile
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   173
 
+endif
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   174
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   175
 
-swig-pl_DEPS = autogen-swig-pl libsvn_swig_perl \
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   176
 
-  $(SWIG_PL_DIR)/native/Makefile
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   177
 
 swig-pl: $(swig-pl_DEPS)
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   178
 
+	if test "`echo $(CXXFLAGS) | ggrep 'm64'`" != "" ; then \
206
a4474882bf60 7010355 python needs to be packaged to separate out non-core dependencies
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 200
diff changeset 
   179
 
 	if test "`$(READLINK_PL) $(SWIG_PL_DIR)`" != "`$(READLINK_PL) $(SWIG_PL_SRC_DIR)`"; then \
a4474882bf60 7010355 python needs to be packaged to separate out non-core dependencies
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 200
diff changeset 
   180
 
 	  ln -sf $(SWIG_PL_SRC_DIR)/native/*.c $(SWIG_PL_DIR)/native; \
5854
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   181
 
+	  fi ; \
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   182
 
+	fi
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   183
 
+	if test "`echo $(CXXFLAGS) | ggrep 'm64'`" != "" ; then \
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   184
 
+	  cd $(SWIG_PL_DIR)/native; $(MAKE) OPTIMIZE="" OTHERLDFLAGS="$(SWIG_LDFLAGS)" LD_RUN_PATH="$(SVN_RUNPATH)" ; \
206
a4474882bf60 7010355 python needs to be packaged to separate out non-core dependencies
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 200
diff changeset 
   185
 
 	fi
a4474882bf60 7010355 python needs to be packaged to separate out non-core dependencies
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 200
diff changeset 
   186
 
-	cd $(SWIG_PL_DIR)/native; $(MAKE) OPTIMIZE="" OTHERLDFLAGS="$(SWIG_LDFLAGS)"
5854
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   187
 
+
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   188
 
+install-swig-pl-lib:
206
a4474882bf60 7010355 python needs to be packaged to separate out non-core dependencies
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 200
diff changeset 
   189
a4474882bf60 7010355 python needs to be packaged to separate out non-core dependencies
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 200
diff changeset 
   190
 
 check-swig-pl: swig-pl swig-pl-lib
5854
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   191
 
-	cd $(SWIG_PL_DIR)/native; $(MAKE) test
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   192
 
+	if test "`echo $(CXXFLAGS) | ggrep 'm64'`" != "" ; then \
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   193
 
+	  cd $(SWIG_PL_DIR)/native; $(MAKE) test ; \
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   194
 
+	fi
206
a4474882bf60 7010355 python needs to be packaged to separate out non-core dependencies
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 200
diff changeset 
   195
a4474882bf60 7010355 python needs to be packaged to separate out non-core dependencies
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 200
diff changeset 
   196
 
 install-swig-pl: swig-pl install-swig-pl-lib
a4474882bf60 7010355 python needs to be packaged to separate out non-core dependencies
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 200
diff changeset 
   197
 
-	cd $(SWIG_PL_DIR)/native; $(MAKE) install
5854
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   198
 
+	if test "`echo $(CXXFLAGS) | ggrep 'm64'`" != "" ; then \
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   199
 
+	  cd $(SWIG_PL_DIR)/native; $(MAKE) install_vendor DESTDIR=$(DESTDIR) LD_RUN_PATH="" ; \
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   200
 
+	fi
206
a4474882bf60 7010355 python needs to be packaged to separate out non-core dependencies
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 200
diff changeset 
   201
5854
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   202
 
+EXTRACLEAN_SWIG_PL :=
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   203
 
+ifneq (,$(findstring m64,$(CXXFLAGS)))
206
a4474882bf60 7010355 python needs to be packaged to separate out non-core dependencies
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 200
diff changeset 
   204
 
 EXTRACLEAN_SWIG_PL=rm -f $(SWIG_PL_SRC_DIR)/native/svn_*.c \
a4474882bf60 7010355 python needs to be packaged to separate out non-core dependencies
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 200
diff changeset 
   205
 
                          $(SWIG_PL_SRC_DIR)/native/core.c
5854
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   206
 
+endif
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   207
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   208
 
 # Running Makefile.PL at this point *fails* (cannot find ..../.libs) so if the
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   209
 
 # Makefile does not exist, DO NOT try to make it. But, if it doesn't exist,
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   210
 
@@ -868,11 +938,13 @@
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   211
 
 	if test -z "$(RELEASE_MODE)"; then \
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   212
 
 	  $(EXTRACLEAN_SWIG_PL); \
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   213
 
 	fi
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   214
 
+	if test "`echo $(CXXFLAGS) | ggrep 'm64'`" != "" ; then \
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   215
 
 	for d in $(SWIG_PL_DIR)/libsvn_swig_perl; \
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   216
 
 	do \
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   217
 
 	  cd $$d; \
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   218
 
 	  rm -rf *.lo *.la *.o .libs; \
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   219
 
-	done
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   220
 
+	  done ; \
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   221
 
+	fi
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   222
 
 	if [ -f "$(SWIG_PL_DIR)/native/Makefile" ]; then \
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   223
 
 	  cd $(SWIG_PL_DIR)/native; $(MAKE) clean; \
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
   224
 
 	fi
upstream/oracle/userland-gate