forked from dogecoin/dogecoin
-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request dogecoin#3364 from edtubbs/1.14.7-dev-fontconfig
depends: updated to fontconfig 2.12.6
- Loading branch information
Showing
2 changed files
with
31 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
commit 7b6eb33ecd88768b28c67ce5d2d68a7eed5936b6 | ||
Author: fanquake <fanquake@gmail.com> | ||
Date: Tue Aug 25 14:34:53 2020 +0800 | ||
|
||
Remove rule that causes inadvertent header regeneration | ||
|
||
Otherwise the makefile will needlessly attempt to re-generate the | ||
headers with gperf. This can be dropped once the upstream build is fixed. | ||
|
||
See #10851. | ||
|
||
diff --git a/src/Makefile.in b/src/Makefile.in | ||
index f4626ad..4ae1b00 100644 | ||
--- a/src/Makefile.in | ||
+++ b/src/Makefile.in | ||
@@ -912,7 +912,7 @@ | ||
' - > $@.tmp && \ | ||
mv -f $@.tmp fcobjshash.gperf && touch $@ || ( $(RM) $@.tmp && false ) | ||
|
||
-fcobjshash.h: Makefile fcobjshash.gperf | ||
+fcobjshash.h: | ||
$(AM_V_GEN) $(GPERF) --pic -m 100 fcobjshash.gperf > $@.tmp && \ | ||
mv -f $@.tmp $@ || ( $(RM) $@.tmp && false ) | ||
|