gnucash-on-windows master: xmlsec - fix make clean before first build

Geert Janssens gjanssens at code.gnucash.org
Wed Apr 15 09:42:56 EDT 2020


Updated	 via  https://github.com/Gnucash/gnucash-on-windows/commit/a702c901 (commit)
	from  https://github.com/Gnucash/gnucash-on-windows/commit/a59bf251 (commit)



commit a702c901d33e48d0f803c6805069b1ab053b9092
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Wed Apr 15 15:28:28 2020 +0200

    xmlsec - fix make clean before first build
    
    The build system originally tried to run chmod on non-existing files and directories,
    resulting in errors which break the build. With the patch the chmod will only be
    executed if the files and directories actually exist.

diff --git a/gnucash.modules b/gnucash.modules
index 68b8171..42f4182 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -167,8 +167,10 @@
 
   <autotools id="xmlsec" >
     <branch module="lsh123/xmlsec/archive/xmlsec-1_2_28.tar.gz"
-	    repo="github-tar" version="1.2.28"
-	    checkoutdir="xmlsec-xmlsec-1_2_28"/>
+            repo="github-tar" version="1.2.28"
+            checkoutdir="xmlsec-xmlsec-1_2_28">
+        <patch file="xmlsec-make-clean.patch" strip="1"/>
+    </branch>
     <dependencies>
       <dep package="openssl"/>
     </dependencies>
diff --git a/patches/xmlsec-make-clean.patch b/patches/xmlsec-make-clean.patch
new file mode 100644
index 0000000..26efee2
--- /dev/null
+++ b/patches/xmlsec-make-clean.patch
@@ -0,0 +1,16 @@
+diff --git a/docs/api/Makefile.am b/docs/api/Makefile.am
+index a1ffd3a7..e88ea929 100644
+--- a/docs/api/Makefile.am
++++ b/docs/api/Makefile.am
+@@ -268,9 +268,8 @@ clean-local:
+ 	-rm -rf $(SOURCE_CODE_DIR) $(EXAMPLES_DIR) $(SCAN_DIR)/*.txt $(SGML_DIR) $(GTKDOC_MKDB_OUTPUT_DIR)
+ 	-rm -f *.stamp *.types index.sgml
+ 	@( if [ z"$(builddir)" != z"$(srcdir)" ] ; then \
+-    	chmod -R u+w $(builddir)/src && rm -rf $(builddir)/src ; \
+-    	chmod -R u+w $(builddir)/images && rm -rf $(builddir)/images ; \
+-    	chmod -R u+w $(builddir)/*.png && rm -rf $(builddir)/*.png ; \
++	find $(builddir) -name 'src' -o -name 'images' -o -name '*.png' -exec chmod u+w '{}' ';' ; \
++	rm -rf $(builddir)/src $(builddir)/images $(builddir)/*.png ; \
+ 	 fi ; )
+ 
+ distclean-local: clean-local



Summary of changes:
 gnucash.modules                 |  6 ++++--
 patches/xmlsec-make-clean.patch | 16 ++++++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 patches/xmlsec-make-clean.patch



More information about the gnucash-changes mailing list