diff options
author | Adrian Dudau <adrian.dudau@enea.com> | 2014-06-26 14:36:22 +0200 |
---|---|---|
committer | Adrian Dudau <adrian.dudau@enea.com> | 2014-06-26 15:32:53 +0200 |
commit | f4cf9fe05bb3f32fabea4e54dd92d368967a80da (patch) | |
tree | 487180fa9866985ea7b28e625651765d86f515c3 /meta/recipes-devtools/subversion/subversion-1.7.10 | |
download | poky-f4cf9fe05bb3f32fabea4e54dd92d368967a80da.tar.gz |
initial commit for Enea Linux 4.0
Migrated from the internal git server on the daisy-enea branch
Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>
Diffstat (limited to 'meta/recipes-devtools/subversion/subversion-1.7.10')
4 files changed, 115 insertions, 0 deletions
diff --git a/meta/recipes-devtools/subversion/subversion-1.7.10/allow-updated-neon.patch b/meta/recipes-devtools/subversion/subversion-1.7.10/allow-updated-neon.patch new file mode 100644 index 0000000000..e8acb12a21 --- /dev/null +++ b/meta/recipes-devtools/subversion/subversion-1.7.10/allow-updated-neon.patch | |||
@@ -0,0 +1,20 @@ | |||
1 | |||
2 | Allow neon 0.30 to be usable also | ||
3 | |||
4 | Upstream-Status: Pending | ||
5 | |||
6 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
7 | |||
8 | Index: subversion-1.7.10/configure.ac | ||
9 | =================================================================== | ||
10 | --- subversion-1.7.10.orig/configure.ac | ||
11 | +++ subversion-1.7.10/configure.ac | ||
12 | @@ -118,7 +118,7 @@ AC_PATH_PROG(PKG_CONFIG, pkg-config) | ||
13 | |||
14 | # Either a space-separated list of allowable Neon versions, or "any" to | ||
15 | # mean allow anything. | ||
16 | -NEON_ALLOWED_LIST="0\.25 0\.26 0\.27\.2 0\.28 0\.29" | ||
17 | +NEON_ALLOWED_LIST="0\.25 0\.26 0\.27\.2 0\.28 0\.29 0\.30" | ||
18 | NEON_RECOMMENDED_VER="0.29.6" | ||
19 | NEON_URL="http://www.webdav.org/neon/neon-${NEON_RECOMMENDED_VER}.tar.gz" | ||
20 | dnl You can skip the neon version check only if you know what you are doing | ||
diff --git a/meta/recipes-devtools/subversion/subversion-1.7.10/fix-install-depends.patch b/meta/recipes-devtools/subversion/subversion-1.7.10/fix-install-depends.patch new file mode 100644 index 0000000000..fb79b8cc51 --- /dev/null +++ b/meta/recipes-devtools/subversion/subversion-1.7.10/fix-install-depends.patch | |||
@@ -0,0 +1,48 @@ | |||
1 | install-neon-lib should depend on libsvn_delta's installation | ||
2 | |||
3 | install-neon-lib needs libsvn_delta-1.la which will be regenerated | ||
4 | during libsvn_delta-1.la's installation, if libsvn_delta-1.la is | ||
5 | in regenerating and at the same time install-neon-lib links it, the | ||
6 | error willl happen. | ||
7 | |||
8 | Let install-neon-lib run after libsvn_delta-1.la is installed will fix | ||
9 | the problem. | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | |||
13 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
14 | --- | ||
15 | build-outputs.mk | 2 +- | ||
16 | build.conf | 2 ++ | ||
17 | 2 files changed, 3 insertions(+), 1 deletion(-) | ||
18 | |||
19 | --- subversion-1.7.6.orig/build-outputs.mk | ||
20 | +++ subversion-1.7.6/build-outputs.mk | ||
21 | @@ -983,11 +983,11 @@ install-locale: subversion/po/de.mo subv | ||
22 | $(MKDIR) $(DESTDIR)$(localedir)/zh_CN/LC_MESSAGES | ||
23 | cd subversion/po ; $(INSTALL_LOCALE) zh_CN.mo $(DESTDIR)$(localedir)/zh_CN/LC_MESSAGES/$(PACKAGE_NAME).mo | ||
24 | $(MKDIR) $(DESTDIR)$(localedir)/zh_TW/LC_MESSAGES | ||
25 | cd subversion/po ; $(INSTALL_LOCALE) zh_TW.mo $(DESTDIR)$(localedir)/zh_TW/LC_MESSAGES/$(PACKAGE_NAME).mo | ||
26 | |||
27 | -install-neon-lib: subversion/libsvn_ra_neon/libsvn_ra_neon-1.la | ||
28 | +install-neon-lib: subversion/libsvn_ra_neon/libsvn_ra_neon-1.la $(SVN_FS_LIB_INSTALL_DEPS) | ||
29 | $(MKDIR) $(DESTDIR)$(neon_libdir) | ||
30 | cd subversion/libsvn_ra_neon ; $(INSTALL_NEON_LIB) libsvn_ra_neon-1.la $(DESTDIR)$(neon_libdir)/libsvn_ra_neon-1.la | ||
31 | |||
32 | install-ramod-lib: subversion/libsvn_fs/libsvn_fs-1.la subversion/libsvn_ra_svn/libsvn_ra_svn-1.la subversion/libsvn_repos/libsvn_repos-1.la subversion/libsvn_ra_local/libsvn_ra_local-1.la | ||
33 | $(MKDIR) $(DESTDIR)$(ramod_libdir) | ||
34 | --- subversion-1.7.6.orig/build.conf | ||
35 | +++ subversion-1.7.6/build.conf | ||
36 | @@ -270,10 +270,12 @@ msvc-export = svn_ra.h private\svn_ra_pr | ||
37 | [libsvn_ra_neon] | ||
38 | type = ra-module | ||
39 | path = subversion/libsvn_ra_neon | ||
40 | install = neon-lib | ||
41 | libs = libsvn_delta libsvn_subr aprutil apriconv apr neon | ||
42 | +# conditionally add more dependencies | ||
43 | +add-install-deps = $(SVN_FS_LIB_INSTALL_DEPS) | ||
44 | msvc-static = yes | ||
45 | |||
46 | # Accessing repositories via DAV through serf | ||
47 | [libsvn_ra_serf] | ||
48 | type = ra-module | ||
diff --git a/meta/recipes-devtools/subversion/subversion-1.7.10/libtool2.patch b/meta/recipes-devtools/subversion/subversion-1.7.10/libtool2.patch new file mode 100644 index 0000000000..5cd572bfc8 --- /dev/null +++ b/meta/recipes-devtools/subversion/subversion-1.7.10/libtool2.patch | |||
@@ -0,0 +1,15 @@ | |||
1 | Upstream-Status: Inappropriate [embedded specific] | ||
2 | |||
3 | --- a/configure.ac 2011-10-20 21:56:02.230663987 +0200 | ||
4 | +++ b/configure.ac 2011-08-17 15:01:30.000000000 +0200 | ||
5 | @@ -227,8 +227,8 @@ | ||
6 | LIBTOOL="$sh_libtool" | ||
7 | SVN_LIBTOOL="$sh_libtool" | ||
8 | else | ||
9 | - sh_libtool="$abs_builddir/libtool" | ||
10 | - SVN_LIBTOOL="\$(SHELL) $sh_libtool" | ||
11 | + sh_libtool="$abs_builddir/$host_alias-libtool" | ||
12 | + SVN_LIBTOOL="\$(SHELL) \$(abs_builddir)/$host_alias-libtool" | ||
13 | fi | ||
14 | AC_SUBST(SVN_LIBTOOL) | ||
15 | |||
diff --git a/meta/recipes-devtools/subversion/subversion-1.7.10/neon.m4-fix-includes-and-cflags.patch b/meta/recipes-devtools/subversion/subversion-1.7.10/neon.m4-fix-includes-and-cflags.patch new file mode 100644 index 0000000000..013d0c3649 --- /dev/null +++ b/meta/recipes-devtools/subversion/subversion-1.7.10/neon.m4-fix-includes-and-cflags.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | Fix to get correct SVN_NEON_CONFIG and CFLAGS when sysroot path contains '-D' and '-I' | ||
2 | characters. | ||
3 | |||
4 | Upstream-Status: Pending | ||
5 | |||
6 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
7 | |||
8 | index f951039..a813145 100644 | ||
9 | --- a/build/ac-macros/neon.m4 | ||
10 | +++ b/build/ac-macros/neon.m4 | ||
11 | @@ -105,8 +105,8 @@ AC_DEFUN(SVN_NEON_CONFIG, | ||
12 | test "$svn_allowed_neon" = "any"; then | ||
13 | svn_allowed_neon_on_system="yes" | ||
14 | if test "$NEON_PKG_CONFIG" = "yes"; then | ||
15 | - SVN_NEON_INCLUDES=[`$PKG_CONFIG neon --cflags | $SED -e 's/-D[^ ]*//g'`] | ||
16 | - CFLAGS=["$CFLAGS `$PKG_CONFIG neon --cflags | $SED -e 's/-I[^ ]*//g'`"] | ||
17 | + SVN_NEON_INCLUDES=["`$PKG_CONFIG neon --cflags | $SED -e 's/^-D[^ ]*//g' -e 's/ -D[^ ]*//g'`"] | ||
18 | + CFLAGS=["$CFLAGS `$PKG_CONFIG neon --cflags | $SED -e 's/^-I[^ ]*//g' -e 's/ -I[^ ]*//g'`"] | ||
19 | old_CFLAGS="$CFLAGS" | ||
20 | old_LIBS="$LIBS" | ||
21 | NEON_LIBS=`$PKG_CONFIG neon --libs` | ||
22 | @@ -126,8 +126,8 @@ int main() | ||
23 | CFLAGS="$old_CFLAGS" | ||
24 | LIBS="$old_LIBS" | ||
25 | else | ||
26 | - SVN_NEON_INCLUDES=[`$neon_config --cflags | $SED -e 's/-D[^ ]*//g'`] | ||
27 | - CFLAGS=["$CFLAGS `$neon_config --cflags | $SED -e 's/-I[^ ]*//g'`"] | ||
28 | + SVN_NEON_INCLUDES=[`$neon_config --cflags | $SED -e 's/^-D[^ ]*//g' -e 's/ -D[^ ]*//g'`] | ||
29 | + CFLAGS=["$CFLAGS `$neon_config --cflags | $SED -e 's/^-I[^ ]*//g' -e 's/ -I[^ ]*//g'`"] | ||
30 | NEON_LIBS=`$neon_config --libs` | ||
31 | fi | ||
32 | svn_lib_neon="yes" | ||