Attachment 17184 Details for Bug 31273 – file.diff

[patch] file.diff

file.diff (text/plain), 1.83 KB, created by anders on 2001-10-15 02:00:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: anders

Created: 2001-10-15 02:00:01 UTC

Size: 1.83 KB

patch

obsolete

>diff -Nur mod_python.orig/Makefile mod_python/Makefile
>--- mod_python.orig/Makefile	Sat Oct 13 14:15:57 2001
>+++ mod_python/Makefile	Sun Oct 14 22:31:32 2001
>@@ -18,6 +18,7 @@
> BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
> RUN_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
> 
>+NO_PACKAGE=	"Requires Python without threads support"
> USE_PYTHON=	yes
> 
> .include <bsd.port.pre.mk>
>@@ -44,7 +45,7 @@
> .endif
> 
> post-configure:
>-	@${SH} ${PKGREQ}.threads ${PYTHON_CMD} ${PYTHON_BASE}
>+	@${SH} ${PKGREQ}.threads ${PYTHON_CMD}
> .if defined(OPTIONAL_LIBS)
> 	${SED} 's/^$LIBS=.*$/\1 ${OPTIONAL_LIBS}/' ${WRKSRC}/src/Makefile \
> 		> ${WRKSRC}/src/Makefile.tmp && \
>diff -Nur mod_python.orig/pkg-descr mod_python/pkg-descr
>--- mod_python.orig/pkg-descr	Thu Aug 16 11:31:29 2001
>+++ mod_python/pkg-descr	Sun Oct 14 21:14:32 2001
>@@ -7,5 +7,3 @@
> 
> This port requires a Python installation without threads support. Build &
> (re)install Python with WITHOUT_THREADS set.
>-
>-- Anders Nordby <anders@fix.no>
>diff -Nur mod_python.orig/pkg-req.threads mod_python/pkg-req.threads
>--- mod_python.orig/pkg-req.threads	Thu Aug 16 11:31:29 2001
>+++ mod_python/pkg-req.threads	Sun Oct 14 21:15:13 2001
>@@ -1,18 +1,18 @@
> #! /bin/sh
> # anders@fix.no, 2001-08-07
> 
>-mydir=`dirname $0`
>+pydir=`dirname $1 | sed "s/\/bin//"`
> mylibc=`ldd $1 | tail +2 | awk '{print $1}' | cut -d'.' -f1 | grep ^libc`
> 
> case $mylibc in
> libc_r)
>-	echo "Error: Python installation in $2 uses threads. mod_python requires"
>+	echo "Error: Python installation in $pydir uses threads. mod_python requires"
> 	echo "it to be built without threads. Please deinstall & rebuild/reinstall Python with"
> 	echo "WITHOUT_THREADS set."
> 	exit 1
> 	;;
> libc)
>-	echo "Using a no-threads Python installation (PREFIX $2). Good."
>+	echo "Using a no-threads Python installation (in $pydir). Good."
> 	exit 0
> 	;;
> *)

Actions: View | Diff

Attachments on bug 31273: 17184