Add missing woff2 patch. Closes #20

This commit is contained in:
Rasmus Andersson 2017-08-31 07:39:28 -07:00
parent e9267ab4bc
commit da49fd5536
3 changed files with 39 additions and 2 deletions

1
.gitignore vendored
View file

@ -6,7 +6,6 @@
*.core *.core
*.obj *.obj
*.exe *.exe
*.patch
*.diff *.diff
_*.ignore _*.ignore
*~ *~

View file

@ -288,7 +288,12 @@ else
# summary # summary
if ! $VENV_ACTIVE; then if ! $VENV_ACTIVE; then
echo "You now need to activate virtualenv by:" echo "You now need to activate virtualenv by:"
echo " source '$0'" if [ "$0" == "./init.sh" ]; then
# pretty format for common case
echo " source init.sh"
else
echo " source '$0'"
fi
echo "Or directly by sourcing the activate script:" echo "Or directly by sourcing the activate script:"
echo " source '$VENV_DIR/bin/activate'" echo " source '$VENV_DIR/bin/activate'"
fi fi

33
misc/patches/woff2.patch Normal file
View file

@ -0,0 +1,33 @@
From 25319cecf58faf9d92f489ad52323fe4762b8087 Mon Sep 17 00:00:00 2001
From: Rasmus Andersson <rasmus@notion.se>
Date: Mon, 21 Aug 2017 07:53:23 -0700
Subject: [PATCH] Exclude invalid ar flag in makefile on macOS
---
Makefile | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 4b3bd7b..5bf878f 100644
--- a/Makefile
+++ b/Makefile
@@ -11,13 +11,15 @@ CANONICAL_PREFIXES ?= -no-canonical-prefixes
NOISY_LOGGING ?= -DFONT_COMPRESSION_BIN
COMMON_FLAGS = -fno-omit-frame-pointer $(CANONICAL_PREFIXES) $(NOISY_LOGGING) -D __STDC_FORMAT_MACROS
+ARFLAGS = cr
+
ifeq ($(OS), Darwin)
CPPFLAGS += -DOS_MACOSX
else
COMMON_FLAGS += -fno-tree-vrp
+ ARFLAGS += f
endif
-ARFLAGS = crf
CFLAGS += $(COMMON_FLAGS)
CXXFLAGS += $(COMMON_FLAGS) -std=c++11
--
2.11.0