From 93f6f68b6556da1816b0b795ff8500cd27806c11 Mon Sep 17 00:00:00 2001 From: Micah Elizabeth Scott Date: Tue, 15 Dec 2015 10:13:06 -0800 Subject: [PATCH 1/2] Remove nonportable "-r" option from xargs On Linux, this avoids an empty "rm -f" call when there's nothing to clean. But it isn't portable, and it causes the build to fail on Mac OS. It doesn't seem to be harmful to remove this option entirely, and it's a step toward fixing the Mac build. --- manual/clean.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manual/clean.sh b/manual/clean.sh index f4a2ea83..11c2e7bf 100755 --- a/manual/clean.sh +++ b/manual/clean.sh @@ -1,2 +1,2 @@ #!/bin/bash -for f in $( find . -name .gitignore ); do sed -re "s,^,find ${f%.gitignore} -name ',; s,$,' | xargs -r rm -f,;" $f; done | bash -v +for f in $( find . -name .gitignore ); do sed -re "s,^,find ${f%.gitignore} -name ',; s,$,' | xargs rm -f,;" $f; done | bash -v From 7948156abf75904e305e9063763b7509b2139862 Mon Sep 17 00:00:00 2001 From: Micah Elizabeth Scott Date: Tue, 15 Dec 2015 10:22:35 -0800 Subject: [PATCH 2/2] Mac build fix, gsed -> sed Homebrew is calling its GNU sed just 'sed' now. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index aa370364..3dff837f 100644 --- a/Makefile +++ b/Makefile @@ -54,7 +54,7 @@ ifeq (Darwin,$(findstring Darwin,$(shell uname))) LDFLAGS += $(shell PKG_CONFIG_PATH=$$(brew list libffi | grep pkgconfig | xargs dirname) pkg-config --silence-errors --libs libffi) # use bison installed by homebrew if available BISON = $(shell (brew list bison | grep -m1 "bin/bison") || echo bison) - SED = gsed + SED = sed else LDFLAGS += -rdynamic LDLIBS += -lrt