From 5da2775e6b2ad6713ef886356657c1b4d15a6308 Mon Sep 17 00:00:00 2001 From: sthen Date: Fri, 3 Jul 2020 21:11:13 +0000 Subject: [PATCH] use --embed on python3.8-config --ldflags lines --- net/toxic/Makefile | 4 ++-- net/toxic/patches/patch-cfg_checks_python_mk | 4 ++-- www/kore/Makefile | 3 ++- www/kore/patches/patch-Makefile | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/net/toxic/Makefile b/net/toxic/Makefile index 125c0fc8c7c..38b69892e4f 100755 --- a/net/toxic/Makefile +++ b/net/toxic/Makefile @@ -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 GH_ACCOUNT = Jfreegman GH_PROJECT = toxic GH_TAGNAME = v0.8.2 -REVISION = 3 +REVISION = 4 CATEGORIES = net diff --git a/net/toxic/patches/patch-cfg_checks_python_mk b/net/toxic/patches/patch-cfg_checks_python_mk index fc4ccebf41c..8c1e3deb2a1 100644 --- a/net/toxic/patches/patch-cfg_checks_python_mk +++ b/net/toxic/patches/patch-cfg_checks_python_mk @@ -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 --- cfg/checks/python.mk.orig @@ -9,7 +9,7 @@ Index: cfg/checks/python.mk ifneq ($(CHECK_PYTHON3_LIBS), error) - LDFLAGS += $(shell python3-config --ldflags) - 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) OBJ += $(PYTHON_OBJ) else ifneq ($(MAKECMDGOALS), clean) diff --git a/www/kore/Makefile b/www/kore/Makefile index 4d11cd63806..0caf8209168 100644 --- a/www/kore/Makefile +++ b/www/kore/Makefile @@ -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 DISTNAME = kore-3.3.1 +REVISION = 0 CATEGORIES = www diff --git a/www/kore/patches/patch-Makefile b/www/kore/patches/patch-Makefile index 2668944649e..c5825098294 100644 --- a/www/kore/patches/patch-Makefile +++ b/www/kore/patches/patch-Makefile @@ -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 --- Makefile.orig @@ -31,7 +31,7 @@ Index: Makefile S_SRC+=src/python.c - KORE_PYTHON_LIB?=$(shell python3-config --ldflags) - 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) LDFLAGS+=$(KORE_PYTHON_LIB) CFLAGS+=$(KORE_PYTHON_INC) -DKORE_USE_PYTHON