Date: Thu, 26 Mar 2009 04:05:26 +0000 (UTC) From: Stef Walter <stef@memberwebs.com> To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/133081: PYEASYINSTALL_ARCHDEP=yes makes broken packages Message-ID: <20090326040525.3D891EFB6F1@mx.npubs.com> References: <200903260230.n2Q2U3ge002668@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.
--------------020204010903040000080503
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Let's try attaching these as files, and see if it's more readable.
--------------020204010903040000080503
Content-Type: text/x-diff;
name="bsd-python-osrel.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="bsd-python-osrel.diff"
--- Mk/bsd.python.mk.orig 2009-03-26 00:57:49.000000000 +0000
+++ Mk/bsd.python.mk 2009-03-26 01:06:38.000000000 +0000
@@ -175,7 +175,7 @@
#
# PYEASYINSTALL_OSARCH
# - Platform identifier for easy_install.
-# default: -${OPSYS:L}-${_OSRELEASE}-${ARCH}
+# default: -${OPSYS:L}-${_OSRELEASE:R}-${ARCH}
# if PYEASYINSTALL_ARCHDEP is defined.
#
# PYEASYINSTALL_CMD - Full file path to easy_install command.
@@ -470,7 +470,7 @@
.if !defined(_OSRELEASE)
_OSRELEASE!= ${UNAME} -r
.endif
-PYEASYINSTALL_OSARCH?= -${OPSYS:L}-${_OSRELEASE}-${ARCH}
+PYEASYINSTALL_OSARCH?= -${OPSYS:L}-${_OSRELEASE:R}-${ARCH}
.endif
PYEASYINSTALL_EGG?= ${PYDISTUTILS_PKGNAME:C/[^A-Za-z0-9.]+/_/g}-${PYDISTUTILS_PKGVERSION:C/[^A-Za-z0-9.]+/_/g}-${PYTHON_VERSION:S/thon//}${PYEASYINSTALL_OSARCH}.egg
PYEASYINSTALL_CMD?= ${LOCALBASE}/bin/easy_install-${PYTHON_VER}
--------------020204010903040000080503
Content-Type: text/x-diff;
name="patch-python-distutils-osrel.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="patch-python-distutils-osrel.diff"
--- Lib/distutils/util.py.orig 2009-03-26 01:08:25.000000000 +0000
+++ Lib/distutils/util.py 2009-03-26 00:55:08.000000000 +0000
@@ -52,6 +52,9 @@
# i386, etc.
# XXX what about Alpha, SPARC, etc?
return "%s-%s" % (osname, machine)
+ elif osname[:7] == "freebsd":
+ release = release.split('.')[0]
+ return "%s-%s-%s" % (osname, release, machine)
elif osname[:5] == "sunos":
if release[0] >= "5": # SunOS 5 == Solaris 2
osname = "solaris"
--------------020204010903040000080503--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090326040525.3D891EFB6F1>