Gentoo Archives: gentoo-commits

From: "Benedikt Boehm (hollow)" <hollow@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-util/subversion/files/1.5.0: disable-unneeded-linking.patch 70svn-gentoo.el 80subversion-extras
Date: Wed, 30 Apr 2008 21:16:47
Message-Id: E1JrJfQ-0000TV-KL@stork.gentoo.org
1 hollow 08/04/30 21:16:44
2
3 Added: disable-unneeded-linking.patch 70svn-gentoo.el
4 80subversion-extras
5 Log:
6 version bump wrt #219395
7 (Portage version: 2.1.5_rc6)
8
9 Revision Changes Path
10 1.1 dev-util/subversion/files/1.5.0/disable-unneeded-linking.patch
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/files/1.5.0/disable-unneeded-linking.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/files/1.5.0/disable-unneeded-linking.patch?rev=1.1&content-type=text/plain
14
15 Index: disable-unneeded-linking.patch
16 ===================================================================
17 --- configure.ac
18 +++ configure.ac
19 @@ -234,6 +234,8 @@
20 AC_DEFINE_UNQUOTED(SVN_FS_WANT_DB_PATCH, $SVN_FS_WANT_DB_PATCH,
21 [The desired patch version for the Berkeley DB])
22
23 +AC_SUBST(SVN_DB_LIBS)
24 +
25 SVN_LIB_SASL
26
27 if test "$svn_lib_sasl" = "yes"; then
28 --- Makefile.in
29 +++ Makefile.in
30 @@ -40,9 +40,10 @@
31 NEON_LIBS = @NEON_LIBS@
32 SVN_APR_LIBS = @SVN_APR_LIBS@
33 SVN_APRUTIL_LIBS = @SVN_APRUTIL_LIBS@
34 -SVN_DB_LIBS =
35 -SVN_SERF_LIBS = @SVN_SERF_LIBS@
36 +SVN_DB_LIBS = @SVN_DB_LIBS@
37 SVN_SASL_LIBS = @SVN_SASL_LIBS@
38 +SVN_SERF_LIBS = @SVN_SERF_LIBS@
39 +SVN_XML_LIBS = -lexpat
40 SVN_ZLIB_LIBS = @SVN_ZLIB_LIBS@
41
42 LIBS = @LIBS@
43 --- build/ac-macros/aprutil.m4
44 +++ build/ac-macros/aprutil.m4
45 @@ -72,16 +72,14 @@
46 AC_MSG_ERROR([apu-config --includes failed])
47 fi
48
49 - dnl When APR stores the dependent libs in the .la file, we don't need
50 - dnl --libs.
51 - SVN_APRUTIL_LIBS="`$apu_config --link-libtool --libs`"
52 + SVN_APRUTIL_LIBS="`$apu_config --link-libtool`"
53 if test $? -ne 0; then
54 - AC_MSG_ERROR([apu-config --link-libtool --libs failed])
55 + AC_MSG_ERROR([apu-config --link-libtool failed])
56 fi
57
58 - SVN_APRUTIL_EXPORT_LIBS="`$apu_config --link-ld --libs`"
59 + SVN_APRUTIL_EXPORT_LIBS="`$apu_config --link-ld`"
60 if test $? -ne 0; then
61 - AC_MSG_ERROR([apu-config --link-ld --libs failed])
62 + AC_MSG_ERROR([apu-config --link-ld failed])
63 fi
64
65 AC_SUBST(SVN_APRUTIL_INCLUDES)
66 --- build/ac-macros/apr.m4
67 +++ build/ac-macros/apr.m4
68 @@ -74,16 +74,14 @@
69 AC_MSG_ERROR([apr-config --prefix failed])
70 fi
71
72 - dnl When APR stores the dependent libs in the .la file, we don't need
73 - dnl --libs.
74 - SVN_APR_LIBS="`$apr_config --link-libtool --libs`"
75 + SVN_APR_LIBS="`$apr_config --link-libtool`"
76 if test $? -ne 0; then
77 - AC_MSG_ERROR([apr-config --link-libtool --libs failed])
78 + AC_MSG_ERROR([apr-config --link-libtool failed])
79 fi
80
81 - SVN_APR_EXPORT_LIBS="`$apr_config --link-ld --libs`"
82 + SVN_APR_EXPORT_LIBS="`$apr_config --link-ld`"
83 if test $? -ne 0; then
84 - AC_MSG_ERROR([apr-config --link-ld --libs failed])
85 + AC_MSG_ERROR([apr-config --link-ld failed])
86 fi
87
88 SVN_APR_SHLIB_PATH_VAR="`$apr_config --shlib-path-var`"
89 --- build/ac-macros/berkeley-db.m4
90 +++ build/ac-macros/berkeley-db.m4
91 @@ -218,5 +218,6 @@
92
93 CPPFLAGS="$svn_lib_berkeley_db_try_save_cppflags"
94 LIBS="$svn_lib_berkeley_db_try_save_libs"
95 + SVN_DB_LIBS="$svn_apu_bdb_lib"
96 ]
97 )
98
99
100
101 1.1 dev-util/subversion/files/1.5.0/70svn-gentoo.el
102
103 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/files/1.5.0/70svn-gentoo.el?rev=1.1&view=markup
104 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/files/1.5.0/70svn-gentoo.el?rev=1.1&content-type=text/plain
105
106 Index: 70svn-gentoo.el
107 ===================================================================
108 ;;; svn site-lisp configuration
109
110 (add-to-list 'load-path "@SITELISP@")
111 (and (< emacs-major-version 22)
112 (add-to-list 'load-path "@SITELISP@/compat"))
113 (add-to-list 'vc-handled-backends 'SVN)
114
115 (defalias 'svn-examine 'svn-status)
116 (autoload 'svn-status "dsvn" "Run `svn status'." t)
117 (autoload 'svn-update "dsvn" "Run `svn update'." t)
118 (autoload 'svn-status "psvn"
119 "Examine the status of Subversion working copy in directory DIR." t)
120
121
122
123 1.1 dev-util/subversion/files/1.5.0/80subversion-extras
124
125 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/files/1.5.0/80subversion-extras?rev=1.1&view=markup
126 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/files/1.5.0/80subversion-extras?rev=1.1&content-type=text/plain
127
128 Index: 80subversion-extras
129 ===================================================================
130 ROOTPATH=/usr/lib/subversion/bin
131 PATH=/usr/lib/subversion/bin
132
133
134
135 --
136 gentoo-commits@l.g.o mailing list