Mercurial Mercurial > sustaining > oi_151a > sfw-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.
usr/src/cmd/subversion/subversion-1.6.5-py26.patch
author Jon Tibble <meths@btinternet.com>
Fri, 10 Feb 2012 16:19:42 +0000
branchoi_151a
changeset 114 b6d40d0a7b17
parent 2 8f1801a322e9
permissions -rw-r--r--
Added tag oi_151a_prestable1 for changeset b1282e88c680
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     1
 
--- configure	2009-09-23 20:05:36.124131000 -0700
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     2
 
+++ configure	2009-09-23 21:45:10.895445310 -0700
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     3
 
@@ -5097,11 +5097,11 @@
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     4
 
            test "$svn_allowed_neon" = "any"; then
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     5
 
             svn_allowed_neon_on_system="yes"
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     6
 
             if test "$NEON_PKG_CONFIG" = "yes"; then
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     7
 
-              SVN_NEON_INCLUDES=`$PKG_CONFIG neon --cflags | sed -e 's/-D[^ ]*//g'`
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     8
 
-              CFLAGS="$CFLAGS `$PKG_CONFIG neon --cflags | sed -e 's/-I[^ ]*//g'`"
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     9
 
+              SVN_NEON_INCLUDES=-I${ROOT}/usr/include/neon
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    10
 
+              CFLAGS="$CFLAGS"
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    11
 
               old_CFLAGS="$CFLAGS"
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    12
 
               old_LIBS="$LIBS"
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    13
 
-              NEON_LIBS=`$PKG_CONFIG neon --libs`
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    14
 
+              NEON_LIBS="-L${ROOT}/lib -lneon"
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    15
 
               CFLAGS="$CFLAGS $SVN_NEON_INCLUDES"
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    16
 
               LIBS="$LIBS $NEON_LIBS"
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    17
 
               neon_test_code="
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    18
 
@@ -5188,9 +5188,9 @@
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    19
 
               CFLAGS="$old_CFLAGS"
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    20
 
               LIBS="$old_LIBS"
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    21
 
             else
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    22
 
-              SVN_NEON_INCLUDES=`$neon_config --cflags | sed -e 's/-D[^ ]*//g'`
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    23
 
-              CFLAGS="$CFLAGS `$neon_config --cflags | sed -e 's/-I[^ ]*//g'`"
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    24
 
-              NEON_LIBS=`$neon_config --libs`
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    25
 
+              SVN_NEON_INCLUDES=-I${ROOT}/usr/include/neon
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    26
 
+              CFLAGS="$CFLAGS"
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    27
 
+              NEON_LIBS="-L${ROOT}/lib -lneon"
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    28
 
             fi
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    29
 
             svn_lib_neon="yes"
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    30
 
             break
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    31
 
@@ -5578,11 +5578,11 @@
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    32
 
            test "$svn_allowed_neon" = "any"; then
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    33
 
             svn_allowed_neon_on_system="yes"
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    34
 
             if test "$NEON_PKG_CONFIG" = "yes"; then
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    35
 
-              SVN_NEON_INCLUDES=`$PKG_CONFIG neon --cflags | sed -e 's/-D[^ ]*//g'`
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    36
 
-              CFLAGS="$CFLAGS `$PKG_CONFIG neon --cflags | sed -e 's/-I[^ ]*//g'`"
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    37
 
+              SVN_NEON_INCLUDES=-I${ROOT}/usr/include/neon
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    38
 
+              CFLAGS="$CFLAGS"
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    39
 
               old_CFLAGS="$CFLAGS"
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    40
 
               old_LIBS="$LIBS"
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    41
 
-              NEON_LIBS=`$PKG_CONFIG neon --libs`
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    42
 
+              NEON_LIBS="-L${ROOT}/lib -lneon"
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    43
 
               CFLAGS="$CFLAGS $SVN_NEON_INCLUDES"
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    44
 
               LIBS="$LIBS $NEON_LIBS"
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    45
 
               neon_test_code="
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    46
 
@@ -5669,9 +5669,9 @@
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    47
 
               CFLAGS="$old_CFLAGS"
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    48
 
               LIBS="$old_LIBS"
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    49
 
             else
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    50
 
-              SVN_NEON_INCLUDES=`$neon_config --cflags | sed -e 's/-D[^ ]*//g'`
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    51
 
-              CFLAGS="$CFLAGS `$neon_config --cflags | sed -e 's/-I[^ ]*//g'`"
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    52
 
-              NEON_LIBS=`$neon_config --libs`
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    53
 
+              SVN_NEON_INCLUDES=-I${ROOT}/usr/include/neon
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    54
 
+              CFLAGS="$CFLAGS"
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    55
 
+              NEON_LIBS="-L${ROOT}/lib -lneon"
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    56
 
             fi
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    57
 
             svn_lib_neon="yes"
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    58
 
             break
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    59
 
--- Makefile.in	2009-02-16 08:10:48.000000000 -0800
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    60
 
+++ Makefile.in	2009-09-23 21:35:11.885785150 -0700
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    61
 
@@ -76,8 +76,8 @@
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    62
 
 swig_rb_libdir = @libdir@
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    63
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    64
 
 ### these possibly need further discussion
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    65
 
-swig_pydir = @libdir@/svn-python/libsvn
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    66
 
-swig_pydir_extra = @libdir@/svn-python/svn
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    67
 
+swig_pydir = /usr/lib/python2.6/vendor-packages/libsvn
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    68
 
+swig_pydir_extra = /usr/lib/python2.6/vendor-packages/svn
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    69
 
 swig_pldir = @libdir@/svn-perl
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    70
 
 swig_rbdir = $(SWIG_RB_SITE_ARCH_DIR)/svn/ext
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    71
 
 contribdir = @bindir@/svn-contrib
sustaining/oi_151a/sfw-gate