code.ossystems Code Review - openembedded-core.git/blob

   1 Patch taken from subversion-users ML.
   2
   3 From: Roman Plessl <roman.plessl_at_oetiker.ch>
   4 Date: Thu, 16 Aug 2012 09:48:32 +0200 (CEST)
   5
   6 Hi All,
   7 I try to compile and installe the new subversion 1.7.6 using my build
   8 system. I use svnserve as standalone subversion server so my build
   9 is not using the apache bindings.
  10 I got the following compile error for the module mod_dontdothat:
  11 ...
  12 /bin/bash /scratch/build/subversion-1.7.6-rp/subversion-1.7.6/libtool
  13 --tag=CC --silent --mode=compile gcc
  14 -I/usr/pack/subversion-1.7.6-rp/include -DLINUX=2 -D_REENTRANT
  15 -D_GNU_SOURCE -g -O2 -g -O2 -pthread
  16 -Werror=implicit-function-declaration -I./subversion/include
  17 -I./subversion -I/usr/pack/subversion-1.7.6-rp/include/apr-1
  18 -I/usr/pack/subversion-1.7.6-rp/include/apr-1
  19 -I/usr/pack/subversion-1.7.6-rp/include
  20 -I/usr/pack/subversion-1.7.6-rp/include/neon
  21 -I/usr/pack/subversion-1.7.6-rp/include/serf-1 -o
  22 tools/server-side/mod_dontdothat/mod_dontdothat.lo -c
  23 tools/server-side/mod_dontdothat/mod_dontdothat.c
  24 tools/server-side/mod_dontdothat/mod_dontdothat.c:25:19: error: httpd.h:
  25 No such file or directory
  26 tools/server-side/mod_dontdothat/mod_dontdothat.c:26:25: error:
  27 http_config.h: No such file or directory
  28 tools/server-side/mod_dontdothat/mod_dontdothat.c:27:27: error:
  29 http_protocol.h: No such file or directory
  30 tools/server-side/mod_dontdothat/mod_dontdothat.c:28:26: error:
  31 http_request.h: No such file or directory
  32 tools/server-side/mod_dontdothat/mod_dontdothat.c:29:22: error:
  33 http_log.h: No such file or directory
  34 tools/server-side/mod_dontdothat/mod_dontdothat.c:30:25: error:
  35 util_filter.h: No such file or directory
  36 tools/server-side/mod_dontdothat/mod_dontdothat.c:31:23: error:
  37 ap_config.h: No such file or directory
  38 ...
  39 I suppose the module mod_dontdothat should be only build with activated
  40 'apache-mod's . Maybe the build target declaration has been forget when
  41 moving the target for subversion 1.7.6.
  42 ...
  43 checking for Apache module support via DSO through APXS... no
  44 ==================================================================
  45 WARNING: skipping the build of mod_dav_svn
  46           try using --with-apxs
  47 ==================================================================
  48 ...
  49 Could you check that?
  50 I have used the attached patch to fix it for myself.
  51 Cheers
  52 Roman
  53 --
  54 Roman Plessl            phone:        +41 (62) 775 9904
  55 OETIKER+PARTNER AG      email:        roman.plessl_at_oetiker.ch
  56 Aarweg 15               web:          http://it.oetiker.ch
  57 CH-4600 Olten           switch board: +41 (62) 775 9900
  58
  59
  60 Upstream-Status: Backport [from ML]
  61
  62 ---
  63  build-outputs.mk |    4 ++--
  64  build.conf       |    2 +-
  65  2 files changed, 3 insertions(+), 3 deletions(-)
  66
  67 --- subversion-1.7.6.orig/build-outputs.mk
  68 +++ subversion-1.7.6/build-outputs.mk
  69 @@ -823,11 +823,11 @@ subversion/tests/libsvn_delta/window-tes
  70
  71  ########################################
  72  # Section 6: Install-Group build targets
  73  ########################################
  74
  75 -apache-mod: subversion/mod_authz_svn/mod_authz_svn.la subversion/mod_dav_svn/mod_dav_svn.la
  76 +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
  77
  78  bdb-lib: subversion/libsvn_fs_base/libsvn_fs_base-1.la
  79
  80  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)
  81
  82 @@ -875,11 +875,11 @@ swig-rb: subversion/bindings/swig/ruby/c
  83
  84  swig-rb-lib: subversion/bindings/swig/ruby/libsvn_swig_ruby/libsvn_swig_ruby-1.la
  85
  86  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)
  87
  88 -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)
  89 +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)
  90
  91
  92  ########################################
  93  # Section 7: Install-Group install targets
  94  ########################################
  95 --- subversion-1.7.6.orig/build.conf
  96 +++ subversion-1.7.6/build.conf
  97 @@ -367,11 +367,11 @@ msvc-libs = libhttpd.lib
  98  description = Apache Httpd module to block certain kinds of Apache Subversion requests
  99  type = apache-mod
 100  path = tools/server-side/mod_dontdothat
 101  nonlibs = mod_dav_svn apr aprutil
 102  libs = libsvn_subr xml
 103 -install = tools
 104 +install = apache-mod
 105  msvc-libs = libhttpd.lib
 106
 107  # ----------------------------------------------------------------------------
 108  #
 109  # CONSTRUCTED HEADERS