gnucash-on-osx master: Patch test/cgreen/Makefile.am to work with out-of-source builds.

John Ralls jralls at code.gnucash.org
Sat Feb 29 11:31:10 EST 2020


Updated	 via  https://github.com/Gnucash/gnucash-on-osx/commit/053c024e (commit)
	from  https://github.com/Gnucash/gnucash-on-osx/commit/e423a469 (commit)



commit 053c024e836e2ae6b2183b0f30bfe3b6b84ece5b
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat Feb 29 09:31:01 2020 -0700

    Patch test/cgreen/Makefile.am to work with out-of-source builds.

diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 3a702d1..257a4a6 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -32,8 +32,8 @@
   <repository type="tarball" name="bintray"
               href="https://dl.bintray.com/boostorg/release/"/>
 
-  <include href="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/modulesets-stable/gtk-osx.modules"/>
- <!--include href="file:///Users/john/Development/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/-->
+  <!--include href="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/modulesets-stable/gtk-osx.modules"/ -->
+ <include href="file:///Users/john/Development/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/>
 
   <autotools id="libchipcard" autogen-sh="autoreconf" autogenargs="--enable-local-install">
     <branch module="229/libchipcard-5.1.5rc2.tar.gz" version="5.1.5rc2"
@@ -168,10 +168,11 @@
     </branch>
   </autotools>
 
-  <autotools id="libdbi-drivers" autogen-sh='configure'
+  <autotools id="libdbi-drivers" autogen-sh='autoreconf'
 	     autogenargs='--with-mysql --with-mysql-libdir=$PREFIX/lib --with-pgsql --with-sqlite3 --disable-docs --disable-dependency-tracking'>
     <branch repo="sourceforge" version="0.9.0"
 	    module="libdbi-drivers/libdbi-drivers-0.9.0.tar.gz">
+     <patch file="https://raw.githubusercontent.com/gnucash/gnucash-on-osx/master/patches/libdbi-drivers-cgreen-include.patch" strip="1"/>
     </branch>
     <dependencies>
       <dep package="libdbi"/>
diff --git a/patches/libdbi-drivers-cgreen-include.patch b/patches/libdbi-drivers-cgreen-include.patch
new file mode 100644
index 0000000..31318ae
--- /dev/null
+++ b/patches/libdbi-drivers-cgreen-include.patch
@@ -0,0 +1,13 @@
+--- a/tests/cgreen/Makefile.am	2010-09-29 15:22:34.000000000 -0600
++++ b/tests/cgreen/Makefile.am	2020-02-29 09:16:54.000000000 -0700
+@@ -4,7 +4,7 @@
+ 
+ noinst_LIBRARIES = libcgreen.a
+ 
+-INCLUDES = -Iinclude
++INCLUDES = -I${srcdir}/include
+ 
+ libcgreen_a_SOURCES =  src/unit.c src/messaging.c src/breadcrumb.c src/reporter.c src/assertions.c src/vector.c src/mocks.c src/constraint.c src/parameters.c src/text_reporter.c src/cdash_reporter.c 
+ 
+
+Diff finished.  Sat Feb 29 09:19:34 2020



Summary of changes:
 modulesets/gnucash.modules                  |  7 ++++---
 patches/libdbi-drivers-cgreen-include.patch | 13 +++++++++++++
 2 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 patches/libdbi-drivers-cgreen-include.patch



More information about the gnucash-changes mailing list