Date: Sat, 20 Apr 2002 20:23:24 -0400 (EDT) From: Alan Eldridge <ports@geeksrus.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: tg@FreeBSD.org, portmgr@FreeBSD.org Subject: ports/37300: Mk/bsd.ports.mk: fix broken USE_PYTDISTUTILS support Message-ID: <200204210023.g3L0NOoZ041988@wwweasel.geeksrus.net>
next in thread | raw e-mail | index | archive | help
>Number: 37300
>Category: ports
>Synopsis: Mk/bsd.ports.mk: fix broken USE_PYTDISTUTILS support
>Confidential: no
>Severity: critical
>Priority: high
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Sat Apr 20 17:30:02 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: Alan Eldridge
>Release: FreeBSD 4.5-STABLE i386
>Organization:
Geeksrus.NET
>Environment:
System: FreeBSD wwweasel.geeksrus.net 4.5-STABLE FreeBSD 4.5-STABLE #0: Sat Apr 20 17:01:54 EDT 2002 root@wwweasel.geeksrus.net:/usr/obj/usr/src/sys/WWWEASEL i386
>Description:
bsd.python.mk defines a do-build target if _POSTMKINCLUDED and
USE_PYDISTUTILS are defined. Only way that can happen before
bsd.port.mk's own default do-build target gets defined is by including
bsd.python.mk again after setting _POSTMKINCLUDED.
This patch also brings the behavior in line with with the comments in
bsd.python.mk, which state that USE_PYDISTUTILS is sufficient to bring
in bsd.python.mk.
>How-To-Repeat:
Try to make, e.g., py-tkinter.
>Fix:
==8<====8<====8<====8<====8<====8<====8<====8<====8<====8<==
Index: Mk/bsd.port.mk
===================================================================
RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.409
diff -u -3 -r1.409 bsd.port.mk
--- Mk/bsd.port.mk 4 Apr 2002 10:06:00 -0000 1.409
+++ Mk/bsd.port.mk 21 Apr 2002 00:15:25 -0000
@@ -778,7 +778,7 @@
.include "${PORTSDIR}/Mk/bsd.emacs.mk"
.endif
-.if defined(USE_PYTHON) || defined(PYTHON_VERSION)
+.if defined(USE_PYTHON) || defined(PYTHON_VERSION) || defined(USE_PYDISTUTILS)
.include "${PORTSDIR}/Mk/bsd.python.mk"
.endif
@@ -816,6 +816,10 @@
.endif
_POSTMKINCLUDED= yes
+
+.if defined(USE_PYTHON) || defined(PYTHON_VERSION) || defined(USE_PYDISTUTILS)
+.include "${PORTSDIR}/Mk/bsd.python.mk"
+.endif
WRKDIR?= ${WRKDIRPREFIX}${.CURDIR}/work
.if defined(NO_WRKSUBDIR)
==8<====8<====8<====8<====8<====8<====8<====8<====8<====8<==
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200204210023.g3L0NOoZ041988>