Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Jeremy Olexa (darkside)" <darkside@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-vcs/subversion/files: subversion-1.5.6-aix-dso.patch subversion-1.6.3-hpux-dso.patch subversion-1.5.4-interix.patch
Date: Wed, 31 Aug 2011 18:31:15
Message-Id: 20110831183104.DFC902004C@flycatcher.gentoo.org
1 darkside 11/08/31 18:31:04
2
3 Added: subversion-1.5.6-aix-dso.patch
4 subversion-1.6.3-hpux-dso.patch
5 subversion-1.5.4-interix.patch
6 Log:
7 Revision bump to finish Gentoo Prefix support, signed off by maintainer in bug 329505
8
9 (Portage version: 2.1.10.3/cvs/Linux i686)
10
11 Revision Changes Path
12 1.1 dev-vcs/subversion/files/subversion-1.5.6-aix-dso.patch
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/subversion/files/subversion-1.5.6-aix-dso.patch?rev=1.1&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/subversion/files/subversion-1.5.6-aix-dso.patch?rev=1.1&content-type=text/plain
16
17 Index: subversion-1.5.6-aix-dso.patch
18 ===================================================================
19 On AIX, load shared libraries even when created with full aix-soname support:
20 http://lists.gnu.org/archive/html/libtool/2011-01/msg00023.html
21 http://lists.gnu.org/archive/html/libtool/2011-02/msg00000.html
22 Once there is an agreement on that, this patch eventually is for upstream too.
23
24 --- subversion/libsvn_ra/ra_loader.c.orig 2009-04-28 14:53:35 +0200
25 +++ subversion/libsvn_ra/ra_loader.c 2009-04-28 14:55:37 +0200
26 @@ -164,6 +164,13 @@
27
28 /* find/load the specified library */
29 SVN_ERR(svn_dso_load(&dso, libname));
30 +#ifdef _AIX
31 + if (! dso) {
32 + libname = apr_psprintf(pool, "libsvn_ra_%s-%d.so.0(shr.o)",
33 + ra_name, SVN_VER_MAJOR);
34 + SVN_ERR(svn_dso_load(&dso, libname));
35 + }
36 +#endif
37 if (! dso)
38 return SVN_NO_ERROR;
39
40
41
42
43 1.1 dev-vcs/subversion/files/subversion-1.6.3-hpux-dso.patch
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/subversion/files/subversion-1.6.3-hpux-dso.patch?rev=1.1&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/subversion/files/subversion-1.6.3-hpux-dso.patch?rev=1.1&content-type=text/plain
47
48 Index: subversion-1.6.3-hpux-dso.patch
49 ===================================================================
50 --- subversion/libsvn_ra/ra_loader.c.orig 2009-07-20 14:46:02 +0200
51 +++ subversion/libsvn_ra/ra_loader.c 2009-07-20 14:50:02 +0200
52 @@ -154,8 +154,13 @@
53 const char *compat_funcname;
54 apr_status_t status;
55
56 +#if defined(__hpux) && defined(__hppa)
57 + libname = apr_psprintf(pool, "libsvn_ra_%s-%d.sl.0",
58 + ra_name, SVN_VER_MAJOR);
59 +#else
60 libname = apr_psprintf(pool, "libsvn_ra_%s-%d.so.0",
61 ra_name, SVN_VER_MAJOR);
62 +#endif
63 funcname = apr_psprintf(pool, "svn_ra_%s__init", ra_name);
64 compat_funcname = apr_psprintf(pool, "svn_ra_%s_init", ra_name);
65
66
67
68
69 1.1 dev-vcs/subversion/files/subversion-1.5.4-interix.patch
70
71 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/subversion/files/subversion-1.5.4-interix.patch?rev=1.1&view=markup
72 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/subversion/files/subversion-1.5.4-interix.patch?rev=1.1&content-type=text/plain
73
74 Index: subversion-1.5.4-interix.patch
75 ===================================================================
76 diff -ru subversion-1.5.4.orig/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion-1.5.4/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h
77 --- subversion-1.5.4.orig/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h 2008-10-29 08:22:36 +0100
78 +++ subversion-1.5.4/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h 2008-10-29 08:52:31 +0100
79 @@ -49,6 +49,11 @@
80 # endif
81 #endif
82
83 +// This is bad, but better than nothing ;)
84 +#if defined(__INTERIX)
85 +# define strtoll strtol
86 +#endif
87 +
88
89
90 #if defined(SVN_AVOID_CIRCULAR_LINKAGE_AT_ALL_COSTS_HACK)
91 diff -ru subversion-1.5.4.orig/subversion/bindings/swig/perl/native/core.c subversion-1.5.4/subversion/bindings/swig/perl/native/core.c
92 --- subversion-1.5.4.orig/subversion/bindings/swig/perl/native/core.c 2008-10-29 08:22:37 +0100
93 +++ subversion-1.5.4/subversion/bindings/swig/perl/native/core.c 2008-10-29 08:53:40 +0100
94 @@ -1733,7 +1733,10 @@
95 # endif
96 #endif
97
98 -
99 +#ifdef __INTERIX
100 +# define strtoull strtoul
101 +# define strtoll strtol
102 +#endif
103
104 SWIGINTERN int
105 SWIG_AsVal_long_SS_long SWIG_PERL_DECL_ARGS_2(SV *obj, long long *val)
106 diff -ru subversion-1.5.4.orig/subversion/bindings/swig/perl/native/svn_client.c subversion-1.5.4/subversion/bindings/swig/perl/native/svn_client.c
107 --- subversion-1.5.4.orig/subversion/bindings/swig/perl/native/svn_client.c 2008-10-29 08:22:37 +0100
108 +++ subversion-1.5.4/subversion/bindings/swig/perl/native/svn_client.c 2008-10-29 08:54:17 +0100
109 @@ -1872,6 +1872,10 @@
110 #endif
111
112
113 +#ifdef __INTERIX
114 +# define strtoull strtoul
115 +# define strtoll strtol
116 +#endif
117
118 SWIGINTERN int
119 SWIG_AsVal_long_SS_long SWIG_PERL_DECL_ARGS_2(SV *obj, long long *val)
120 diff -ru subversion-1.5.4.orig/subversion/bindings/swig/perl/native/svn_delta.c subversion-1.5.4/subversion/bindings/swig/perl/native/svn_delta.c
121 --- subversion-1.5.4.orig/subversion/bindings/swig/perl/native/svn_delta.c 2008-10-29 08:22:37 +0100
122 +++ subversion-1.5.4/subversion/bindings/swig/perl/native/svn_delta.c 2008-10-29 08:54:28 +0100
123 @@ -1745,6 +1745,10 @@
124 #endif
125
126
127 +#ifdef __INTERIX
128 +# define strtoull strtoul
129 +# define strtoll strtol
130 +#endif
131
132 SWIGINTERN int
133 SWIG_AsVal_long_SS_long SWIG_PERL_DECL_ARGS_2(SV *obj, long long *val)
134 diff -ru subversion-1.5.4.orig/subversion/bindings/swig/perl/native/svn_fs.c subversion-1.5.4/subversion/bindings/swig/perl/native/svn_fs.c
135 --- subversion-1.5.4.orig/subversion/bindings/swig/perl/native/svn_fs.c 2008-10-29 08:22:37 +0100
136 +++ subversion-1.5.4/subversion/bindings/swig/perl/native/svn_fs.c 2008-10-29 08:54:41 +0100
137 @@ -1818,6 +1818,10 @@
138 #endif
139
140
141 +#ifdef __INTERIX
142 +# define strtoull strtoul
143 +# define strtoll strtol
144 +#endif
145
146 SWIGINTERN int
147 SWIG_AsVal_long_SS_long SWIG_PERL_DECL_ARGS_2(SV *obj, long long *val)
148 diff -ru subversion-1.5.4.orig/subversion/bindings/swig/perl/native/svn_ra.c subversion-1.5.4/subversion/bindings/swig/perl/native/svn_ra.c
149 --- subversion-1.5.4.orig/subversion/bindings/swig/perl/native/svn_ra.c 2008-10-29 08:22:37 +0100
150 +++ subversion-1.5.4/subversion/bindings/swig/perl/native/svn_ra.c 2008-10-29 08:54:52 +0100
151 @@ -1661,6 +1661,10 @@
152 # endif
153 #endif
154
155 +#ifdef __INTERIX
156 +# define strtoull strtoul
157 +# define strtoll strtol
158 +#endif
159
160 SWIGINTERN int
161 SWIG_AsVal_double SWIG_PERL_DECL_ARGS_2(SV *obj, double *val)
162 diff -ru subversion-1.5.4.orig/subversion/bindings/swig/perl/native/svn_repos.c subversion-1.5.4/subversion/bindings/swig/perl/native/svn_repos.c
163 --- subversion-1.5.4.orig/subversion/bindings/swig/perl/native/svn_repos.c 2008-10-29 08:22:37 +0100
164 +++ subversion-1.5.4/subversion/bindings/swig/perl/native/svn_repos.c 2008-10-29 08:55:05 +0100
165 @@ -1792,6 +1792,10 @@
166 #endif
167
168
169 +#ifdef __INTERIX
170 +# define strtoull strtoul
171 +# define strtoll strtol
172 +#endif
173
174 SWIGINTERN int
175 SWIG_AsVal_long_SS_long SWIG_PERL_DECL_ARGS_2(SV *obj, long long *val)
176 diff -ru subversion-1.5.4.orig/subversion/bindings/swig/perl/native/svn_wc.c subversion-1.5.4/subversion/bindings/swig/perl/native/svn_wc.c
177 --- subversion-1.5.4.orig/subversion/bindings/swig/perl/native/svn_wc.c 2008-10-29 08:22:37 +0100
178 +++ subversion-1.5.4/subversion/bindings/swig/perl/native/svn_wc.c 2008-10-29 08:55:17 +0100
179 @@ -1816,6 +1816,10 @@
180 #endif
181
182
183 +#ifdef __INTERIX
184 +# define strtoull strtoul
185 +# define strtoll strtol
186 +#endif
187
188 SWIGINTERN int
189 SWIG_AsVal_long_SS_long SWIG_PERL_DECL_ARGS_2(SV *obj, long long *val)
Report Message
Find on MARC Find on Google Groups