diff options
| author | Miodrag Milanović <mmicko@gmail.com> | 2022-07-25 16:10:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-25 16:10:29 +0200 |
| commit | d4875ceae6f880400a1c1f18a5c97c88793f77dc (patch) | |
| tree | 52852e07f72f5aeb1f42fff5e15b68af34ea18b0 | |
| parent | 358e656e21bbbf6f09bb9f353a3829123f73d3b6 (diff) | |
| parent | 58fddf61ccd4715150f1dba40e62eac650ef9ee3 (diff) | |
| download | yosys-d4875ceae6f880400a1c1f18a5c97c88793f77dc.tar.gz yosys-d4875ceae6f880400a1c1f18a5c97c88793f77dc.tar.bz2 yosys-d4875ceae6f880400a1c1f18a5c97c88793f77dc.zip | |
Merge pull request #3406 from josuah/master
Better compatibility for OpenBSD
| -rw-r--r-- | Makefile | 18 | ||||
| -rw-r--r-- | libs/fst/config.h | 2 |
2 files changed, 10 insertions, 10 deletions
@@ -126,8 +126,10 @@ endif else LDFLAGS += -rdynamic +ifneq ($(OS), OpenBSD) LDLIBS += -lrt endif +endif YOSYS_VER := 0.19+25 @@ -395,7 +397,7 @@ endif # ENABLE_PYOSYS ifeq ($(ENABLE_READLINE),1) CXXFLAGS += -DYOSYS_ENABLE_READLINE -ifeq ($(OS), FreeBSD) +ifeq ($(OS), $(filter $(OS),FreeBSD OpenBSD NetBSD)) CXXFLAGS += -I/usr/local/include endif LDLIBS += -lreadline @@ -430,7 +432,7 @@ endif ifeq ($(ENABLE_PLUGINS),1) CXXFLAGS += $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKG_CONFIG) --silence-errors --cflags libffi) -DYOSYS_ENABLE_PLUGINS LDLIBS += $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKG_CONFIG) --silence-errors --libs libffi || echo -lffi) -ifneq ($(OS), FreeBSD) +ifneq ($(OS), $(filter $(OS),FreeBSD OpenBSD NetBSD)) LDLIBS += -ldl endif endif @@ -447,10 +449,13 @@ endif ifeq ($(ENABLE_TCL),1) TCL_VERSION ?= tcl$(shell bash -c "tclsh <(echo 'puts [info tclversion]')") -ifeq ($(OS), FreeBSD) +ifeq ($(OS), $(filter $(OS),FreeBSD OpenBSD NetBSD)) +# BSDs usually use tcl8.6, but the lib is named "libtcl86" TCL_INCLUDE ?= /usr/local/include/$(TCL_VERSION) +TCL_LIBS ?= -l$(subst .,,$(TCL_VERSION)) else TCL_INCLUDE ?= /usr/include/$(TCL_VERSION) +TCL_LIBS ?= -l$(TCL_VERSION) endif ifeq ($(CONFIG),mxe) @@ -458,12 +463,7 @@ CXXFLAGS += -DYOSYS_ENABLE_TCL LDLIBS += -ltcl86 -lwsock32 -lws2_32 -lnetapi32 -lz -luserenv else CXXFLAGS += $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKG_CONFIG) --silence-errors --cflags tcl || echo -I$(TCL_INCLUDE)) -DYOSYS_ENABLE_TCL -ifeq ($(OS), FreeBSD) -# FreeBSD uses tcl8.6, but lib is named "libtcl86" -LDLIBS += $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKG_CONFIG) --silence-errors --libs tcl || echo -l$(TCL_VERSION) | tr -d '.') -else -LDLIBS += $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKG_CONFIG) --silence-errors --libs tcl || echo -l$(TCL_VERSION)) -endif +LDLIBS += $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKG_CONFIG) --silence-errors --libs tcl || echo $(TCL_LIBS)) endif endif diff --git a/libs/fst/config.h b/libs/fst/config.h index cd036f16a..a2f0fca82 100644 --- a/libs/fst/config.h +++ b/libs/fst/config.h @@ -21,7 +21,7 @@ #undef HAVE_LIBPTHREAD #undef HAVE_FSEEKO #endif -#ifdef __FreeBSD__ +#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) #undef HAVE_ALLOCA_H #endif |