gnucash-on-windows master: Multiple changes pushed

John Ralls jralls at code.gnucash.org
Thu Mar 8 18:55:30 EST 2018


Updated	 via  https://github.com/Gnucash/gnucash-on-windows/commit/6d54a368 (commit)
	 via  https://github.com/Gnucash/gnucash-on-windows/commit/d2f417ab (commit)
	from  https://github.com/Gnucash/gnucash-on-windows/commit/e3555ff7 (commit)



commit 6d54a36857c0b623801441da455fa48a4d3b3e5d
Author: John Ralls <jralls at ceridwen.us>
Date:   Thu Mar 8 15:54:58 2018 -0800

    Don't need to single-thread gnucash builds any more.

diff --git a/jhbuildrc.in b/jhbuildrc.in
index b820687..c165ee3 100644
--- a/jhbuildrc.in
+++ b/jhbuildrc.in
@@ -77,8 +77,6 @@ else:
 append_autogenargs("libofx", "--with-opensp-includes=" + prefix + "/include/OpenSP --with-opensp-libs=" + prefix + "/lib")
 append_autogenargs("libdbi-drivers","--with-dbi-incdir=" + prefix + "/include --with-dbi-libdir=" + prefix + "/lib")
 module_makeargs["aqbanking"]="-j 1"
-module_makeargs["gnucash"]="-j 1"
-module_makeargs["gnucash-git"]="-j 1"
 
 module_extra_env["gnucash"]={'ACLOCAL_FLAGS':'-I' + os.path.join(_mingw_base, 'share', 'aclocal')}
 module_extra_env["gwenhywfar"]={'CFLAGS':'-O0'}

commit d2f417abb711a40b00be7ffc1595f20fb4845d05
Author: John Ralls <jralls at ceridwen.us>
Date:   Thu Mar 8 15:54:20 2018 -0800

    Spelling error. Also fix up setting _mingw_base and use it more.

diff --git a/jhbuildrc.in b/jhbuildrc.in
index c1ed1bf..b820687 100644
--- a/jhbuildrc.in
+++ b/jhbuildrc.in
@@ -45,28 +45,22 @@ checkoutroot = os.path.join(_projectdir, 'src')
 buildroot = os.path.join(_projectdir, 'build')
 tarballdir = os.path.join(_download_dir)
 moduleset = os.path.join(_config_dir, 'gnucash.modules')
-
-_mingw_includes = os.path.join(_basedir, 'msys2', _arch, 'include')
-_mingw_libs = os.path.join(_basedir, 'msys2', _arch, 'lib')
+_mingw_base = os.path.join(_basedir, 'msys2', _arch)
+_mingw_includes = os.path.join(_mingw_base, 'include')
+_mingw_libs = os.path.join(_mingw_base, 'lib')
 _usr_include = os.path.join('/usr', 'include')
 _usr_lib = os.path.join('/usr', 'lib')
 environ_append('CPPFLAGS', '-I%s -I%s' % (_mingw_includes, _usr_include))
 environ_append('LDFLAGS', '-L%s -L%s' % (_mingw_libs, _usr_lib))
 add_to_path_var('PKG_CONFIG_PATH', os.path.join(_mingw_libs, 'pkgconfig'))
-add_to_path_var('PATH', os.path.join(_basedir, 'msys2', _arch, 'bin'))
-
-
-if _arch == 'mingw32':
-    _mingw_base='/mingw32'
-else:
-    _mingw_base='/mingw64'
+add_to_path_var('PATH', os.path.join(_mingw_base, 'bin'))
 
 os.environ['SRCROOT'] = checkoutroot
 os.environ['PREFIX'] = prefix
 os.environ['MSYS2ROOT'] = os.path.join(_basedir, 'msys2')
 #os.environ['GUILE_LOAD_PATH'] = os.path.join(prefix, 'share', 'guile', '2.0')
 #os.environ['GUILE_LOAD_BINARY_PATH'] = os.path.join(prefix, 'lib', 'guile', '2.0', 'ccache')
-os.environ['GETTEXTDATADIRS'] = os.path.join(_mingw_base, 'share', 'gettext')
+os.environ['GETTEXTDATADIR'] = os.path.join(_mingw_base, 'share', 'gettext')
 
 if _arch == 'mingw32':
     autogenargs = "--build=i686-w64-mingw32"



Summary of changes:
 jhbuildrc.in | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)



More information about the gnucash-changes mailing list