From 1a3f68232943dd4507b684a563ee46e5ecdadb1c Mon Sep 17 00:00:00 2001 From: Alison Watson Date: Mon, 5 Aug 2019 19:52:58 -0400 Subject: [PATCH] patches for NetBSD --- config.mk | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/config.mk b/config.mk index 5150db8..aeabd6b 100644 --- a/config.mk +++ b/config.mk @@ -1,14 +1,23 @@ # st version VERSION = 0.8.2 -# Customize below to fit your system +OS = $(shell uname) # paths +ifeq $(OS) NetBSD +PREFIX = $(HOME) +else PREFIX = $(HOME)/.local +endif MANPREFIX = $(PREFIX)/share/man +ifeq $(OS) NetBSD +X11INC = /usr/X11R7/include +X11LIB = /usr/X11R7/lib +else X11INC = /usr/X11R6/include X11LIB = /usr/X11R6/lib +endif PKG_CONFIG = pkg-config @@ -20,16 +29,14 @@ LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft -lXrender \ `$(PKG_CONFIG) --libs fontconfig` \ `$(PKG_CONFIG) --libs freetype2` +ifeq $(OS) NetBSD +LIBS = $(LIBS) -Wl,-rpath,$(X11LIB) +endif + # flags STCPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600 +ifeq $(OS) NetBSD +STCPPFLAGS = $(STCPPFLAGS) -D_BSD_SOURCE +endif STCFLAGS = $(INCS) $(STCPPFLAGS) $(CPPFLAGS) $(CFLAGS) -mtune=native -march=native -O3 -pipe -fstack-protector-strong -fno-plt STLDFLAGS = $(LIBS) $(LDFLAGS) - -# OpenBSD: -#CPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -#LIBS = -L$(X11LIB) -lm -lX11 -lutil -lXft \ -# `pkg-config --libs fontconfig` \ -# `pkg-config --libs freetype2` - -# compiler and linker -# CC = c99