--- trealla-3.5.22/GNUmakefile.orig +++ trealla-3.5.22/GNUmakefile @@ -1,19 +1,17 @@ # Installation paths -PREFIX ?= /usr/local +PREFIX ?= /usr BINDIR ?= $(PREFIX)/bin LIBDIR ?= $(PREFIX)/share/trealla MANDIR ?= $(PREFIX)/share/man EMBED ?= 1 -PYTHON ?= python3 -HOST_CC ?= cc +PYTHON ?= python3.9 +HOST_CC ?= gcc -GIT_VERSION := "$(shell git describe --abbrev=4 --dirty --always --tags)" -GIT_VERSION := "$(shell git describe --abbrev=4 --dirty --always --tags)" COMPILER_IS_GCC := $(shell $(CC) --version | grep -E -o 'g?cc') -CFLAGS = -MMD -MP -Isrc -I/usr/local/include -DVERSION='$(GIT_VERSION)' \ +CFLAGS = -MMD -MP -Isrc \ -DDEFAULT_LIBRARY_PATH='"$(LIBDIR)/library"' \ -O3 $(OPT) -D_GNU_SOURCE \ -Wall -Wextra \ @@ -41,7 +39,7 @@ CFLAGS += -DINDEX_PROFILE endif -LDFLAGS = -L/usr/local/lib -lm +LDFLAGS = -lm UNAME_S := $(shell uname -s) @@ -57,6 +55,12 @@ LDFLAGS += -lnetwork endif +ifeq ($(UNAME_S), SunOS) +CFLAGS += -I/usr/lib/MACH64/libffi-3.2.1/include -I/usr/openssl/3/include +CFLAGS += -Wno-error=int-conversion -Wno-error=implicit-function-declaration +LDFLAGS += -L/usr/openssl/3/lib/MACH64 +endif + ifdef HOMEBREW_PREFIX LDFLAGS += -L$(HOMEBREW_PREFIX)/opt/libffi/lib -L$(HOMEBREW_PREFIX)/opt/openssl@3/lib CFLAGS += -I$(HOMEBREW_PREFIX)/opt/libffi/include -I$(HOMEBREW_PREFIX)/opt/openssl@3/include @@ -93,8 +98,8 @@ endif ifdef READLINE -CFLAGS += -DUSE_READLINE=1 -I$(HOMEBREW_PREFIX)/opt/readline/include -LDFLAGS += -lreadline -L$(HOMEBREW_PREFIX)/opt/readline/lib +CFLAGS += -DUSE_READLINE=1 -I$(HOMEBREW_PREFIX)/readline/include +LDFLAGS += -lreadline -L$(HOMEBREW_PREFIX)/readline/lib endif ifdef EDITLINE @@ -120,7 +125,7 @@ endif ifndef NOFFI -CFLAGS += -DUSE_FFI=1 -I/usr/local/opt/libffi/include +CFLAGS += -DUSE_FFI=1 LDFLAGS += -lffi ifeq ($(filter OpenBSD Haiku,$(UNAME_S)),) LDFLAGS += -ldl