components/subversion/patches/001-configure.patch
author Stefan Teleman <stefan.teleman@oracle.com>
Tue, 01 Oct 2013 12:41:40 -0700
changeset 1493 9fd269654883
parent 1275 03b86a2f9021
child 3865 10347aa825d2
permissions -rw-r--r--
17230899 Enable Kerberos (GSSAPI) in Subversion 16782034 library/perl-516/subversion-64 is misnamed
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
1275
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset
     2
+++ configure	2013-03-20 14:20:04.139519952 -0700
845
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="`
1275
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset
    41
@@ -5300,6 +5300,8 @@
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset
    42
               old_CFLAGS="$CFLAGS"
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset
    43
               old_LIBS="$LIBS"
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset
    44
               NEON_LIBS=`$PKG_CONFIG neon --libs`
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset
    45
+              NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-m32##g'`
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset
    46
+              NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-L/usr/lib##g'`
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset
    47
               CFLAGS="$CFLAGS $SVN_NEON_INCLUDES"
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset
    48
               LIBS="$LIBS $NEON_LIBS"
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset
    49
               neon_test_code="
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset
    50
@@ -5320,6 +5322,8 @@
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset
    51
     conftest$ac_exeext conftest.$ac_ext
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset
    52
               if test "$shared_linking" = "no"; then
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset
    53
                 NEON_LIBS=`$PKG_CONFIG neon --libs --static`
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset
    54
+		NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-m32##g'`
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset
    55
+		NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-L/usr/lib##g'`
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset
    56
                 LIBS="$LIBS $NEON_LIBS"
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset
    57
                 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset
    58
 /* end confdefs.h.  */
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset
    59
@@ -5481,6 +5485,8 @@
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset
    60
               old_CFLAGS="$CFLAGS"
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset
    61
               old_LIBS="$LIBS"
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset
    62
               NEON_LIBS=`$PKG_CONFIG neon --libs`
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset
    63
+	      NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-m32##g'`
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset
    64
+	      NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-L/usr/lib##g'`
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset
    65
               CFLAGS="$CFLAGS $SVN_NEON_INCLUDES"
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset
    66
               LIBS="$LIBS $NEON_LIBS"
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset
    67
               neon_test_code="
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset
    68
@@ -5501,6 +5507,8 @@
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset
    69
     conftest$ac_exeext conftest.$ac_ext
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset
    70
               if test "$shared_linking" = "no"; then
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset
    71
                 NEON_LIBS=`$PKG_CONFIG neon --libs --static`
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset
    72
+		NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-m32##g'`
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset
    73
+		NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-L/usr/lib##g'`
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset
    74
                 LIBS="$LIBS $NEON_LIBS"
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset
    75
                 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset
    76
 /* end confdefs.h.  */
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset
    77
@@ -5520,6 +5528,8 @@
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset
    78
               SVN_NEON_INCLUDES=`$neon_config --cflags | $SED -e 's/-D[^ ]*//g'`
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset
    79
               CFLAGS="$CFLAGS `$neon_config --cflags | $SED -e 's/-I[^ ]*//g'`"
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset
    80
               NEON_LIBS=`$neon_config --libs`
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset
    81
+	      NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-m32##g'`
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset
    82
+	      NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-L/usr/lib##g'`
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset
    83
             fi
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset
    84
             svn_lib_neon="yes"
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset
    85
             break
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset
    86
@@ -5576,8 +5586,9 @@
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset
    87
 fi
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset
    88
 
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset
    89
 
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset
    90
-
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset
    91
-
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset
    92
+NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-m32##g'`
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset
    93
+NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-L/usr/lib##g'`
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset
    94
+export NEON_LIBS
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset
    95
 
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset
    96
 
03b86a2f9021 16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents: 845
diff changeset
    97
 if test "$svn_lib_neon" = "yes"; then
1493
9fd269654883 17230899 Enable Kerberos (GSSAPI) in Subversion
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1275
diff changeset
    98
--- configure	2013-07-29 12:50:28.716771506 -0700
9fd269654883 17230899 Enable Kerberos (GSSAPI) in Subversion
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1275
diff changeset
    99
+++ configure	2013-07-29 13:04:59.668934315 -0700
9fd269654883 17230899 Enable Kerberos (GSSAPI) in Subversion
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1275
diff changeset
   100
@@ -6098,8 +6098,8 @@
9fd269654883 17230899 Enable Kerberos (GSSAPI) in Subversion
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1275
diff changeset
   101
       old_CFLAGS="$CFLAGS"
9fd269654883 17230899 Enable Kerberos (GSSAPI) in Subversion
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1275
diff changeset
   102
       old_LIBS="$LIBS"
9fd269654883 17230899 Enable Kerberos (GSSAPI) in Subversion
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1275
diff changeset
   103
       CFLAGS=""
9fd269654883 17230899 Enable Kerberos (GSSAPI) in Subversion
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1275
diff changeset
   104
-      SVN_GSSAPI_INCLUDES="`$KRB5_CONFIG --cflags`"
9fd269654883 17230899 Enable Kerberos (GSSAPI) in Subversion
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1275
diff changeset
   105
-      SVN_GSSAPI_LIBS="`$KRB5_CONFIG --libs gssapi`"
9fd269654883 17230899 Enable Kerberos (GSSAPI) in Subversion
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1275
diff changeset
   106
+      SVN_GSSAPI_INCLUDES="-I/usr/include/gssapi -I/usr/include/kerberosv5"
9fd269654883 17230899 Enable Kerberos (GSSAPI) in Subversion
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1275
diff changeset
   107
+      SVN_GSSAPI_LIBS="-lgss"
9fd269654883 17230899 Enable Kerberos (GSSAPI) in Subversion
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1275
diff changeset
   108
       SVN_GSSAPI_LIBS="`
9fd269654883 17230899 Enable Kerberos (GSSAPI) in Subversion
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1275
diff changeset
   109
   input_flags="$SVN_GSSAPI_LIBS"
9fd269654883 17230899 Enable Kerberos (GSSAPI) in Subversion
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1275
diff changeset
   110
   output_flags=""