Date: Mon, 4 Nov 2019 02:27:13 +0000 From: wen heping <wenheping2000@hotmail.com> To: Antoine Brodin <antoine@FreeBSD.org>, Kubilay Kocak <koobs@FreeBSD.org>, Dmitry Marakasov <amdmi3@amdmi3.ru>, "python@FreeBSD.org" <python@FreeBSD.org> Subject: the patch to fix plist when build with DEBUG option Message-ID: <HK0PR02MB3108773AB659F4346C31E61BAC7F0@HK0PR02MB3108.apcprd02.prod.outlook.com>
index | next in thread | raw e-mail
[-- Attachment #1 --]
Hi,
Here is a patch to fix plist when build with DEBUG option, would you have a test of it?
Thank you !
wen
[-- Attachment #2 --]
Index: Makefile
===================================================================
--- Makefile (revision 516614)
+++ Makefile (working copy)
@@ -3,6 +3,7 @@
PORTNAME= python
PORTVERSION= ${PYTHON_PORTVERSION}
+PORTREVISION= 1
CATEGORIES= lang python
MASTER_SITES= PYTHON/ftp/python/${PORTVERSION}
PKGNAMESUFFIX= ${PYTHON_SUFFIX}
@@ -92,7 +93,8 @@
.if !empty(ABIFLAGS)
PLIST_FILES+= bin/python${PYTHON_VER}${ABIFLAGS} \
bin/python${PYTHON_VER}${ABIFLAGS}-config \
- libdata/pkgconfig/python-${PYTHON_VER}${ABIFLAGS}.pc
+ libdata/pkgconfig/python-${PYTHON_VER}${ABIFLAGS}.pc \
+ libdata/pkgconfig/python-${PYTHON_VER}${ABIFLAGS}-embed.pc
.endif
# https://bugs.python.org/issue22521
Index: files/patch-Makefile.pre.in
===================================================================
--- files/patch-Makefile.pre.in (revision 516614)
+++ files/patch-Makefile.pre.in (working copy)
@@ -1,7 +1,11 @@
# Description: Remove duplicate CFLAGS, CPPFLAGS, LDFLAGS by stripping CONFIGURE_*
# Submitted by: koobs (r326729)
# TODO: Upstream
---- Makefile.pre.in.orig 2019-10-19 23:59:05 UTC
+
+# Description: Create symlinks for non-ABI-suffixed python*-config and ABI-suffixed python-*.pc
+# Submitted by: antoine@ (r358029)
+# TODO: Upstream
+--- Makefile.pre.in.orig 2019-11-04 01:16:37 UTC
+++ Makefile.pre.in
@@ -80,7 +80,6 @@ MAKESETUP= $(srcdir)/Modules/makesetup
OPT= @OPT@
@@ -33,3 +37,33 @@
PY_LDFLAGS_NODIST=$(CONFIGURE_LDFLAGS_NODIST) $(LDFLAGS_NODIST)
NO_AS_NEEDED= @NO_AS_NEEDED@
SGI_ABI= @SGI_ABI@
+@@ -1269,14 +1266,6 @@ bininstall: altbininstall
+ else true; \
+ fi
+ (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)$(EXE) python3$(EXE))
+- -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); \
+- fi
+ -rm -f $(DESTDIR)$(BINDIR)/python3-config
+ (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python3-config)
+ -rm -f $(DESTDIR)$(LIBPC)/python3.pc
+@@ -1580,6 +1569,14 @@ libainstall: @DEF_MAKE_RULE@ python-config
+ $(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); \
++ fi
+ @if [ -s Modules/python.exp -a \
+ "`echo $(MACHDEP) | sed 's/^\(...\).*/\1/'`" = "aix" ]; then \
+ echo; echo "Installing support files for building shared extension modules on AIX:"; \
Index: pkg-plist
===================================================================
--- pkg-plist (revision 516614)
+++ pkg-plist (working copy)
@@ -22,21 +22,21 @@
include/python%%XYDOT%%%%ABI%%/compile.h
include/python%%XYDOT%%%%ABI%%/complexobject.h
include/python%%XYDOT%%%%ABI%%/context.h
-include/python%%XYDOT%%/cpython/abstract.h
-include/python%%XYDOT%%/cpython/dictobject.h
-include/python%%XYDOT%%/cpython/fileobject.h
-include/python%%XYDOT%%/cpython/initconfig.h
-include/python%%XYDOT%%/cpython/interpreteridobject.h
-include/python%%XYDOT%%/cpython/object.h
-include/python%%XYDOT%%/cpython/objimpl.h
-include/python%%XYDOT%%/cpython/pyerrors.h
-include/python%%XYDOT%%/cpython/pylifecycle.h
-include/python%%XYDOT%%/cpython/pymem.h
-include/python%%XYDOT%%/cpython/pystate.h
-include/python%%XYDOT%%/cpython/sysmodule.h
-include/python%%XYDOT%%/cpython/traceback.h
-include/python%%XYDOT%%/cpython/tupleobject.h
-include/python%%XYDOT%%/cpython/unicodeobject.h
+include/python%%XYDOT%%%%ABI%%/cpython/abstract.h
+include/python%%XYDOT%%%%ABI%%/cpython/dictobject.h
+include/python%%XYDOT%%%%ABI%%/cpython/fileobject.h
+include/python%%XYDOT%%%%ABI%%/cpython/initconfig.h
+include/python%%XYDOT%%%%ABI%%/cpython/interpreteridobject.h
+include/python%%XYDOT%%%%ABI%%/cpython/object.h
+include/python%%XYDOT%%%%ABI%%/cpython/objimpl.h
+include/python%%XYDOT%%%%ABI%%/cpython/pyerrors.h
+include/python%%XYDOT%%%%ABI%%/cpython/pylifecycle.h
+include/python%%XYDOT%%%%ABI%%/cpython/pymem.h
+include/python%%XYDOT%%%%ABI%%/cpython/pystate.h
+include/python%%XYDOT%%%%ABI%%/cpython/sysmodule.h
+include/python%%XYDOT%%%%ABI%%/cpython/traceback.h
+include/python%%XYDOT%%%%ABI%%/cpython/tupleobject.h
+include/python%%XYDOT%%%%ABI%%/cpython/unicodeobject.h
include/python%%XYDOT%%%%ABI%%/datetime.h
include/python%%XYDOT%%%%ABI%%/descrobject.h
include/python%%XYDOT%%%%ABI%%/dictobject.h
help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?HK0PR02MB3108773AB659F4346C31E61BAC7F0>