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/001-configure.patch
author Petr Sumbera <petr.sumbera@oracle.com>
Wed, 12 Oct 2016 05:02:11 -0700
changeset 7099 58b579e0ff32
parent 5854 a31f17a6ce08
permissions -rw-r--r--
24836953 firefox/thunderbird js test failures
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
 
# Pass the right flags to apr-config and apu-config.
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
     2
 
# Only Solaris seems to need this, so not for upstream.
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
     3
 
--- configure	2015-12-07 23:53:20.000000000 -0800
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
     4
 
+++ configure	2016-03-20 15:21:11.528922510 -0700
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
     5
 
@@ -4896,14 +4896,14 @@
845
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     6
 
   fi
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     7
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     8
 
   if test "$enable_all_static" = "yes"; then
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     9
 
-    SVN_APR_LIBS="`$apr_config --link-ld --libs`"
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    10
 
+    SVN_APR_LIBS="`$apr_config --link-libtool --libs`"
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    11
 
     if test $? -ne 0; then
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    12
 
-      as_fn_error $? "apr-config --link-ld --libs failed" "$LINENO" 5
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    13
 
+      as_fn_error $? "apr-config --link-libtool --libs failed" "$LINENO" 5
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    14
 
     fi
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    15
 
   else
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    16
 
-    SVN_APR_LIBS="`$apr_config --link-ld`"
3865
10347aa825d2 19476174 upgrade Subversion to 1.7.19
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1493
diff changeset 
    17
 
+    SVN_APR_LIBS="`$apr_config --link-libtool`"
845
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    18
 
     if test $? -ne 0; then
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    19
 
-      as_fn_error $? "apr-config --link-ld failed" "$LINENO" 5
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    20
 
+      as_fn_error $? "apr-config --link-libtool failed" "$LINENO" 5
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    21
 
     fi
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    22
 
   fi
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    23
 
   SVN_APR_LIBS="`
5854
a31f17a6ce08 22853244 upgrade subversion to 1.9.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 5778
diff changeset 
    24
 
@@ -5140,14 +5140,14 @@
845
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    25
 
   fi
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    26
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    27
 
   if test "$enable_all_static" = "yes"; then
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    28
 
-    SVN_APRUTIL_LIBS="`$apu_config --link-ld --libs`"
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    29
 
+    SVN_APRUTIL_LIBS="`$apu_config --link-libtool --libs`"
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    30
 
     if test $? -ne 0; then
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    31
 
-      as_fn_error $? "apu-config --link-ld --libs failed" "$LINENO" 5
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    32
 
+      as_fn_error $? "apu-config --link-libtool --libs failed" "$LINENO" 5
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    33
 
     fi
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    34
 
   else
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    35
 
-    SVN_APRUTIL_LIBS="`$apu_config --link-ld`"
3865
10347aa825d2 19476174 upgrade Subversion to 1.7.19
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1493
diff changeset 
    36
 
+    SVN_APRUTIL_LIBS="`$apu_config --link-libtool`"
845
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    37
 
     if test $? -ne 0; then
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    38
 
-      as_fn_error $? "apu-config --link-ld failed" "$LINENO" 5
3865
10347aa825d2 19476174 upgrade Subversion to 1.7.19
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1493
diff changeset 
    39
 
+      as_fn_error $? "apu-config --link-libtool failed" "$LINENO" 5
845
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    40
 
     fi
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    41
 
   fi
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    42
 
   SVN_APRUTIL_LIBS="`
upstream/oracle/userland-gate