From 80e67ef636ce0ddd55a4a7578d7bbdb186002560 Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Wed, 4 Dec 2019 08:46:58 -0500 Subject: [PATCH] Fix the patch from #1953 to work with both `git` and `patch` Closes #1954 --- .../0004-libxml2.la-is-in-top_builddir.patch | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/patches/libxml2/0004-libxml2.la-is-in-top_builddir.patch b/patches/libxml2/0004-libxml2.la-is-in-top_builddir.patch index cdbd8f6cf3..30c81dc77c 100644 --- a/patches/libxml2/0004-libxml2.la-is-in-top_builddir.patch +++ b/patches/libxml2/0004-libxml2.la-is-in-top_builddir.patch @@ -1,6 +1,17 @@ ---- Makefile.in.orig 2019-12-04 06:31:23.930568000 +0900 -+++ Makefile.in 2019-12-04 06:31:26.838389000 +0900 -@@ -1057,7 +1057,7 @@ +From 0b6ae484761fa01242fe8b67b54e3eb2d282d83d Mon Sep 17 00:00:00 2001 +From: Mike Dalessio +Date: Wed, 4 Dec 2019 08:43:51 -0500 +Subject: [PATCH] fix libxml2.la's path + +--- + Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.in b/Makefile.in +index cf96d41..1372d8b 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -1057,7 +1057,7 @@ clean-noinstLTLIBRARIES: rm -f $${locs}; \ } @@ -9,3 +20,6 @@ $(AM_V_CCLD)$(libxml2_la_LINK) -rpath $(libdir) $(libxml2_la_OBJECTS) $(libxml2_la_LIBADD) $(LIBS) testdso.la: $(testdso_la_OBJECTS) $(testdso_la_DEPENDENCIES) $(EXTRA_testdso_la_DEPENDENCIES) +-- +2.17.1 +