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 Stefan Teleman <stefan.teleman@oracle.com>
Thu, 31 May 2012 11:54:49 -0700
changeset 845 f38158deaa77
child 1275 03b86a2f9021
child 2804 7546c836fd87
permissions -rw-r--r--
7075156 Upgrade Subversion to 1.7.5
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
845
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     1
 
--- configure	2012-05-10 11:52:02.000000000 -0700
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     2
 
+++ configure	2012-05-21 11:21:44.053205016 -0700
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     3
 
@@ -4686,14 +4686,14 @@
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     4
 
   fi
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     5
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     6
 
   if test "$enable_all_static" = "yes"; then
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     7
 
-    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 
     8
 
+    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 
     9
 
     if test $? -ne 0; then
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    10
 
-      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 
    11
 
+      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 
    12
 
     fi
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    13
 
   else
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    14
 
-    SVN_APR_LIBS="`$apr_config --link-ld`"
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    15
 
+    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 
    16
 
     if test $? -ne 0; then
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    17
 
-      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 
    18
 
+      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 
    19
 
     fi
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    20
 
   fi
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    21
 
   SVN_APR_LIBS="`
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    22
 
@@ -5089,14 +5089,14 @@
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    23
 
   fi
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    24
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    25
 
   if test "$enable_all_static" = "yes"; then
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    26
 
-    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 
    27
 
+    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 
    28
 
     if test $? -ne 0; then
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    29
 
-      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 
    30
 
+      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 
    31
 
     fi
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    32
 
   else
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    33
 
-    SVN_APRUTIL_LIBS="`$apu_config --link-ld`"
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    34
 
+    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 
    35
 
     if test $? -ne 0; then
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    36
 
-      as_fn_error $? "apu-config --link-ld failed" "$LINENO" 5
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    37
 
+      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 
    38
 
     fi
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    39
 
   fi
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    40
 
   SVN_APRUTIL_LIBS="`
upstream/oracle/userland-gate