diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rwxr-xr-x | init.sh | 7 | ||||
| -rw-r--r-- | misc/patches/woff2.patch | 33 |
3 files changed, 39 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index de6a38e9c..7e755a6b0 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,6 @@ *.core *.obj *.exe -*.patch *.diff _*.ignore *~ @@ -288,7 +288,12 @@ else # summary if ! $VENV_ACTIVE; then 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 " source '$VENV_DIR/bin/activate'" fi diff --git a/misc/patches/woff2.patch b/misc/patches/woff2.patch new file mode 100644 index 000000000..cd4a4c3cc --- /dev/null +++ b/misc/patches/woff2.patch @@ -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 + |