From 6ce6bc2a9c6c5f01748567b26487f000777ca5bf Mon Sep 17 00:00:00 2001 From: Raymond Marx Date: Sun, 20 Dec 2020 15:20:29 +0100 Subject: [PATCH 1/2] OpenBSD changes needed: Changed makefile using sh, changed main.cpp includes --- Makefile | 2 +- README.md | 8 ++++++++ main.cpp | 10 ++++++++-- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index ae542a1f1..5ba7b9665 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ PREFIX ?= /usr/local MANDIR ?= $(PREFIX)/share/man/man1/ BUILDTYPE ?= Release -SHELL = /bin/bash +SHELL = /bin/sh # inherit from env if set CC := $(CC) diff --git a/README.md b/README.md index af83058a0..618075af5 100644 --- a/README.md +++ b/README.md @@ -63,6 +63,14 @@ $ make -j $ make install ``` +On OpenBSD +```sh +$ git clone https://github.com/mapbox/tippecanoe.git +$ cd tippecanoe +$ gmake +$ doas gmake install +``` + See [Development](#development) below for how to upgrade your C++ compiler or install prerequisite packages if you get compiler errors. diff --git a/main.cpp b/main.cpp index ae41d8254..e7592b8d8 100644 --- a/main.cpp +++ b/main.cpp @@ -39,7 +39,13 @@ #include #include #include -#else +#endif +#ifdef __OpenBSD__ +#include +#include +#endif + +#if !defined(__APPLE__) && !defined(__OpenBSD__) #include #endif @@ -85,7 +91,7 @@ struct source { std::string layer = ""; std::string file = ""; std::string description = ""; - std::string format = ""; + std::string format = ""; }; size_t CPUS; From e17dc76a9f8bf5b869b6b6ab26e915770ad66bb3 Mon Sep 17 00:00:00 2001 From: rayit Date: Fri, 5 Mar 2021 22:21:31 +0100 Subject: [PATCH 2/2] Added extra exports for BSD in README.md --- README.md | 2 ++ geometry-716c310a.o.tmp | 0 2 files changed, 2 insertions(+) create mode 100644 geometry-716c310a.o.tmp diff --git a/README.md b/README.md index 618075af5..556bbf835 100644 --- a/README.md +++ b/README.md @@ -65,6 +65,8 @@ $ make install On OpenBSD ```sh +$ export CC=/usr/bin/clang +$ export CXX=/usr/bin/clang++ $ git clone https://github.com/mapbox/tippecanoe.git $ cd tippecanoe $ gmake diff --git a/geometry-716c310a.o.tmp b/geometry-716c310a.o.tmp new file mode 100644 index 000000000..e69de29bb