From f4b294c0ca28bc82d21ecda30c46fca6a0e71249 Mon Sep 17 00:00:00 2001 From: Oliver Bock <oliver.bock@aei.mpg.de> Date: Wed, 11 Nov 2009 17:12:32 +0100 Subject: [PATCH] Fixing BOINC out-of-tree build --- build.sh | 2 ++ patches/boinc.Makefile.am.2.patch | 11 +++++++++++ 2 files changed, 13 insertions(+) create mode 100644 patches/boinc.Makefile.am.2.patch diff --git a/build.sh b/build.sh index 4cc5b8b..6db9609 100755 --- a/build.sh +++ b/build.sh @@ -421,6 +421,8 @@ build_boinc() echo "Configuring BOINC..." | tee -a $LOGFILE cd $ROOT/3rdparty/boinc || failure + # fix svn_version.h update for out-of-tree builds (patch sent upstream) + patch $ROOT/3rdparty/boinc/Makefile.am < $ROOT/patches/boinc.Makefile.am.2.patch >> $LOGFILE 2>&1 || failure chmod +x _autosetup >> $LOGFILE 2>&1 || failure ./_autosetup >> $LOGFILE 2>&1 || failure chmod +x configure >> $LOGFILE 2>&1 || failure diff --git a/patches/boinc.Makefile.am.2.patch b/patches/boinc.Makefile.am.2.patch new file mode 100644 index 0000000..557e13c --- /dev/null +++ b/patches/boinc.Makefile.am.2.patch @@ -0,0 +1,11 @@ +--- Makefile.am ++++ Makefile.am 2009-11-11 16:01:46.000000000 +0100 +@@ -47,7 +47,7 @@ + + BUILT_SOURCES = svn_version.h + svn_version.h: generate_svn_version.sh +- sh generate_svn_version.sh ++ cd $(srcdir) && sh generate_svn_version.sh + .PHONY: svn_version.h + + # Add a stage target for staging a distribution -- GitLab