mirror of
git://git.yoctoproject.org/poky
synced 2026-08-16 22:33:48 +00:00
64ea131e3d
These were not getting fixed by orignal committer! (From OE-Core rev: 7db73c70351939c4be9867981a8cf97148bbe57e) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
110 lines
7.0 KiB
Diff
110 lines
7.0 KiB
Diff
Patch taken from subversion-users ML.
|
|
|
|
From: Roman Plessl <roman.plessl_at_oetiker.ch>
|
|
Date: Thu, 16 Aug 2012 09:48:32 +0200 (CEST)
|
|
|
|
Hi All,
|
|
I try to compile and installe the new subversion 1.7.6 using my build
|
|
system. I use svnserve as standalone subversion server so my build
|
|
is not using the apache bindings.
|
|
I got the following compile error for the module mod_dontdothat:
|
|
...
|
|
/bin/bash /scratch/build/subversion-1.7.6-rp/subversion-1.7.6/libtool
|
|
--tag=CC --silent --mode=compile gcc
|
|
-I/usr/pack/subversion-1.7.6-rp/include -DLINUX=2 -D_REENTRANT
|
|
-D_GNU_SOURCE -g -O2 -g -O2 -pthread
|
|
-Werror=implicit-function-declaration -I./subversion/include
|
|
-I./subversion -I/usr/pack/subversion-1.7.6-rp/include/apr-1
|
|
-I/usr/pack/subversion-1.7.6-rp/include/apr-1
|
|
-I/usr/pack/subversion-1.7.6-rp/include
|
|
-I/usr/pack/subversion-1.7.6-rp/include/neon
|
|
-I/usr/pack/subversion-1.7.6-rp/include/serf-1 -o
|
|
tools/server-side/mod_dontdothat/mod_dontdothat.lo -c
|
|
tools/server-side/mod_dontdothat/mod_dontdothat.c
|
|
tools/server-side/mod_dontdothat/mod_dontdothat.c:25:19: error: httpd.h:
|
|
No such file or directory
|
|
tools/server-side/mod_dontdothat/mod_dontdothat.c:26:25: error:
|
|
http_config.h: No such file or directory
|
|
tools/server-side/mod_dontdothat/mod_dontdothat.c:27:27: error:
|
|
http_protocol.h: No such file or directory
|
|
tools/server-side/mod_dontdothat/mod_dontdothat.c:28:26: error:
|
|
http_request.h: No such file or directory
|
|
tools/server-side/mod_dontdothat/mod_dontdothat.c:29:22: error:
|
|
http_log.h: No such file or directory
|
|
tools/server-side/mod_dontdothat/mod_dontdothat.c:30:25: error:
|
|
util_filter.h: No such file or directory
|
|
tools/server-side/mod_dontdothat/mod_dontdothat.c:31:23: error:
|
|
ap_config.h: No such file or directory
|
|
...
|
|
I suppose the module mod_dontdothat should be only build with activated
|
|
'apache-mod's . Maybe the build target declaration has been forget when
|
|
moving the target for subversion 1.7.6.
|
|
...
|
|
checking for Apache module support via DSO through APXS... no
|
|
==================================================================
|
|
WARNING: skipping the build of mod_dav_svn
|
|
try using --with-apxs
|
|
==================================================================
|
|
...
|
|
Could you check that?
|
|
I have used the attached patch to fix it for myself.
|
|
Cheers
|
|
Roman
|
|
--
|
|
Roman Plessl phone: +41 (62) 775 9904
|
|
OETIKER+PARTNER AG email: roman.plessl_at_oetiker.ch
|
|
Aarweg 15 web: http://it.oetiker.ch
|
|
CH-4600 Olten switch board: +41 (62) 775 9900
|
|
|
|
|
|
Upstream-Status: Backport [from ML]
|
|
|
|
---
|
|
build-outputs.mk | 4 ++--
|
|
build.conf | 2 +-
|
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
--- subversion-1.7.6.orig/build-outputs.mk
|
|
+++ subversion-1.7.6/build-outputs.mk
|
|
@@ -823,11 +823,11 @@ subversion/tests/libsvn_delta/window-tes
|
|
|
|
########################################
|
|
# Section 6: Install-Group build targets
|
|
########################################
|
|
|
|
-apache-mod: subversion/mod_authz_svn/mod_authz_svn.la subversion/mod_dav_svn/mod_dav_svn.la
|
|
+apache-mod: subversion/mod_authz_svn/mod_authz_svn.la subversion/mod_dav_svn/mod_dav_svn.la tools/server-side/mod_dontdothat/mod_dontdothat.la
|
|
|
|
bdb-lib: subversion/libsvn_fs_base/libsvn_fs_base-1.la
|
|
|
|
bdb-test: subversion/tests/libsvn_fs_base/changes-test$(EXEEXT) subversion/tests/libsvn_fs_base/fs-base-test$(EXEEXT) subversion/tests/libsvn_fs_base/strings-reps-test$(EXEEXT)
|
|
|
|
@@ -875,11 +875,11 @@ swig-rb: subversion/bindings/swig/ruby/c
|
|
|
|
swig-rb-lib: subversion/bindings/swig/ruby/libsvn_swig_ruby/libsvn_swig_ruby-1.la
|
|
|
|
test: subversion/tests/cmdline/atomic-ra-revprop-change$(EXEEXT) subversion/tests/libsvn_subr/auth-test$(EXEEXT) subversion/tests/libsvn_subr/cache-test$(EXEEXT) subversion/tests/libsvn_subr/checksum-test$(EXEEXT) subversion/tests/libsvn_client/client-test$(EXEEXT) subversion/tests/libsvn_subr/compat-test$(EXEEXT) subversion/tests/libsvn_subr/config-test$(EXEEXT) subversion/tests/libsvn_wc/db-test$(EXEEXT) subversion/tests/libsvn_diff/diff-diff3-test$(EXEEXT) subversion/tests/libsvn_subr/dirent_uri-test$(EXEEXT) subversion/tests/libsvn_wc/entries-compat-test$(EXEEXT) subversion/tests/cmdline/entries-dump$(EXEEXT) subversion/tests/libsvn_subr/error-test$(EXEEXT) subversion/tests/libsvn_fs_fs/fs-pack-test$(EXEEXT) subversion/tests/libsvn_fs/fs-test$(EXEEXT) subversion/tests/libsvn_subr/hashdump-test$(EXEEXT) subversion/tests/libsvn_test-1.la subversion/tests/libsvn_fs/locks-test$(EXEEXT) subversion/tests/libsvn_subr/mergeinfo-test$(EXEEXT) subversion/tests/libsvn_wc/op-depth-test$(EXEEXT) subversion/tests/libsvn_subr/opt-test$(EXEEXT) subversion/tests/libsvn_diff/parse-diff-test$(EXEEXT) subversion/tests/libsvn_subr/path-test$(EXEEXT) subversion/tests/libsvn_wc/pristine-store-test$(EXEEXT) subversion/tests/libsvn_ra_local/ra-local-test$(EXEEXT) subversion/tests/libsvn_delta/random-test$(EXEEXT) subversion/tests/libsvn_repos/repos-test$(EXEEXT) subversion/tests/libsvn_subr/revision-test$(EXEEXT) subversion/tests/libsvn_subr/skel-test$(EXEEXT) subversion/tests/libsvn_subr/stream-test$(EXEEXT) subversion/tests/libsvn_subr/string-test$(EXEEXT) subversion/tests/libsvn_subr/subst_translate-test$(EXEEXT) subversion/tests/libsvn_delta/svndiff-test$(EXEEXT) subversion/tests/libsvn_subr/target-test$(EXEEXT) subversion/tests/libsvn_subr/time-test$(EXEEXT) subversion/tests/libsvn_subr/translate-test$(EXEEXT) subversion/tests/libsvn_wc/tree-conflict-data-test$(EXEEXT) subversion/tests/libsvn_subr/utf-test$(EXEEXT) subversion/tests/libsvn_delta/vdelta-test$(EXEEXT) subversion/tests/libsvn_wc/wc-incomplete-tester$(EXEEXT) subversion/tests/libsvn_wc/wc-lock-tester$(EXEEXT) subversion/tests/libsvn_delta/window-test$(EXEEXT)
|
|
|
|
-tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/mod_dontdothat/mod_dontdothat.la tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnmucc/svnmucc$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT)
|
|
+tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnmucc/svnmucc$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT)
|
|
|
|
|
|
########################################
|
|
# Section 7: Install-Group install targets
|
|
########################################
|
|
--- subversion-1.7.6.orig/build.conf
|
|
+++ subversion-1.7.6/build.conf
|
|
@@ -367,11 +367,11 @@ msvc-libs = libhttpd.lib
|
|
description = Apache Httpd module to block certain kinds of Apache Subversion requests
|
|
type = apache-mod
|
|
path = tools/server-side/mod_dontdothat
|
|
nonlibs = mod_dav_svn apr aprutil
|
|
libs = libsvn_subr xml
|
|
-install = tools
|
|
+install = apache-mod
|
|
msvc-libs = libhttpd.lib
|
|
|
|
# ----------------------------------------------------------------------------
|
|
#
|
|
# CONSTRUCTED HEADERS
|