Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 06 Apr 2026 01:58:41 +0000
From:      Charlie Li <vishwin@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: d4f2b679758b - main - lang/python313: fix pkg-config link logic for suffixed
Message-ID:  <69d31351.319c9.44b67747@gitrepo.freebsd.org>
index | next in thread | raw e-mail 

The branch main has been updated by vishwin:

URL: https://cgit.FreeBSD.org/ports/commit/?id=d4f2b679758bc0932507ac9fff1b0b589190291f

commit d4f2b679758bc0932507ac9fff1b0b589190291f
Author:     Charlie Li <vishwin@FreeBSD.org>
AuthorDate: 2026-04-06 01:55:57 +0000
Commit:     Charlie Li <vishwin@FreeBSD.org>
CommitDate: 2026-04-06 01:55:57 +0000

    lang/python313: fix pkg-config link logic for suffixed
---
 lang/python313/Makefile                    |  6 ++++--
 lang/python313/files/patch-Makefile.pre.in | 22 +++++++++++-----------
 lang/python313/pkg-plist                   |  4 ++--
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/lang/python313/Makefile b/lang/python313/Makefile
index 2a8b4f29b44c..32566cc90ab7 100644
--- a/lang/python313/Makefile
+++ b/lang/python313/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	python
 DISTVERSION=	${PYTHON_DISTVERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang python
 MASTER_SITES=	PYTHON/ftp/python/${DISTVERSION:C/[a-z].*//}
 PKGNAMESUFFIX=	${PYTHON_BASESUFFIX}${THREADFLAG}
@@ -114,7 +114,9 @@ BUILD_DEPENDS+=	python${PYTHON_DEFAULT}:lang/python${PYTHON_DEFAULT:S/.//g}
 
 .if !empty(ABIFLAGS) || !empty(THREADFLAG)
 PLIST_FILES+=	bin/python${PYTHON_BASEVER}${THREADFLAG}${ABIFLAGS} \
-		bin/python${PYTHON_BASEVER}${THREADFLAG}${ABIFLAGS}-config
+		bin/python${PYTHON_BASEVER}${THREADFLAG}${ABIFLAGS}-config \
+		libdata/pkgconfig/python-${PYTHON_BASEVER}${THREADFLAG}${ABIFLAGS}-embed.pc \
+		libdata/pkgconfig/python-${PYTHON_BASEVER}${THREADFLAG}${ABIFLAGS}.pc
 .endif
 
 # See https://bugs.freebsd.org/115940 and https://bugs.freebsd.org/193650
diff --git a/lang/python313/files/patch-Makefile.pre.in b/lang/python313/files/patch-Makefile.pre.in
index 74d5e79020ef..de01c0d725c1 100644
--- a/lang/python313/files/patch-Makefile.pre.in
+++ b/lang/python313/files/patch-Makefile.pre.in
@@ -1,6 +1,6 @@
---- Makefile.pre.in.orig	2024-06-07 03:15:55 UTC
+--- Makefile.pre.in.orig	2026-02-03 17:53:27 UTC
 +++ Makefile.pre.in
-@@ -83,7 +83,6 @@ BASECPPFLAGS=	@BASECPPFLAGS@
+@@ -84,7 +84,6 @@ BASECPPFLAGS=	@BASECPPFLAGS@
  OPT=		@OPT@
  BASECFLAGS=	@BASECFLAGS@
  BASECPPFLAGS=	@BASECPPFLAGS@
@@ -8,7 +8,7 @@
  # CFLAGS_NODIST is used for building the interpreter and stdlib C extensions.
  # Use it when a compiler flag should _not_ be part of the distutils CFLAGS
  # once Python is installed (Issue #21121).
-@@ -95,18 +94,16 @@ CONFIGURE_LDFLAGS_NOLTO=@LDFLAGS_NOLTO@
+@@ -96,18 +95,16 @@ CONFIGURE_LDFLAGS_NOLTO=@LDFLAGS_NOLTO@
  # LDFLAGS_NOLTO is an extra flag to disable lto. It is used to speed up building
  # of _bootstrap_python and _freeze_module tools, which don't need LTO.
  CONFIGURE_LDFLAGS_NOLTO=@LDFLAGS_NOLTO@
@@ -30,7 +30,7 @@
  PY_LDFLAGS_NODIST=$(CONFIGURE_LDFLAGS_NODIST) $(LDFLAGS_NODIST)
  PY_LDFLAGS_NOLTO=$(PY_LDFLAGS) $(CONFIGURE_LDFLAGS_NOLTO) $(LDFLAGS_NODIST)
  NO_AS_NEEDED=	@NO_AS_NEEDED@
-@@ -2258,14 +2255,6 @@ bininstall: commoninstall altbininstall
+@@ -2264,14 +2261,6 @@ bininstall: commoninstall altbininstall
  	else true; \
  	fi
  	(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)$(EXE) python3$(EXE))
@@ -45,17 +45,17 @@
  	-rm -f $(DESTDIR)$(BINDIR)/python3-config
  	(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python3-config)
  	-rm -f $(DESTDIR)$(LIBPC)/python3.pc
-@@ -2708,6 +2697,14 @@ libainstall: all scripts
+@@ -2714,6 +2703,14 @@ libainstall: all scripts
  	$(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh
  	$(INSTALL_SCRIPT) python-config.py $(DESTDIR)$(LIBPL)/python-config.py
  	$(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(LDVERSION)-config
 +	-if test "$(VERSION)" != "$(LDVERSION)"; then \
-+	  rm -f $(DESTDIR)$(BINDIR)/python$(VERSION)-config; \
-+	  (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(LDVERSION)-config python$(VERSION)-config); \
-+	  rm -f $(DESTDIR)$(LIBPC)/python-$(LDVERSION).pc; \
-+	  (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python-$(LDVERSION).pc); \
-+	  rm -f $(DESTDIR)$(LIBPC)/python-$(LDVERSION)-embed.pc; \
-+	  (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION)-embed.pc python-$(LDVERSION)-embed.pc); \
++		rm -f $(DESTDIR)$(BINDIR)/python$(VERSION)-config; \
++		(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(LDVERSION)-config python$(VERSION)-config); \
++		rm -f $(DESTDIR)$(LIBPC)/python-$(VERSION).pc; \
++		(cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(LDVERSION).pc python-$(VERSION).pc); \
++		rm -f $(DESTDIR)$(LIBPC)/python-$(VERSION)-embed.pc; \
++		(cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(LDVERSION)-embed.pc python-$(VERSION)-embed.pc); \
 +	fi
  	$(INSTALL_SCRIPT) $(SCRIPT_IDLE) $(DESTDIR)$(BINDIR)/idle$(VERSION)
  	$(INSTALL_SCRIPT) $(SCRIPT_PYDOC) $(DESTDIR)$(BINDIR)/pydoc$(VERSION)
diff --git a/lang/python313/pkg-plist b/lang/python313/pkg-plist
index c9ed2ecf15aa..bff9a1622557 100644
--- a/lang/python313/pkg-plist
+++ b/lang/python313/pkg-plist
@@ -7929,6 +7929,6 @@ lib/libpython%%PYTHON_BASEVER%%%%THREAD%%%%ABI%%.so.1.0-gdb.py
 %%PYTHON_BASELIBDIR%%%%THREAD%%/zoneinfo/_common.py
 %%PYTHON_BASELIBDIR%%%%THREAD%%/zoneinfo/_tzpath.py
 %%PYTHON_BASELIBDIR%%%%THREAD%%/zoneinfo/_zoneinfo.py
-libdata/pkgconfig/python-%%PYTHON_BASEVER%%%%THREAD%%%%ABI%%-embed.pc
-libdata/pkgconfig/python-%%PYTHON_BASEVER%%%%THREAD%%%%ABI%%.pc
+libdata/pkgconfig/python-%%PYTHON_BASEVER%%-embed.pc
+libdata/pkgconfig/python-%%PYTHON_BASEVER%%.pc
 share/man/man1/python%%PYTHON_BASEVER%%.1.gz
home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69d31351.319c9.44b67747>