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 | |
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')
3 files changed, 98 insertions, 0 deletions
diff --git a/meta/recipes-devtools/subversion/subversion/disable-revision-install.patch b/meta/recipes-devtools/subversion/subversion/disable-revision-install.patch new file mode 100644 index 0000000000..66450fab9f --- /dev/null +++ b/meta/recipes-devtools/subversion/subversion/disable-revision-install.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | Upstream-Status: Inappropriate [embedded specific] | ||
2 | |||
3 | Index: subversion-1.6.15/Makefile.in | ||
4 | =================================================================== | ||
5 | --- subversion-1.6.15.orig/Makefile.in 2010-11-17 06:47:23.000000000 -0800 | ||
6 | +++ subversion-1.6.15/Makefile.in 2011-01-31 10:11:07.358779686 -0800 | ||
7 | @@ -305,7 +305,7 @@ | ||
8 | clean: external-clean local-clean | ||
9 | distclean: external-distclean local-distclean | ||
10 | extraclean: external-extraclean local-extraclean | ||
11 | -install: external-install local-install revision-install | ||
12 | +install: external-install local-install #revision-install | ||
13 | |||
14 | @INCLUDE_OUTPUTS@ | ||
15 | |||
16 | @@ -363,13 +363,13 @@ | ||
17 | local-install: @INSTALL_RULES@ | ||
18 | |||
19 | ### HACK!! Find a better way to do this | ||
20 | -revision-install: | ||
21 | - test -d $(DESTDIR)$(includedir)/subversion-1 || \ | ||
22 | - $(MKDIR) $(DESTDIR)$(includedir)/subversion-1 | ||
23 | - (subversion/svnversion/svnversion $(top_srcdir) || \ | ||
24 | - svnversion $(top_srcdir) || \ | ||
25 | - echo "unknown"; \ | ||
26 | - ) > $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt | ||
27 | +#revision-install: | ||
28 | +# test -d $(DESTDIR)$(includedir)/subversion-1 || \ | ||
29 | +# $(MKDIR) $(DESTDIR)$(includedir)/subversion-1 | ||
30 | +# (subversion/svnversion/svnversion $(top_srcdir) || \ | ||
31 | +# svnversion $(top_srcdir) || \ | ||
32 | +# echo "unknown"; \ | ||
33 | +# ) > $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt | ||
34 | |||
35 | install-static: @INSTALL_STATIC_RULES@ | ||
36 | |||
diff --git a/meta/recipes-devtools/subversion/subversion/fix-install-depends.patch b/meta/recipes-devtools/subversion/subversion/fix-install-depends.patch new file mode 100644 index 0000000000..6f49ed4bf2 --- /dev/null +++ b/meta/recipes-devtools/subversion/subversion/fix-install-depends.patch | |||
@@ -0,0 +1,45 @@ | |||
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 | diff --git a/build-outputs.mk b/build-outputs.mk | ||
20 | --- a/build-outputs.mk | ||
21 | +++ b/build-outputs.mk | ||
22 | @@ -979,7 +979,7 @@ install-locale: subversion/po/de.mo subversion/po/es.mo subversion/po/fr.mo subv | ||
23 | $(MKDIR) $(DESTDIR)$(localedir)/zh_TW/LC_MESSAGES | ||
24 | cd subversion/po ; $(INSTALL_LOCALE) zh_TW.mo $(DESTDIR)$(localedir)/zh_TW/LC_MESSAGES/$(PACKAGE_NAME).mo | ||
25 | |||
26 | -install-neon-lib: subversion/libsvn_ra_neon/libsvn_ra_neon-1.la | ||
27 | +install-neon-lib: subversion/libsvn_ra_neon/libsvn_ra_neon-1.la $(SVN_FS_LIB_INSTALL_DEPS) | ||
28 | $(MKDIR) $(DESTDIR)$(neon_libdir) | ||
29 | cd subversion/libsvn_ra_neon ; $(INSTALL_NEON_LIB) libsvn_ra_neon-1.la $(DESTDIR)$(neon_libdir)/libsvn_ra_neon-1.la | ||
30 | |||
31 | diff --git a/build.conf b/build.conf | ||
32 | --- a/build.conf | ||
33 | +++ b/build.conf | ||
34 | @@ -272,6 +272,8 @@ type = ra-module | ||
35 | path = subversion/libsvn_ra_neon | ||
36 | install = neon-lib | ||
37 | libs = libsvn_delta libsvn_subr aprutil apriconv apr neon | ||
38 | +# conditionally add more dependencies | ||
39 | +add-install-deps = $(SVN_FS_LIB_INSTALL_DEPS) | ||
40 | msvc-static = yes | ||
41 | |||
42 | # Accessing repositories via DAV through serf | ||
43 | -- | ||
44 | 1.7.10.4 | ||
45 | |||
diff --git a/meta/recipes-devtools/subversion/subversion/libtool2.patch b/meta/recipes-devtools/subversion/subversion/libtool2.patch new file mode 100644 index 0000000000..32f88b7987 --- /dev/null +++ b/meta/recipes-devtools/subversion/subversion/libtool2.patch | |||
@@ -0,0 +1,17 @@ | |||
1 | Upstream-Status: Inappropriate [embedded specific] | ||
2 | |||
3 | Index: subversion-1.5.5/configure.ac | ||
4 | =================================================================== | ||
5 | --- subversion-1.5.5.orig/configure.ac 2008-08-26 18:27:56.000000000 +0100 | ||
6 | +++ subversion-1.5.5/configure.ac 2009-01-07 18:00:47.000000000 +0000 | ||
7 | @@ -153,8 +153,8 @@ | ||
8 | LIBTOOL="$sh_libtool" | ||
9 | SVN_LIBTOOL="$sh_libtool" | ||
10 | else | ||
11 | - sh_libtool="$abs_builddir/libtool" | ||
12 | - SVN_LIBTOOL="\$(SHELL) $sh_libtool" | ||
13 | + sh_libtool="$abs_builddir/$host_alias-libtool" | ||
14 | + SVN_LIBTOOL="\$(SHELL) \$(abs_builddir)/$host_alias-libtool" | ||
15 | dnl libtoolize requires that the following line not be indented | ||
16 | ifdef([LT_INIT], [LT_INIT], [AC_PROG_LIBTOOL]) | ||
17 | fi | ||