Skip to content

Commit

Permalink
Fix the patch from #1953 to work with both git and patch
Browse files Browse the repository at this point in the history
Closes #1954
  • Loading branch information
flavorjones committed Dec 4, 2019
1 parent 3361112 commit 56c4db2
Showing 1 changed file with 17 additions and 3 deletions.
20 changes: 17 additions & 3 deletions 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 <mike.dalessio@gmail.com>
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}; \
}

Expand All @@ -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

0 comments on commit 56c4db2

Please sign in to comment.