use --embed on python3.8-config --ldflags lines

This commit is contained in:
sthen 2020-07-03 21:11:13 +00:00
parent 3d9393c505
commit 5da2775e6b
4 changed files with 8 additions and 7 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.7 2020/07/03 15:59:21 sthen Exp $ # $OpenBSD: Makefile,v 1.8 2020/07/03 21:11:13 sthen Exp $
COMMENT = ncurses-based Tox client COMMENT = ncurses-based Tox client
GH_ACCOUNT = Jfreegman GH_ACCOUNT = Jfreegman
GH_PROJECT = toxic GH_PROJECT = toxic
GH_TAGNAME = v0.8.2 GH_TAGNAME = v0.8.2
REVISION = 3 REVISION = 4
CATEGORIES = net CATEGORIES = net

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-cfg_checks_python_mk,v 1.1 2020/07/03 15:59:21 sthen Exp $ $OpenBSD: patch-cfg_checks_python_mk,v 1.2 2020/07/03 21:11:13 sthen Exp $
Index: cfg/checks/python.mk Index: cfg/checks/python.mk
--- cfg/checks/python.mk.orig --- cfg/checks/python.mk.orig
@ -9,7 +9,7 @@ Index: cfg/checks/python.mk
ifneq ($(CHECK_PYTHON3_LIBS), error) ifneq ($(CHECK_PYTHON3_LIBS), error)
- LDFLAGS += $(shell python3-config --ldflags) - LDFLAGS += $(shell python3-config --ldflags)
- CFLAGS += $(PYTHON_CFLAGS) $(shell python3-config --includes) - CFLAGS += $(PYTHON_CFLAGS) $(shell python3-config --includes)
+ LDFLAGS += $(shell ${MODPY_BIN}-config --ldflags) + LDFLAGS += $(shell ${MODPY_BIN}-config --embed --ldflags)
+ CFLAGS += $(PYTHON_CFLAGS) $(shell ${MODPY_BIN}-config --includes) + CFLAGS += $(PYTHON_CFLAGS) $(shell ${MODPY_BIN}-config --includes)
OBJ += $(PYTHON_OBJ) OBJ += $(PYTHON_OBJ)
else ifneq ($(MAKECMDGOALS), clean) else ifneq ($(MAKECMDGOALS), clean)

View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.18 2020/07/01 14:02:01 sthen Exp $ # $OpenBSD: Makefile,v 1.19 2020/07/03 21:11:13 sthen Exp $
COMMENT = web application framework for writing scalable web APIs in C COMMENT = web application framework for writing scalable web APIs in C
DISTNAME = kore-3.3.1 DISTNAME = kore-3.3.1
REVISION = 0
CATEGORIES = www CATEGORIES = www

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-Makefile,v 1.4 2020/07/01 14:02:02 sthen Exp $ $OpenBSD: patch-Makefile,v 1.5 2020/07/03 21:11:13 sthen Exp $
Index: Makefile Index: Makefile
--- Makefile.orig --- Makefile.orig
@ -31,7 +31,7 @@ Index: Makefile
S_SRC+=src/python.c S_SRC+=src/python.c
- KORE_PYTHON_LIB?=$(shell python3-config --ldflags) - KORE_PYTHON_LIB?=$(shell python3-config --ldflags)
- KORE_PYTHON_INC?=$(shell python3-config --includes) - KORE_PYTHON_INC?=$(shell python3-config --includes)
+ KORE_PYTHON_LIB?=$(shell ${MODPY_BIN}-config --ldflags) + KORE_PYTHON_LIB?=$(shell ${MODPY_BIN}-config --ldflags --embed)
+ KORE_PYTHON_INC?=$(shell ${MODPY_BIN}-config --includes) + KORE_PYTHON_INC?=$(shell ${MODPY_BIN}-config --includes)
LDFLAGS+=$(KORE_PYTHON_LIB) LDFLAGS+=$(KORE_PYTHON_LIB)
CFLAGS+=$(KORE_PYTHON_INC) -DKORE_USE_PYTHON CFLAGS+=$(KORE_PYTHON_INC) -DKORE_USE_PYTHON