gnucash-on-osx master: Upgrade Guile to 2.2
John Ralls
jralls at code.gnucash.org
Sun Jul 29 15:12:56 EDT 2018
Updated via https://github.com/Gnucash/gnucash-on-osx/commit/8ed792e0 (commit)
from https://github.com/Gnucash/gnucash-on-osx/commit/5c684b72 (commit)
commit 8ed792e0ae516ae052d982df8df9f43d3c1ec5c4
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Jul 16 12:48:19 2018 -0700
Upgrade Guile to 2.2
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 2e80464..e5f505b 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -228,6 +228,18 @@ for i in `ls $PREFIX/lib/libboost*.dylib`; do for j in `ls $PREFIX/lib/libboost*
<dep package="icu55"/>
</after>
</autotools>
+ <autotools id="guile22" autogen-sh="configure">
+ <branch repo="ftp.gnu.org" module="guile/guile-2.2.4.tar.gz"
+ version="2.2.4">
+ <patch file="https://raw.githubusercontent.com/gnucash/gnucash-on-osx/master/patches/guile-2.2-libguile-Makefile-fixups.patch" strip="1"/>
+ </branch>
+ <dependencies>
+ <dep package="libunistring"/>
+ <dep package="gmp"/>
+ <dep package="libffi"/>
+ <dep package="bdw-gc"/>
+ </dependencies>
+ </autotools>
<cmake id="googletest" cmakeargs="-DBUILD_GMOCK=OFF" skip-install="True">
<branch module="google/googletest" repo="github" tag="release-1.8.0"/>
@@ -248,7 +260,7 @@ for i in `ls $PREFIX/lib/libboost*.dylib`; do for j in `ls $PREFIX/lib/libboost*
<dep package="libdbi-drivers"/>
<dep package="shared-mime-info"/>
<dep package="iso-codes"/>
- <dep package="guile2"/>
+ <dep package="guile22"/>
<dep package="sqlite"/>
</dependencies>
<after>
@@ -272,7 +284,7 @@ for i in `ls $PREFIX/lib/libboost*.dylib`; do for j in `ls $PREFIX/lib/libboost*
<dep package="libdbi-drivers"/>
<dep package="shared-mime-info"/>
<dep package="iso-codes"/>
- <dep package="guile2"/>
+ <dep package="guile22"/>
<dep package="swig"/>
<dep package="boost"/>
<dep package="googletest"/>
@@ -293,7 +305,7 @@ for i in `ls $PREFIX/lib/libboost*.dylib`; do for j in `ls $PREFIX/lib/libboost*
<dep package="libdbi-drivers"/>
<dep package="shared-mime-info"/>
<dep package="iso-codes"/>
- <dep package="guile2"/>
+ <dep package="guile22"/>
<dep package="swig"/>
<dep package="boost"/>
<dep package="googletest"/>
diff --git a/patches/guile-2.2-libguile-Makefile-fixups.patch b/patches/guile-2.2-libguile-Makefile-fixups.patch
new file mode 100644
index 0000000..fe66bf9
--- /dev/null
+++ b/patches/guile-2.2-libguile-Makefile-fixups.patch
@@ -0,0 +1,212 @@
+diff -c /Users/john/Development/Gnucash-Build/Gnucash-master-git/src/guile-2.2.4/libguile/Makefile.in\~ /Users/john/Development/Gnucash-Build/Gnucash-master-git/src/guile-2.2.4/libguile/Makefile.in
+*** a/libguile/Makefile.in Sun Jul 1 14:34:02 2018
+--- b/libguile/Makefile.in Mon Jul 16 12:15:16 2018
+***************
+*** 2239,2245 ****
+ locale-categories.h
+
+ INSTANTIATE = \
+! $(SED) -i -e 's,[@]pkgdatadir[@],$(pkgdatadir),g' \
+ -e 's,[@]pkglibdir[@],$(pkglibdir),g' \
+ -e 's,[@]GUILE_EFFECTIVE_VERSION[@],$(GUILE_EFFECTIVE_VERSION),g'
+
+--- 2239,2245 ----
+ locale-categories.h
+
+ INSTANTIATE = \
+! $(SED) -i "" -e 's,[@]pkgdatadir[@],$(pkgdatadir),g' \
+ -e 's,[@]pkglibdir[@],$(pkglibdir),g' \
+ -e 's,[@]GUILE_EFFECTIVE_VERSION[@],$(GUILE_EFFECTIVE_VERSION),g'
+
+***************
+*** 2463,2469 ****
+ guile-snarf-docs: $(top_builddir)/config.status $(srcdir)/guile-snarf-docs.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ install-binPROGRAMS: $(bin_PROGRAMS)
+! @$(NORMAL_INSTALL)
+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+--- 2463,2469 ----
+ guile-snarf-docs: $(top_builddir)/config.status $(srcdir)/guile-snarf-docs.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ install-binPROGRAMS: $(bin_PROGRAMS)
+! @$(NORMAL_INSTALL) \
+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+***************
+*** 2493,2499 ****
+ ; done
+
+ uninstall-binPROGRAMS:
+! @$(NORMAL_UNINSTALL)
+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ files=`for p in $$list; do echo "$$p"; done | \
+ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+--- 2493,2499 ----
+ ; done
+
+ uninstall-binPROGRAMS:
+! @$(NORMAL_UNINSTALL) \
+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ files=`for p in $$list; do echo "$$p"; done | \
+ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+***************
+*** 2522,2528 ****
+ rm -f $$list
+
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+! @$(NORMAL_INSTALL)
+ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+ list2=; for p in $$list; do \
+ if test -f $$p; then \
+--- 2522,2528 ----
+ rm -f $$list
+
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+! @$(NORMAL_INSTALL) \
+ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+ list2=; for p in $$list; do \
+ if test -f $$p; then \
+***************
+*** 2537,2543 ****
+ }
+
+ uninstall-libLTLIBRARIES:
+! @$(NORMAL_UNINSTALL)
+ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+ for p in $$list; do \
+ $(am__strip_dir) \
+--- 2537,2543 ----
+ }
+
+ uninstall-libLTLIBRARIES:
+! @$(NORMAL_UNINSTALL) \
+ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+ for p in $$list; do \
+ $(am__strip_dir) \
+***************
+*** 2563,2569 ****
+ @rm -f guile$(EXEEXT)
+ $(AM_V_CCLD)$(guile_LINK) $(guile_OBJECTS) $(guile_LDADD) $(LIBS)
+ install-binSCRIPTS: $(bin_SCRIPTS)
+! @$(NORMAL_INSTALL)
+ @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+--- 2563,2569 ----
+ @rm -f guile$(EXEEXT)
+ $(AM_V_CCLD)$(guile_LINK) $(guile_OBJECTS) $(guile_LDADD) $(LIBS)
+ install-binSCRIPTS: $(bin_SCRIPTS)
+! @$(NORMAL_INSTALL) \
+ @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+***************
+*** 2592,2598 ****
+ ; done
+
+ uninstall-binSCRIPTS:
+! @$(NORMAL_UNINSTALL)
+ @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
+ files=`for p in $$list; do echo "$$p"; done | \
+ sed -e 's,.*/,,;$(transform)'`; \
+--- 2592,2598 ----
+ ; done
+
+ uninstall-binSCRIPTS:
+! @$(NORMAL_UNINSTALL) \
+ @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
+ files=`for p in $$list; do echo "$$p"; done | \
+ sed -e 's,.*/,,;$(transform)'`; \
+***************
+*** 3591,3597 ****
+ clean-libtool:
+ -rm -rf .libs _libs
+ install-modincludeHEADERS: $(modinclude_HEADERS)
+! @$(NORMAL_INSTALL)
+ @list='$(modinclude_HEADERS)'; test -n "$(modincludedir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(modincludedir)'"; \
+--- 3591,3597 ----
+ clean-libtool:
+ -rm -rf .libs _libs
+ install-modincludeHEADERS: $(modinclude_HEADERS)
+! @$(NORMAL_INSTALL) \
+ @list='$(modinclude_HEADERS)'; test -n "$(modincludedir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(modincludedir)'"; \
+***************
+*** 3607,3618 ****
+ done
+
+ uninstall-modincludeHEADERS:
+! @$(NORMAL_UNINSTALL)
+ @list='$(modinclude_HEADERS)'; test -n "$(modincludedir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ dir='$(DESTDIR)$(modincludedir)'; $(am__uninstall_files_from_dir)
+ install-nodist_modincludeHEADERS: $(nodist_modinclude_HEADERS)
+! @$(NORMAL_INSTALL)
+ @list='$(nodist_modinclude_HEADERS)'; test -n "$(modincludedir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(modincludedir)'"; \
+--- 3607,3618 ----
+ done
+
+ uninstall-modincludeHEADERS:
+! @$(NORMAL_UNINSTALL) \
+ @list='$(modinclude_HEADERS)'; test -n "$(modincludedir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ dir='$(DESTDIR)$(modincludedir)'; $(am__uninstall_files_from_dir)
+ install-nodist_modincludeHEADERS: $(nodist_modinclude_HEADERS)
+! @$(NORMAL_INSTALL) \
+ @list='$(nodist_modinclude_HEADERS)'; test -n "$(modincludedir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(modincludedir)'"; \
+***************
+*** 3628,3639 ****
+ done
+
+ uninstall-nodist_modincludeHEADERS:
+! @$(NORMAL_UNINSTALL)
+ @list='$(nodist_modinclude_HEADERS)'; test -n "$(modincludedir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ dir='$(DESTDIR)$(modincludedir)'; $(am__uninstall_files_from_dir)
+ install-pkgincludeHEADERS: $(pkginclude_HEADERS)
+! @$(NORMAL_INSTALL)
+ @list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(pkgincludedir)'"; \
+--- 3628,3639 ----
+ done
+
+ uninstall-nodist_modincludeHEADERS:
+! @$(NORMAL_UNINSTALL) \
+ @list='$(nodist_modinclude_HEADERS)'; test -n "$(modincludedir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ dir='$(DESTDIR)$(modincludedir)'; $(am__uninstall_files_from_dir)
+ install-pkgincludeHEADERS: $(pkginclude_HEADERS)
+! @$(NORMAL_INSTALL) \
+ @list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(pkgincludedir)'"; \
+***************
+*** 3649,3655 ****
+ done
+
+ uninstall-pkgincludeHEADERS:
+! @$(NORMAL_UNINSTALL)
+ @list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ dir='$(DESTDIR)$(pkgincludedir)'; $(am__uninstall_files_from_dir)
+--- 3649,3655 ----
+ done
+
+ uninstall-pkgincludeHEADERS:
+! @$(NORMAL_UNINSTALL) \
+ @list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ dir='$(DESTDIR)$(pkgincludedir)'; $(am__uninstall_files_from_dir)
+
+Diff finished. Mon Jul 16 12:15:29 2018
Summary of changes:
modulesets/gnucash.modules | 18 +-
patches/guile-2.2-libguile-Makefile-fixups.patch | 212 +++++++++++++++++++++++
2 files changed, 227 insertions(+), 3 deletions(-)
create mode 100644 patches/guile-2.2-libguile-Makefile-fixups.patch
More information about the gnucash-changes
mailing list