pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/chat/weechat



Module Name:    pkgsrc
Committed By:   leot
Date:           Wed Apr 22 16:16:12 UTC 2020

Modified Files:
        pkgsrc/chat/weechat: Makefile

Log Message:
weechat: Use SUBST framework to adjust hardcoded pkg-config python checks

The previous ${LN} incantation missed possible python3-embed.pc file
(present in python38) ending up in a not-working python support.

Do not adjust file under ${BUILDLINK_DIR} and use the SUBST framework
to adjust all python3 pkg-config invocations.


To generate a diff of this commit:
cvs rdiff -u -r1.113 -r1.114 pkgsrc/chat/weechat/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/chat/weechat/Makefile
diff -u pkgsrc/chat/weechat/Makefile:1.113 pkgsrc/chat/weechat/Makefile:1.114
--- pkgsrc/chat/weechat/Makefile:1.113  Mon Mar 30 11:07:18 2020
+++ pkgsrc/chat/weechat/Makefile        Wed Apr 22 16:16:12 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.113 2020/03/30 11:07:18 nia Exp $
+# $NetBSD: Makefile,v 1.114 2020/04/22 16:16:12 leot Exp $
 
 DISTNAME=      weechat-2.8
 CATEGORIES=    chat
@@ -37,10 +37,12 @@ BUILDLINK_TRANSFORM+=       rm:-Werror-implici
 
 .include "options.mk"
 
-pre-configure:
 .if !empty(PKG_OPTIONS:Mpython)
-       ${LN} -sf ${BUILDLINK_DIR}/lib/pkgconfig/python-${PYVERSSUFFIX}.pc \
-               ${BUILDLINK_DIR}/lib/pkgconfig/python3.pc
+SUBST_CLASSES+=                python
+SUBST_STAGE.python=    pre-configure
+SUBST_MESSAGE.python=  Adjust pkg-config python checks
+SUBST_FILES.python=    configure.ac cmake/FindPython.cmake
+SUBST_SED.python=      -e 's,python3,python-${PYVERSSUFFIX},g'
 .endif
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"



Home | Main Index | Thread Index | Old Index