Skip to content

OpenBSD changes needed: Changed makefile using sh, changed main.cpp i… #894

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rayit wants to merge 2 commits into
base: master
Choose a base branch
from
Open

OpenBSD changes needed: Changed makefile using sh, changed main.cpp i… #894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ce6bc2
OpenBSD changes needed: Changed makefile using sh, changed main.cpp i…
rayit Dec 20, 2020
e17dc76
Added extra exports for BSD in README.md
Mar 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
10 changes: 10 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,16 @@ $ make -j
$ 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
$ doas gmake install
```

See [Development](#development) below for how to upgrade your
C++ compiler or install prerequisite packages if you get
compiler errors.
Expand Down
Empty file added geometry-716c310a.o.tmp
View file
Open in desktop
Empty file.
10 changes: 8 additions & 2 deletions main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,13 @@
#include <sys/sysctl.h>
#include <sys/param.h>
#include <sys/mount.h>
#else
#endif
#ifdef __OpenBSD__
#include <sys/types.h>
#include <sys/mount.h>
#endif

#if !defined(__APPLE__) && !defined(__OpenBSD__)
#include <sys/statfs.h>
#endif

Expand Down Expand Up @@ -85,7 +91,7 @@ struct source {
std::string layer = "";
std::string file = "";
std::string description = "";
std::string format = "";
std::string format = "";
};

size_t CPUS;
Expand Down