From owner-freebsd-python@FreeBSD.ORG Mon Feb 15 05:00:15 2010 Return-Path: Delivered-To: freebsd-python@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 15DA41065672 for ; Mon, 15 Feb 2010 05:00:15 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 045958FC19 for ; Mon, 15 Feb 2010 05:00:15 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id o1F50Dmc016315 for ; Mon, 15 Feb 2010 05:00:13 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id o1F50D5O016310; Mon, 15 Feb 2010 05:00:13 GMT (envelope-from gnats) Date: Mon, 15 Feb 2010 05:00:13 GMT Message-Id: <201002150500.o1F50D5O016310@freefall.freebsd.org> To: freebsd-python@FreeBSD.org From: "Li-Lun Wang (Leland Wang)" Cc: Subject: Re: ports/143529: [PATCH] math/py-numpy: does not build X-BeenThere: freebsd-python@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: "Li-Lun Wang \(Leland Wang\)" List-Id: FreeBSD-specific Python issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Feb 2010 05:00:15 -0000 The following reply was made to PR ports/143529; it has been noted by GNATS. From: "Li-Lun Wang (Leland Wang)" To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/143529: [PATCH] math/py-numpy: does not build Date: Mon, 15 Feb 2010 12:50:24 +0800 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 The following patch will fix the problem. It first detects if binutils>=2.18.50 is installed. If it is, then it patches numpy so that the new fenv.h will be used if __FreeBSD_version <= 900009. - -- llwang diff -urN py-numpy.orig/Makefile py-numpy/Makefile - --- py-numpy.orig/Makefile 2010-02-07 12:08:47.306031963 -0600 +++ py-numpy/Makefile 2010-02-14 22:41:50.085214000 -0600 @@ -59,6 +59,10 @@ GCCLIBDIR= `${FC} -print-file-name=libgfortran.so|${SED} -e s/libgfortran.so//` pre-configure: + @if ${PKG_INFO} 'binutils>=2.18.50' > /dev/null 2>&1 ; then \ + ${CP} ${FILESDIR}/fenv.h ${WRKSRC}/numpy/core/include/numpy/fenv/fenv.h; \ + ${PATCH} ${PATCH_DIST_ARGS} < ${FILESDIR}/fenv.patch; \ + fi .ifdef WITH_ATLAS @${REINPLACE_CMD} -e "s+%%GCCLIBDIR%%+${GCCLIBDIR}+" \ -e "s+%%LOCALBASE%%+${LOCALBASE}+g" \ diff -urN py-numpy.orig/files/fenv.h py-numpy/files/fenv.h - --- py-numpy.orig/files/fenv.h 1969-12-31 18:00:00.000000000 -0600 +++ py-numpy/files/fenv.h 2010-02-14 22:15:04.765373000 -0600 @@ -0,0 +1,252 @@ +/*- + * Copyright (c) 2004-2005 David Schultz + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef _FENV_H_ +#define _FENV_H_ + +#include +#include + +/* + * To preserve binary compatibility with FreeBSD 5.3, we pack the + * mxcsr into some reserved fields, rather than changing sizeof(fenv_t). + */ +typedef struct { + __uint16_t __control; + __uint16_t __mxcsr_hi; + __uint16_t __status; + __uint16_t __mxcsr_lo; + __uint32_t __tag; + char __other[16]; +} fenv_t; + +#define __get_mxcsr(env) (((env).__mxcsr_hi << 16) | \ + ((env).__mxcsr_lo)) +#define __set_mxcsr(env, x) do { \ + (env).__mxcsr_hi = (__uint32_t)(x) >> 16; \ + (env).__mxcsr_lo = (__uint16_t)(x); \ +} while (0) + +typedef __uint16_t fexcept_t; + +/* Exception flags */ +#define FE_INVALID 0x01 +#define FE_DENORMAL 0x02 +#define FE_DIVBYZERO 0x04 +#define FE_OVERFLOW 0x08 +#define FE_UNDERFLOW 0x10 +#define FE_INEXACT 0x20 +#define FE_ALL_EXCEPT (FE_DIVBYZERO | FE_DENORMAL | FE_INEXACT | \ + FE_INVALID | FE_OVERFLOW | FE_UNDERFLOW) + +/* Rounding modes */ +#define FE_TONEAREST 0x0000 +#define FE_DOWNWARD 0x0400 +#define FE_UPWARD 0x0800 +#define FE_TOWARDZERO 0x0c00 +#define _ROUND_MASK (FE_TONEAREST | FE_DOWNWARD | \ + FE_UPWARD | FE_TOWARDZERO) + +/* + * As compared to the x87 control word, the SSE unit's control word + * has the rounding control bits offset by 3 and the exception mask + * bits offset by 7. + */ +#define _SSE_ROUND_SHIFT 3 +#define _SSE_EMASK_SHIFT 7 + +__BEGIN_DECLS + +/* After testing for SSE support once, we cache the result in __has_sse. */ +enum __sse_support { __SSE_YES, __SSE_NO, __SSE_UNK }; +extern enum __sse_support __has_sse; +int __test_sse(void); +#ifdef __SSE__ +#define __HAS_SSE() 1 +#else +#define __HAS_SSE() (__has_sse == __SSE_YES || \ + (__has_sse == __SSE_UNK && __test_sse())) +#endif + +/* Default floating-point environment */ +extern const fenv_t __fe_dfl_env; +#define FE_DFL_ENV (&__fe_dfl_env) + +#define __fldcw(__cw) __asm __volatile("fldcw %0" : : "m" (__cw)) +#define __fldenv(__env) __asm __volatile("fldenv %0" : : "m" (__env)) +#define __fldenvx(__env) __asm __volatile("fldenv %0" : : "m" (__env) \ + : "st", "st(1)", "st(2)", "st(3)", "st(4)", \ + "st(5)", "st(6)", "st(7)") +#define __fnclex() __asm __volatile("fnclex") +#define __fnstenv(__env) __asm __volatile("fnstenv %0" : "=m" (*(__env))) +#define __fnstcw(__cw) __asm __volatile("fnstcw %0" : "=m" (*(__cw))) +#define __fnstsw(__sw) __asm __volatile("fnstsw %0" : "=am" (*(__sw))) +#define __fwait() __asm __volatile("fwait") +#define __ldmxcsr(__csr) __asm __volatile("ldmxcsr %0" : : "m" (__csr)) +#define __stmxcsr(__csr) __asm __volatile("stmxcsr %0" : "=m" (*(__csr))) + +static __inline int +feclearexcept(int __excepts) +{ + fenv_t __env; + __uint32_t __mxcsr; + + if (__excepts == FE_ALL_EXCEPT) { + __fnclex(); + } else { + __fnstenv(&__env); + __env.__status &= ~__excepts; + __fldenv(__env); + } + if (__HAS_SSE()) { + __stmxcsr(&__mxcsr); + __mxcsr &= ~__excepts; + __ldmxcsr(__mxcsr); + } + return (0); +} + +static __inline int +fegetexceptflag(fexcept_t *__flagp, int __excepts) +{ + __uint32_t __mxcsr; + __uint16_t __status; + + __fnstsw(&__status); + if (__HAS_SSE()) + __stmxcsr(&__mxcsr); + else + __mxcsr = 0; + *__flagp = (__mxcsr | __status) & __excepts; + return (0); +} + +int fesetexceptflag(const fexcept_t *__flagp, int __excepts); +int feraiseexcept(int __excepts); + +static __inline int +fetestexcept(int __excepts) +{ + __uint32_t __mxcsr; + __uint16_t __status; + + __fnstsw(&__status); + if (__HAS_SSE()) + __stmxcsr(&__mxcsr); + else + __mxcsr = 0; + return ((__status | __mxcsr) & __excepts); +} + +static __inline int +fegetround(void) +{ + __uint16_t __control; + + /* + * We assume that the x87 and the SSE unit agree on the + * rounding mode. Reading the control word on the x87 turns + * out to be about 5 times faster than reading it on the SSE + * unit on an Opteron 244. + */ + __fnstcw(&__control); + return (__control & _ROUND_MASK); +} + +static __inline int +fesetround(int __round) +{ + __uint32_t __mxcsr; + __uint16_t __control; + + if (__round & ~_ROUND_MASK) + return (-1); + + __fnstcw(&__control); + __control &= ~_ROUND_MASK; + __control |= __round; + __fldcw(__control); + + if (__HAS_SSE()) { + __stmxcsr(&__mxcsr); + __mxcsr &= ~(_ROUND_MASK << _SSE_ROUND_SHIFT); + __mxcsr |= __round << _SSE_ROUND_SHIFT; + __ldmxcsr(__mxcsr); + } + + return (0); +} + +int fegetenv(fenv_t *__envp); +int feholdexcept(fenv_t *__envp); + +static __inline int +fesetenv(const fenv_t *__envp) +{ + fenv_t __env = *__envp; + __uint32_t __mxcsr; + + __mxcsr = __get_mxcsr(__env); + __set_mxcsr(__env, 0xffffffff); + /* + * XXX Using fldenvx() instead of fldenv() tells the compiler that this + * instruction clobbers the i387 register stack. This happens because + * we restore the tag word from the saved environment. Normally, this + * would happen anyway and we wouldn't care, because the ABI allows + * function calls to clobber the i387 regs. However, fesetenv() is + * inlined, so we need to be more careful. + */ + __fldenvx(__env); + if (__HAS_SSE()) + __ldmxcsr(__mxcsr); + return (0); +} + +int feupdateenv(const fenv_t *__envp); + +#if __BSD_VISIBLE + +int feenableexcept(int __mask); +int fedisableexcept(int __mask); + +static __inline int +fegetexcept(void) +{ + __uint16_t __control; + + /* + * We assume that the masks for the x87 and the SSE unit are + * the same. + */ + __fnstcw(&__control); + return (~__control & FE_ALL_EXCEPT); +} + +#endif /* __BSD_VISIBLE */ + +__END_DECLS + +#endif /* !_FENV_H_ */ diff -urN py-numpy.orig/files/fenv.patch py-numpy/files/fenv.patch - --- py-numpy.orig/files/fenv.patch 1969-12-31 18:00:00.000000000 -0600 +++ py-numpy/files/fenv.patch 2010-02-14 22:08:28.635395000 -0600 @@ -0,0 +1,28 @@ +--- numpy/numarray/_capi.c.orig 2009-12-28 08:00:09.000000000 -0600 ++++ numpy/numarray/_capi.c 2010-02-14 22:04:48.315355420 -0600 +@@ -9,7 +9,11 @@ + #endif + + #if defined(__GLIBC__) || defined(__APPLE__) || defined(__MINGW32__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 502114)) ++#if defined(__FreeBSD__) && (__FreeBSD_version <= 900009) ++#include "numpy/fenv/fenv.h" ++#else + #include ++#endif + #elif defined(__CYGWIN__) + #include "numpy/fenv/fenv.h" + #include "numpy/fenv/fenv.c" +--- numpy/core/include/numpy/ufuncobject.h.orig 2009-12-15 06:47:53.000000000 -0600 ++++ numpy/core/include/numpy/ufuncobject.h 2010-02-14 22:07:51.055356085 -0600 +@@ -306,7 +306,11 @@ + #elif defined(__GLIBC__) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__MINGW32__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 502114)) + + #if defined(__GLIBC__) || defined(__APPLE__) || defined(__MINGW32__) || defined(__FreeBSD__) ++#if defined(__FreeBSD__) && (__FreeBSD_version <= 900009) ++#include "numpy/fenv/fenv.h" ++#else + #include ++#endif + #elif defined(__CYGWIN__) + #include "fenv/fenv.c" + #endif -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.12 (FreeBSD) iD8DBQFLeNKOCQM7t5B2mhARAsT9AKCEL/5t3VTuNSA/vCljXo5gB1eHNQCfaSHs +hY8PH6JtWZ+1/02OerSQaQ= =jYmR -----END PGP SIGNATURE----- From owner-freebsd-python@FreeBSD.ORG Mon Feb 15 08:57:04 2010 Return-Path: Delivered-To: freebsd-python@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9B1011065672 for ; Mon, 15 Feb 2010 08:57:04 +0000 (UTC) (envelope-from lwhsu@FreeBSD.cs.nctu.edu.tw) Received: from FreeBSD.cs.nctu.edu.tw (FreeBSD.cs.nctu.edu.tw [140.113.17.209]) by mx1.freebsd.org (Postfix) with ESMTP id 6B6918FC0C for ; Mon, 15 Feb 2010 08:57:04 +0000 (UTC) Received: by FreeBSD.cs.nctu.edu.tw (Postfix, from userid 1058) id A200B61D2B; Mon, 15 Feb 2010 16:57:03 +0800 (CST) Date: Mon, 15 Feb 2010 16:57:03 +0800 From: Li-Wen Hsu To: freebsd-python@FreeBSD.org Message-ID: <20100215085703.GA40347@FreeBSD.cs.nctu.edu.tw> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="wac7ysb48OaltWcw" Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) Cc: stefan.schmidt@stadtbuch.de, saper@saper.info Subject: Jython 2.5.1 patch X-BeenThere: freebsd-python@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: FreeBSD-specific Python issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Feb 2010 08:57:04 -0000 --wac7ysb48OaltWcw Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi all, Here is the patch for updating Jython to 2.5.1: http://people.freebsd.org/~lwhsu/jython/jython.diff And these are the patches for the ports which depend on Jython: (maintainers cc'd) http://people.freebsd.org/~lwhsu/jython/isql-viewer.diff http://people.freebsd.org/~lwhsu/jython/tn5250j.diff http://people.freebsd.org/~lwhsu/jython/venice.diff Sorry that I didn't test about the functionality, but all of them are tested in the tinderbox. Please give me some feedback about these patches. Thanks, Li-Wen --=20 Li-Wen Hsu http://lwhsu.org --wac7ysb48OaltWcw Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (FreeBSD) iEYEARECAAYFAkt5DF4ACgkQQWsOOSiXsiiFigCfR0qU8pMwqJMH7u0TmU9t7HVj kBcAoJHHDE/Vn/J+ppHZBruW+FQDRlm9 =MLSU -----END PGP SIGNATURE----- --wac7ysb48OaltWcw-- From owner-freebsd-python@FreeBSD.ORG Mon Feb 15 10:30:01 2010 Return-Path: Delivered-To: freebsd-python@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D12A9106566C; Mon, 15 Feb 2010 10:30:01 +0000 (UTC) (envelope-from saper@saper.info) Received: from k.saper.info (smtp-out.saper.info [IPv6:2001:41d0:1:c823::1002]) by mx1.freebsd.org (Postfix) with ESMTP id 6E2658FC19; Mon, 15 Feb 2010 10:30:01 +0000 (UTC) Received: from k.saper.info (localhost [127.0.0.1]) by k.saper.info (8.14.3/8.14.3) with ESMTP id o1FATxgS028166 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 15 Feb 2010 10:29:59 GMT (envelope-from saper@saper.info) Received: from localhost (saper@localhost) by k.saper.info (8.14.3/8.14.3/Submit) with ESMTP id o1FATxtY028163; Mon, 15 Feb 2010 10:29:59 GMT (envelope-from saper@saper.info) X-Authentication-Warning: k.saper.info: saper owned process doing -bs Date: Mon, 15 Feb 2010 10:29:59 +0000 From: Marcin Cieslak To: Li-Wen Hsu In-Reply-To: <20100215085703.GA40347@FreeBSD.cs.nctu.edu.tw> Message-ID: References: <20100215085703.GA40347@FreeBSD.cs.nctu.edu.tw> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; format=flowed; charset=US-ASCII Cc: stefan.schmidt@stadtbuch.de, freebsd-python@FreeBSD.org Subject: Re: Jython 2.5.1 patchB X-BeenThere: freebsd-python@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: FreeBSD-specific Python issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Feb 2010 10:30:01 -0000 On Mon, 15 Feb 2010, Li-Wen Hsu wrote: > Hi all, > > Here is the patch for updating Jython to 2.5.1: > > http://people.freebsd.org/~lwhsu/jython/jython.diff Are we giving up ${PREFIX}/lib/jython${PORTVERSION:S/.//g} structure? I think it's not that bad idea and worth dragging along. What do you think? --Marcin From owner-freebsd-python@FreeBSD.ORG Mon Feb 15 10:43:43 2010 Return-Path: Delivered-To: freebsd-python@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 19EC1106566C for ; Mon, 15 Feb 2010 10:43:43 +0000 (UTC) (envelope-from lwhsu@FreeBSD.cs.nctu.edu.tw) Received: from FreeBSD.cs.nctu.edu.tw (FreeBSD.cs.nctu.edu.tw [140.113.17.209]) by mx1.freebsd.org (Postfix) with ESMTP id D41EE8FC18 for ; Mon, 15 Feb 2010 10:43:42 +0000 (UTC) Received: by FreeBSD.cs.nctu.edu.tw (Postfix, from userid 1058) id 10F036203A; Mon, 15 Feb 2010 18:43:42 +0800 (CST) Date: Mon, 15 Feb 2010 18:43:42 +0800 From: Li-Wen Hsu To: Marcin Cieslak Message-ID: <20100215104342.GA51043@FreeBSD.cs.nctu.edu.tw> References: <20100215085703.GA40347@FreeBSD.cs.nctu.edu.tw> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="OgqxwSJOaUobr8KG" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.20 (2009-06-14) Cc: stefan.schmidt@stadtbuch.de, freebsd-python@FreeBSD.org Subject: Re: Jython 2.5.1 patchB X-BeenThere: freebsd-python@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: FreeBSD-specific Python issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Feb 2010 10:43:43 -0000 --OgqxwSJOaUobr8KG Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Feb 15, 2010 at 10:29:59 +0000, Marcin Cieslak wrote: >=20 > On Mon, 15 Feb 2010, Li-Wen Hsu wrote: >=20 > > Hi all, > > > > Here is the patch for updating Jython to 2.5.1: > > > > http://people.freebsd.org/~lwhsu/jython/jython.diff >=20 > Are we giving up ${PREFIX}/lib/jython${PORTVERSION:S/.//g} structure? I removed this just because I don't feel the actual need about that. But it's discussible, that's why I post the patch here to collect comments. > I think it's not that bad idea and worth dragging along. > What do you think? Both work for me, I personally I don't like the suffix because that might conflict with some program's default patch. But I'm totally OK if it gives more convenience on the other side. Best, Li-Wen --=20 Li-Wen Hsu http://lwhsu.org --OgqxwSJOaUobr8KG Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (FreeBSD) iEYEARECAAYFAkt5JV0ACgkQQWsOOSiXsihokACghzKLTsb0lpY9STrJEIKdnbkA uQMAn1BSAfrEx3lYdGfcmmWxd1WsZAkV =w/Im -----END PGP SIGNATURE----- --OgqxwSJOaUobr8KG-- From owner-freebsd-python@FreeBSD.ORG Mon Feb 15 11:07:08 2010 Return-Path: Delivered-To: freebsd-python@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1A3661065692 for ; Mon, 15 Feb 2010 11:07:08 +0000 (UTC) (envelope-from owner-bugmaster@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 086498FC32 for ; Mon, 15 Feb 2010 11:07:08 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id o1FB77O9070421 for ; Mon, 15 Feb 2010 11:07:07 GMT (envelope-from owner-bugmaster@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id o1FB77G6070419 for freebsd-python@FreeBSD.org; Mon, 15 Feb 2010 11:07:07 GMT (envelope-from owner-bugmaster@FreeBSD.org) Date: Mon, 15 Feb 2010 11:07:07 GMT Message-Id: <201002151107.o1FB77G6070419@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: gnats set sender to owner-bugmaster@FreeBSD.org using -f From: FreeBSD bugmaster To: freebsd-python@FreeBSD.org Cc: Subject: Current problem reports assigned to freebsd-python@FreeBSD.org X-BeenThere: freebsd-python@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: FreeBSD-specific Python issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Feb 2010 11:07:08 -0000 Note: to view an individual PR, use: http://www.freebsd.org/cgi/query-pr.cgi?pr=(number). The following is a listing of current problems submitted by FreeBSD users. These represent problem reports covering all versions including experimental development code and obsolete releases. S Tracker Resp. Description -------------------------------------------------------------------------------- o ports/143799 python [MANTAINER UPDATE] sysutils/py-supervisor update to 3. f ports/143529 python [PATCH] math/py-numpy: does not build f ports/142440 python New Port: databases/py-south0.6 s ports/141133 python [NEW PORT] net-p2p/py-transmissionrpc o ports/136917 python [patch] lang/python26: gettext detection o ports/133081 python [bsd.python.mk] PYEASYINSTALL_ARCHDEP=yes makes broken o ports/122616 python databases/py-pyPgSQL - apply bytea escape bug patch in o ports/118301 python devel/py-setuptools easy-install.pth contents lost on o ports/115940 python Missed one file in lang/python25 if NO_NIS defined 9 problems total. From owner-freebsd-python@FreeBSD.ORG Mon Feb 15 12:20:04 2010 Return-Path: Delivered-To: freebsd-python@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 338A61065672 for ; Mon, 15 Feb 2010 12:20:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 2267F8FC18 for ; Mon, 15 Feb 2010 12:20:04 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id o1FCK3cY035995 for ; Mon, 15 Feb 2010 12:20:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id o1FCK3LG035994; Mon, 15 Feb 2010 12:20:03 GMT (envelope-from gnats) Date: Mon, 15 Feb 2010 12:20:03 GMT Message-Id: <201002151220.o1FCK3LG035994@freefall.freebsd.org> To: freebsd-python@FreeBSD.org From: "b. f." Cc: Subject: Re: ports/143529: [PATCH] math/py-numpy: does not build X-BeenThere: freebsd-python@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: "b. f." List-Id: FreeBSD-specific Python issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Feb 2010 12:20:04 -0000 The following reply was made to PR ports/143529; it has been noted by GNATS. From: "b. f." To: "Li-Lun Wang (Leland Wang)" Cc: bug-followup@freebsd.org, amdmi3@amdmi3.ru Subject: Re: ports/143529: [PATCH] math/py-numpy: does not build Date: Mon, 15 Feb 2010 07:13:43 -0500 >From: "Li-Lun Wang (Leland Wang)" >To: bug-followup at FreeBSD.org >Cc: >Subject: Re: ports/143529: [PATCH] math/py-numpy: does not build >Date: Mon, 15 Feb 2010 12:50:24 +0800 > > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 >The following patch will fix the problem. It first detects if > binutils>=2.18.50 is installed. If it is, then it patches numpy so > that the new fenv.h will be used if __FreeBSD_version <= 900009. This fixes the build problem on i386 (although we're stuck with possible run-time problems when numpy is built with the newer binutils until the latest fenv.h changes are backported to all supported versions of FreeBSD), but this code is machine-dependent, and fenv.h needs to be selected based on ARCH. You might do instead something like: ... .if exists(${LOCALBASE}/bin/as) .if ${ARCH} == "i386" FP_ARCH= i387 .else FP_ARCH= ${ARCH} .endif MASTER_SITES+= http://svn.freebsd.org/base/head/lib/msun/%SUBDIR%/:fp MASTER_SITE_SUBDIR+= ${FP_ARCH}/:fp DISTFILES+= fenv.h:fp .endif ... pre-configure: .if exists(${LOCALBASE}/bin/as) ${CP} ${DISTDIR}/fenv.h ${WRKSRC}/numpy/core/include/numpy/fenv/fenv.h; \ ${PATCH} ${PATCH_DIST_ARGS} < ${FILESDIR}/fenv.patch; \ .endif ... From owner-freebsd-python@FreeBSD.ORG Mon Feb 15 13:00:22 2010 Return-Path: Delivered-To: freebsd-python@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5789A106566C for ; Mon, 15 Feb 2010 13:00:22 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 2CD188FC08 for ; Mon, 15 Feb 2010 13:00:22 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id o1FD0MKM071215 for ; Mon, 15 Feb 2010 13:00:22 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id o1FD0Llx071210; Mon, 15 Feb 2010 13:00:22 GMT (envelope-from gnats) Date: Mon, 15 Feb 2010 13:00:22 GMT Message-Id: <201002151300.o1FD0Llx071210@freefall.freebsd.org> To: freebsd-python@FreeBSD.org From: "b. f." Cc: Subject: Re: ports/143529: [PATCH] math/py-numpy: does not build X-BeenThere: freebsd-python@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: "b. f." List-Id: FreeBSD-specific Python issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Feb 2010 13:00:22 -0000 The following reply was made to PR ports/143529; it has been noted by GNATS. From: "b. f." To: "Li-Lun Wang (Leland Wang)" Cc: bug-followup@freebsd.org, amdmi3@amdmi3.ru, gerald@freebsd.org Subject: Re: ports/143529: [PATCH] math/py-numpy: does not build Date: Mon, 15 Feb 2010 07:58:47 -0500 On 2/15/10, b. f. wrote: >>From: "Li-Lun Wang (Leland Wang)" >>To: bug-followup at FreeBSD.org >>Cc: >>Subject: Re: ports/143529: [PATCH] math/py-numpy: does not build >>Date: Mon, 15 Feb 2010 12:50:24 +0800 >> >> -----BEGIN PGP SIGNED MESSAGE----- >> Hash: SHA1 > >>The following patch will fix the problem. It first detects if >> binutils>=2.18.50 is installed. If it is, then it patches numpy so >> that the new fenv.h will be used if __FreeBSD_version <= 900009. > > This fixes the build problem on i386 (although we're stuck with > possible run-time problems when numpy is built with the newer binutils > until the latest fenv.h changes are backported to all supported > versions of FreeBSD), but this code is machine-dependent, and fenv.h > needs to be selected based on ARCH. > > You might do instead something like: > > ... > .if exists(${LOCALBASE}/bin/as) > .if ${ARCH} == "i386" > FP_ARCH= i387 > .else > FP_ARCH= ${ARCH} > .endif > MASTER_SITES+= http://svn.freebsd.org/base/head/lib/msun/%SUBDIR%/:fp > MASTER_SITE_SUBDIR+= ${FP_ARCH}/:fp > DISTFILES+= fenv.h:fp > .endif > ... > pre-configure: > .if exists(${LOCALBASE}/bin/as) > ${CP} ${DISTDIR}/fenv.h ${WRKSRC}/numpy/core/include/numpy/fenv/fenv.h; > \ > ${PATCH} ${PATCH_DIST_ARGS} < ${FILESDIR}/fenv.patch; \ > .endif > ... > I should note that a specific snapshot of the headers may be preferred to head, to ease maintenance. You may also wish to add some specific provisions for the "makesum" target. This problem is occurring with lang/gcc44 from Ports, when devel/binutils is installed, because then the latest gcc44 snapshots are automatically preferring devel/binutils to the base system binutils. This is a bug in the lang/gcc44 port, and it should be explicitly instructed to use one or the other (either hardcoded, or based upon an OPTION), as lang/gcc45 is now wired to devel/binutils. I have cc'ed the gcc maintainer. b. From owner-freebsd-python@FreeBSD.ORG Mon Feb 15 15:20:05 2010 Return-Path: Delivered-To: freebsd-python@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D76D51065670 for ; Mon, 15 Feb 2010 15:20:05 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id AD3C78FC1D for ; Mon, 15 Feb 2010 15:20:05 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id o1FFK5kb091198 for ; Mon, 15 Feb 2010 15:20:05 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id o1FFK5HH091197; Mon, 15 Feb 2010 15:20:05 GMT (envelope-from gnats) Date: Mon, 15 Feb 2010 15:20:05 GMT Message-Id: <201002151520.o1FFK5HH091197@freefall.freebsd.org> To: freebsd-python@FreeBSD.org From: "b. f." Cc: Subject: Re: ports/143529: [PATCH] math/py-numpy: does not build X-BeenThere: freebsd-python@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: "b. f." List-Id: FreeBSD-specific Python issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Feb 2010 15:20:05 -0000 The following reply was made to PR ports/143529; it has been noted by GNATS. From: "b. f." To: "Li-Lun Wang (Leland Wang)" Cc: bug-followup@freebsd.org, amdmi3@amdmi3.ru, gerald@freebsd.org Subject: Re: ports/143529: [PATCH] math/py-numpy: does not build Date: Mon, 15 Feb 2010 10:11:12 -0500 On 2/15/10, b. f. wrote: > On 2/15/10, b. f. wrote: >>>From: "Li-Lun Wang (Leland Wang)" >>>To: bug-followup at FreeBSD.org >>>Cc: >>>Subject: Re: ports/143529: [PATCH] math/py-numpy: does not build >>>Date: Mon, 15 Feb 2010 12:50:24 +0800 >>> >>> -----BEGIN PGP SIGNED MESSAGE----- >>> Hash: SHA1 >> >>>The following patch will fix the problem. It first detects if >>> binutils>=2.18.50 is installed. If it is, then it patches numpy so >>> that the new fenv.h will be used if __FreeBSD_version <= 900009. >> >> This fixes the build problem on i386 (although we're stuck with >> possible run-time problems when numpy is built with the newer binutils >> until the latest fenv.h changes are backported to all supported >> versions of FreeBSD), but this code is machine-dependent, and fenv.h >> needs to be selected based on ARCH. Oops: it seems that the r203441 only affected amd64 and i386, so the latest headers shouldn't be used for the other architectures (there may be problems lurking there, too, but that's another matter). So my sketch should be altered to something like: ... .if exists(${LOCALBASE}/bin/as) && ${OSVERSION} <= 900009 && \ (${ARCH} == "i386" || ${ARCH} == "amd64") .if ${ARCH} == "i386" FP_ARCH= i387 .elif ${ARCH} == "amd64" FP_ARCH= ${ARCH} .endif MASTER_SITES+= http://svn.freebsd.org/base/head/lib/msun/%SUBDIR%/:fp MASTER_SITE_SUBDIR+= ${FP_ARCH}/:fp DISTFILES+= fenv.h:fp .endif .endif ... pre-configure: .if exists(${LOCALBASE}/bin/as) && ${OSVERSION} <= 900009 ${CP} ${DISTDIR}/fenv.h ${WRKSRC}/numpy/core/include/numpy/fenv/fenv.h; \ ${PATCH} ${PATCH_DIST_ARGS} < ${FILESDIR}/fenv.patch; \ .endif ... But again, this probably isn't necessary if lang/gcc44 is only using the base system binutils, and indeed may fail if lang/gcc44 was built when devel/binutils was not installed -- so we should see first what action will be taken regarding lang/gcc44, or use a more refined test. b. From owner-freebsd-python@FreeBSD.ORG Mon Feb 15 15:20:07 2010 Return-Path: Delivered-To: freebsd-python@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B08CE106566C for ; Mon, 15 Feb 2010 15:20:07 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id A02248FC08 for ; Mon, 15 Feb 2010 15:20:07 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id o1FFK7cf091226 for ; Mon, 15 Feb 2010 15:20:07 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id o1FFK7PP091225; Mon, 15 Feb 2010 15:20:07 GMT (envelope-from gnats) Date: Mon, 15 Feb 2010 15:20:07 GMT Message-Id: <201002151520.o1FFK7PP091225@freefall.freebsd.org> To: freebsd-python@FreeBSD.org From: "b. f." Cc: Subject: Re: ports/143529: [PATCH] math/py-numpy: does not build X-BeenThere: freebsd-python@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: "b. f." List-Id: FreeBSD-specific Python issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Feb 2010 15:20:07 -0000 The following reply was made to PR ports/143529; it has been noted by GNATS. From: "b. f." To: "Li-Lun Wang (Leland Wang)" Cc: bug-followup@freebsd.org, amdmi3@amdmi3.ru, gerald@freebsd.org Subject: Re: ports/143529: [PATCH] math/py-numpy: does not build Date: Mon, 15 Feb 2010 10:18:11 -0500 On 2/15/10, b. f. wrote: > On 2/15/10, b. f. wrote: >> On 2/15/10, b. f. wrote: > ... > .if exists(${LOCALBASE}/bin/as) && ${OSVERSION} <= 900009 && \ > (${ARCH} == "i386" || ${ARCH} == "amd64") > .if ${ARCH} == "i386" > FP_ARCH= i387 > .elif ${ARCH} == "amd64" > FP_ARCH= ${ARCH} > .endif > MASTER_SITES+= http://svn.freebsd.org/base/head/lib/msun/%SUBDIR%/:fp > MASTER_SITE_SUBDIR+= ${FP_ARCH}/:fp > DISTFILES+= fenv.h:fp > .endif > .endif > ... > pre-configure: > .if exists(${LOCALBASE}/bin/as) && ${OSVERSION} <= 900009 Sigh. Test for the i386/amd64 on the above line, too, of course. > ${CP} ${DISTDIR}/fenv.h > ${WRKSRC}/numpy/core/include/numpy/fenv/fenv.h; \ > ${PATCH} ${PATCH_DIST_ARGS} < ${FILESDIR}/fenv.patch; \ > .endif > ... From owner-freebsd-python@FreeBSD.ORG Mon Feb 15 15:30:05 2010 Return-Path: Delivered-To: freebsd-python@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 947C31065670 for ; Mon, 15 Feb 2010 15:30:05 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 2CCBE8FC1A for ; Mon, 15 Feb 2010 15:30:05 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id o1FFU5C1099509 for ; Mon, 15 Feb 2010 15:30:05 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id o1FFU5db099508; Mon, 15 Feb 2010 15:30:05 GMT (envelope-from gnats) Date: Mon, 15 Feb 2010 15:30:05 GMT Message-Id: <201002151530.o1FFU5db099508@freefall.freebsd.org> To: freebsd-python@FreeBSD.org From: "Li-Lun \"Leland\" Wang" Cc: Subject: Re: ports/143529: [PATCH] math/py-numpy: does not build X-BeenThere: freebsd-python@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: "Li-Lun \"Leland\" Wang" List-Id: FreeBSD-specific Python issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Feb 2010 15:30:05 -0000 The following reply was made to PR ports/143529; it has been noted by GNATS. From: "Li-Lun \"Leland\" Wang" To: bf1783@gmail.com Cc: bug-followup@freebsd.org, amdmi3@amdmi3.ru, gerald@freebsd.org Subject: Re: ports/143529: [PATCH] math/py-numpy: does not build Date: Mon, 15 Feb 2010 15:23:49 +0000 On Mon, Feb 15, 2010 at 3:11 PM, b. f. wrote: > On 2/15/10, b. f. wrote: >> On 2/15/10, b. f. wrote: >>>>From: "Li-Lun Wang (Leland Wang)" >>>>To: bug-followup at FreeBSD.org >>>>Cc: >>>>Subject: Re: ports/143529: [PATCH] math/py-numpy: does not build >>>>Date: Mon, 15 Feb 2010 12:50:24 +0800 >>>> >>>> -----BEGIN PGP SIGNED MESSAGE----- >>>> Hash: SHA1 >>> >>>>The following patch will fix the problem. =C2=A0It first detects if >>>> binutils>=3D2.18.50 is installed. =C2=A0If it is, then it patches nump= y so >>>> that the new fenv.h will be used if __FreeBSD_version <=3D 900009. >>> >>> This fixes the build problem on i386 (although we're stuck with >>> possible run-time problems when numpy is built with the newer binutils >>> until the latest fenv.h changes are backported to all supported >>> versions of FreeBSD), but this code is machine-dependent, and fenv.h >>> needs to be selected based on ARCH. > > Oops: it seems that the r203441 only affected amd64 and i386, so the > latest headers shouldn't be used for the other architectures (there > may be problems lurking there, too, but that's another matter). =C2=A0So = my > sketch should be altered to something like: > > > ... > .if exists(${LOCALBASE}/bin/as) && ${OSVERSION} <=3D 900009 && \ > (${ARCH} =3D=3D "i386" || ${ARCH} =3D=3D "amd64") > .if ${ARCH} =3D=3D "i386" > =C2=A0FP_ARCH=3D i387 > .elif ${ARCH} =3D=3D "amd64" > =C2=A0FP_ARCH=3D ${ARCH} > .endif > MASTER_SITES+=3D http://svn.freebsd.org/base/head/lib/msun/%SUBDIR%/:fp > MASTER_SITE_SUBDIR+=3D ${FP_ARCH}/:fp > =C2=A0DISTFILES+=3D fenv.h:fp > .endif > .endif > =C2=A0... > =C2=A0pre-configure: > .if exists(${LOCALBASE}/bin/as) && ${OSVERSION} <=3D 900009 > =C2=A0 =C2=A0 =C2=A0${CP} ${DISTDIR}/fenv.h > =C2=A0${WRKSRC}/numpy/core/include/numpy/fenv/fenv.h; \ > =C2=A0 =C2=A0 =C2=A0${PATCH} ${PATCH_DIST_ARGS} < ${FILESDIR}/fenv.patch;= \ > .endif > ... > > But again, this probably isn't necessary if lang/gcc44 is only using > the base system binutils, and indeed may fail if lang/gcc44 was built > when devel/binutils was not installed -- so we should see first what > action will be taken regarding lang/gcc44, or use a more refined test. I agree. This really isn't a bug in the numpy port, but the unfortunate result of devel/binutils and bug in fenv.h. Fixing in the numpy side is more of just a hack to make it build. -- llwang From owner-freebsd-python@FreeBSD.ORG Mon Feb 15 20:50:02 2010 Return-Path: Delivered-To: freebsd-python@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A56FC1065672 for ; Mon, 15 Feb 2010 20:50:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 9409E8FC16 for ; Mon, 15 Feb 2010 20:50:02 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id o1FKo280082330 for ; Mon, 15 Feb 2010 20:50:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id o1FKo2iC082322; Mon, 15 Feb 2010 20:50:02 GMT (envelope-from gnats) Date: Mon, 15 Feb 2010 20:50:02 GMT Message-Id: <201002152050.o1FKo2iC082322@freefall.freebsd.org> To: freebsd-python@FreeBSD.org From: Gerald Pfeifer Cc: Subject: Re: ports/143529: [PATCH] math/py-numpy: does not build X-BeenThere: freebsd-python@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Gerald Pfeifer List-Id: FreeBSD-specific Python issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Feb 2010 20:50:02 -0000 The following reply was made to PR ports/143529; it has been noted by GNATS. From: Gerald Pfeifer To: bf1783@gmail.com Cc: "Li-Lun Wang (Leland Wang)" , bug-followup@freebsd.org, amdmi3@amdmi3.ru Subject: Re: ports/143529: [PATCH] math/py-numpy: does not build Date: Mon, 15 Feb 2010 21:41:17 +0100 (CET) On Mon, 15 Feb 2010, b. f. wrote: > This problem is occurring with lang/gcc44 from Ports, when > devel/binutils is installed, because then the latest gcc44 snapshots > are automatically preferring devel/binutils to the base system > binutils. No-no. lang/gcc44 does not "automatically" prefer things. I just verified that. What you describe only happens when an admin _willfully_ selects the tools from devel/binutils over the system ones. I assume in this case this happened by setting PATH accordingly, though there are other ways. And of course, when someone arbitrarily replaces system tools by others, or even just newer versions, all sorts of unforeseen things can happen. The proposed patch to check for the version of devel/binutils is not correct, since it is not granted that lang/gcc44 would use that version of binutils. For example, as b.f. notices, we could force it to use the system tools even when devel/binutils is installed. You may want to use '$CC -print-prog-name=as' to identify the version of as that GCC is using and go from there. That said, given the increasing problems that are arising due to the rotten binutils that are in the base system, I had planned to also have lang/gcc44 use devel/binutils for a while, after seeing how this pans out with lang/gcc45. I am testing a patch to that end right now and plan to commit it within the next 24 hours, when I will also update to the latest snapshot of GCC 4.4. Still, as far as math/py-numpy goes, please do check for the version of binutils that is used by GCC instead of hardcoding things. For example, if we later make this an OPTION, things could break again otherwise. Gerald From owner-freebsd-python@FreeBSD.ORG Tue Feb 16 03:20:03 2010 Return-Path: Delivered-To: freebsd-python@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A0FE4106568B for ; Tue, 16 Feb 2010 03:20:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 904648FC14 for ; Tue, 16 Feb 2010 03:20:03 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id o1G3K3o6017437 for ; Tue, 16 Feb 2010 03:20:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id o1G3K3AT017426; Tue, 16 Feb 2010 03:20:03 GMT (envelope-from gnats) Date: Tue, 16 Feb 2010 03:20:03 GMT Message-Id: <201002160320.o1G3K3AT017426@freefall.freebsd.org> To: freebsd-python@FreeBSD.org From: "b. f." Cc: Subject: Re: ports/143529: [PATCH] math/py-numpy: does not build X-BeenThere: freebsd-python@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: "b. f." List-Id: FreeBSD-specific Python issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Feb 2010 03:20:04 -0000 The following reply was made to PR ports/143529; it has been noted by GNATS. From: "b. f." To: Gerald Pfeifer Cc: "Li-Lun Wang (Leland Wang)" , bug-followup@freebsd.org, amdmi3@amdmi3.ru Subject: Re: ports/143529: [PATCH] math/py-numpy: does not build Date: Mon, 15 Feb 2010 22:10:09 -0500 --0016e6daa82b498db9047faf120d Content-Type: text/plain; charset=ISO-8859-1 On 2/15/10, Gerald Pfeifer wrote: > On Mon, 15 Feb 2010, b. f. wrote: >> This problem is occurring with lang/gcc44 from Ports, when >> devel/binutils is installed, because then the latest gcc44 snapshots >> are automatically preferring devel/binutils to the base system >> binutils. > > No-no. lang/gcc44 does not "automatically" prefer things. I just > verified that. > > What you describe only happens when an admin _willfully_ selects > the tools from devel/binutils over the system ones. How did you verify it? I find that lang/gcc44 does prefer devel/binutils: I installed devel/binutils in /usr/local, and then built and installed lang/gcc44 (version 4.4.4.20100209) into the same prefix on 9-CURRENT amd64, without any local modifications to included Makefiles or the build environment. The resulting binaries show: #gcc44 -print-prog-name=as /usr/local/lib/gcc44/gcc/x86_64-portbld-freebsd9.0/4.4.4/../../../../../x86_64-portbld-freebsd9.0/bin/as # gcc44 -print-prog-name=ar /usr/local/lib/gcc44/gcc/x86_64-portbld-freebsd9.0/4.4.4/../../../../../x86_64-portbld-freebsd9.0/bin/ar and so on, where: # pkg_info -W /usr/local//x86_64-portbld-freebsd9.0/bin/as /usr/local/x86_64-portbld-freebsd9.0/bin/as was installed by package binutils-2.20 This agrees with: http://gcc.gnu.org/install/configure.html where it states: '--with-as=pathname "Specify that the compiler should use the assembler pointed to by pathname, rather than the one found by the standard rules to find an assembler, which are: Unless GCC is being built with a cross compiler, check the libexec/gcc/target/version directory. libexec defaults to exec-prefix/libexec; exec-prefix defaults to prefix, which defaults to /usr/local unless overridden by the --prefix=pathname switch described above. target is the target system triple, such as `sparc-sun-solaris2.7', and version denotes the GCC version, such as 3.0. If the target system is the same that you are building on, check operating system specific directories (e.g. /usr/ccs/bin on Sun Solaris 2). Check in the PATH for a tool whose name is prefixed by the target system triple. Check in the PATH for a tool whose name is not prefixed by the target system triple, if the host and target system triple are the same (in other words, we use a host tool if it can be used for the target as well)." ' Note that the tool whose name is prefixed by the target system triple, in this case, x86_64-portbld-freebsd9.0, takes precedence over a tool whose name is not prefixed by the target system triple. When devel/binutils is not installed, the result is different: see the attached diff contrasting the outcomes of the configure targets in each case. With lang/gcc45, when the AR, AS, LD, etc. are specified as /usr/local/bin/ar, etc., and the CONFIGURE_ARGS --with-build-time-tools=/usr/local/bin, --with-as=/usr/local/bin/as, etc. are issued, then all of the tools are found as /usr/local/bin/ar, etc., as expected. Presumably this would also work for lang/gcc44, enabling the binutils to be fixed. b. --0016e6daa82b498db9047faf120d Content-Type: application/octet-stream; name="gcc44_binutils_configure.diff" Content-Disposition: attachment; filename="gcc44_binutils_configure.diff" Content-Transfer-Encoding: base64 X-Attachment-Id: file0 ZGlmZiAtcnVOIG5vYmludXQvTWFrZWZpbGUgYmludXQvTWFrZWZpbGUKLS0tIG5vYmludXQvTWFr ZWZpbGUJMjAxMC0wMi0xNSAxNzo0NTo1MS4wMDAwMDAwMDAgLTA1MDAKKysrIGJpbnV0L01ha2Vm aWxlCTIwMTAtMDItMTUgMTc6NDM6NTUuMDAwMDAwMDAwIC0wNTAwCkBAIC0zNzksOCArMzc5LDgg QEAKIAogRkxBR1NfRk9SX1RBUkdFVCA9ICAtQiQoYnVpbGRfdG9vbGRpcikvYmluLyAtQiQoYnVp bGRfdG9vbGRpcikvbGliLyAtaXN5c3RlbSAkKGJ1aWxkX3Rvb2xkaXIpL2luY2x1ZGUgLWlzeXN0 ZW0gJChidWlsZF90b29sZGlyKS9zeXMtaW5jbHVkZQogCi1BUl9GT1JfVEFSR0VUPSQoQVIpCi1B U19GT1JfVEFSR0VUPSQoQVMpCitBUl9GT1JfVEFSR0VUPS91c3IvbG9jYWwveDg2XzY0LXBvcnRi bGQtZnJlZWJzZDkuMC9iaW4vYXIKK0FTX0ZPUl9UQVJHRVQ9L3Vzci9sb2NhbC94ODZfNjQtcG9y dGJsZC1mcmVlYnNkOS4wL2Jpbi9hcwogQ0NfRk9SX1RBUkdFVD0kKFNUQUdFX0NDX1dSQVBQRVIp ICQkci8kKEhPU1RfU1VCRElSKS9nY2MveGdjYyAtQiQkci8kKEhPU1RfU1VCRElSKS9nY2MvICQo RkxBR1NfRk9SX1RBUkdFVCkKIAogIyBJZiBHQ0NfRk9SX1RBUkdFVCBpcyBub3Qgb3ZlcnJpZGVu IG9uIHRoZSBjb21tYW5kIGxpbmUsIHRoZW4gdGhpcwpAQCAtMzkzLDEzICszOTMsMTMgQEAKIEdD Sl9GT1JfVEFSR0VUPSQoU1RBR0VfQ0NfV1JBUFBFUikgJChHQ0opICQoRkxBR1NfRk9SX1RBUkdF VCkKIEdGT1JUUkFOX0ZPUl9UQVJHRVQ9JChTVEFHRV9DQ19XUkFQUEVSKSAkJHIvJChIT1NUX1NV QkRJUikvZ2NjL2dmb3J0cmFuIC1CJCRyLyQoSE9TVF9TVUJESVIpL2djYy8gJChGTEFHU19GT1Jf VEFSR0VUKQogRExMVE9PTF9GT1JfVEFSR0VUPSQoRExMVE9PTCkKLUxEX0ZPUl9UQVJHRVQ9JChM RCkKK0xEX0ZPUl9UQVJHRVQ9L3Vzci9sb2NhbC94ODZfNjQtcG9ydGJsZC1mcmVlYnNkOS4wL2Jp bi9sZAogCiBMSVBPX0ZPUl9UQVJHRVQ9JChMSVBPKQotTk1fRk9SX1RBUkdFVD0kKE5NKQotT0JK RFVNUF9GT1JfVEFSR0VUPSQoT0JKRFVNUCkKLVJBTkxJQl9GT1JfVEFSR0VUPSQoUkFOTElCKQot U1RSSVBfRk9SX1RBUkdFVD0kKFNUUklQKQorTk1fRk9SX1RBUkdFVD0vdXNyL2xvY2FsL3g4Nl82 NC1wb3J0YmxkLWZyZWVic2Q5LjAvYmluL25tCitPQkpEVU1QX0ZPUl9UQVJHRVQ9L3Vzci9sb2Nh bC94ODZfNjQtcG9ydGJsZC1mcmVlYnNkOS4wL2Jpbi9vYmpkdW1wCitSQU5MSUJfRk9SX1RBUkdF VD0vdXNyL2xvY2FsL3g4Nl82NC1wb3J0YmxkLWZyZWVic2Q5LjAvYmluL3JhbmxpYgorU1RSSVBf Rk9SX1RBUkdFVD0vdXNyL2xvY2FsL3g4Nl82NC1wb3J0YmxkLWZyZWVic2Q5LjAvYmluL3N0cmlw CiBXSU5EUkVTX0ZPUl9UQVJHRVQ9JChXSU5EUkVTKQogV0lORE1DX0ZPUl9UQVJHRVQ9JChXSU5E TUMpCiAKZGlmZiAtcnVOIG5vYmludXQvY29uZmlnLmxvZyBiaW51dC9jb25maWcubG9nCi0tLSBu b2JpbnV0L2NvbmZpZy5sb2cJMjAxMC0wMi0xNSAxNzo0NTo1MC4wMDAwMDAwMDAgLTA1MDAKKysr IGJpbnV0L2NvbmZpZy5sb2cJMjAxMC0wMi0xNSAxNzo0Mzo1NS4wMDAwMDAwMDAgLTA1MDAKQEAg LTQ0Miw0OCArNDQyLDM0IEBACiBjb25maWd1cmU6OTEzODogY2hlY2tpbmcgZm9yIGdmb3J0cmFu CiBjb25maWd1cmU6OTE2NzogcmVzdWx0OiBubwogY29uZmlndXJlOjkyMjc6IGNoZWNraW5nIGZv ciBhcgotY29uZmlndXJlOjkyNjA6IHJlc3VsdDogbm8KLWNvbmZpZ3VyZTo5MzcyOiBjaGVja2lu ZyBmb3IgYXIKLWNvbmZpZ3VyZTo5Mzg4OiBmb3VuZCAvdXNyL2Jpbi9hcgotY29uZmlndXJlOjkz OTg6IHJlc3VsdDogYXIKK2NvbmZpZ3VyZTo5MjQ1OiBmb3VuZCAvdXNyL2xvY2FsL3g4Nl82NC1w b3J0YmxkLWZyZWVic2Q5LjAvYmluL2FyCitjb25maWd1cmU6OTI1NzogcmVzdWx0OiAvdXNyL2xv Y2FsL3g4Nl82NC1wb3J0YmxkLWZyZWVic2Q5LjAvYmluL2FyCiBjb25maWd1cmU6OTQ1MDogY2hl Y2tpbmcgZm9yIGFzCi1jb25maWd1cmU6OTQ4MzogcmVzdWx0OiBubwotY29uZmlndXJlOjk1OTU6 IGNoZWNraW5nIGZvciBhcwotY29uZmlndXJlOjk2MTE6IGZvdW5kIC91c3IvYmluL2FzCi1jb25m aWd1cmU6OTYyMTogcmVzdWx0OiBhcworY29uZmlndXJlOjk0Njg6IGZvdW5kIC91c3IvbG9jYWwv eDg2XzY0LXBvcnRibGQtZnJlZWJzZDkuMC9iaW4vYXMKK2NvbmZpZ3VyZTo5NDgwOiByZXN1bHQ6 IC91c3IvbG9jYWwveDg2XzY0LXBvcnRibGQtZnJlZWJzZDkuMC9iaW4vYXMKIGNvbmZpZ3VyZTo5 NjczOiBjaGVja2luZyBmb3IgZGxsdG9vbAogY29uZmlndXJlOjk3MDY6IHJlc3VsdDogbm8KIGNv bmZpZ3VyZTo5ODE4OiBjaGVja2luZyBmb3IgZGxsdG9vbAogY29uZmlndXJlOjk4NDc6IHJlc3Vs dDogbm8KIGNvbmZpZ3VyZTo5ODk2OiBjaGVja2luZyBmb3IgbGQKLWNvbmZpZ3VyZTo5OTI5OiBy ZXN1bHQ6IG5vCi1jb25maWd1cmU6MTAwNDE6IGNoZWNraW5nIGZvciBsZAotY29uZmlndXJlOjEw MDU3OiBmb3VuZCAvdXNyL2Jpbi9sZAotY29uZmlndXJlOjEwMDY3OiByZXN1bHQ6IGxkCitjb25m aWd1cmU6OTkxNDogZm91bmQgL3Vzci9sb2NhbC94ODZfNjQtcG9ydGJsZC1mcmVlYnNkOS4wL2Jp bi9sZAorY29uZmlndXJlOjk5MjY6IHJlc3VsdDogL3Vzci9sb2NhbC94ODZfNjQtcG9ydGJsZC1m cmVlYnNkOS4wL2Jpbi9sZAogY29uZmlndXJlOjEwMTE5OiBjaGVja2luZyBmb3IgbGlwbwogY29u ZmlndXJlOjEwMTUyOiByZXN1bHQ6IG5vCiBjb25maWd1cmU6MTAyNjQ6IGNoZWNraW5nIGZvciBs aXBvCiBjb25maWd1cmU6MTAyOTM6IHJlc3VsdDogbm8KIGNvbmZpZ3VyZToxMDM0MjogY2hlY2tp bmcgZm9yIG5tCi1jb25maWd1cmU6MTAzNzU6IHJlc3VsdDogbm8KLWNvbmZpZ3VyZToxMDQ4Nzog Y2hlY2tpbmcgZm9yIG5tCi1jb25maWd1cmU6MTA1MDM6IGZvdW5kIC91c3IvYmluL25tCi1jb25m aWd1cmU6MTA1MTM6IHJlc3VsdDogbm0KK2NvbmZpZ3VyZToxMDM2MDogZm91bmQgL3Vzci9sb2Nh bC94ODZfNjQtcG9ydGJsZC1mcmVlYnNkOS4wL2Jpbi9ubQorY29uZmlndXJlOjEwMzcyOiByZXN1 bHQ6IC91c3IvbG9jYWwveDg2XzY0LXBvcnRibGQtZnJlZWJzZDkuMC9iaW4vbm0KIGNvbmZpZ3Vy ZToxMDU2NTogY2hlY2tpbmcgZm9yIG9iamR1bXAKLWNvbmZpZ3VyZToxMDU5ODogcmVzdWx0OiBu bwotY29uZmlndXJlOjEwNzEwOiBjaGVja2luZyBmb3Igb2JqZHVtcAotY29uZmlndXJlOjEwNzI2 OiBmb3VuZCAvdXNyL2Jpbi9vYmpkdW1wCi1jb25maWd1cmU6MTA3MzY6IHJlc3VsdDogb2JqZHVt cAorY29uZmlndXJlOjEwNTgzOiBmb3VuZCAvdXNyL2xvY2FsL3g4Nl82NC1wb3J0YmxkLWZyZWVi c2Q5LjAvYmluL29iamR1bXAKK2NvbmZpZ3VyZToxMDU5NTogcmVzdWx0OiAvdXNyL2xvY2FsL3g4 Nl82NC1wb3J0YmxkLWZyZWVic2Q5LjAvYmluL29iamR1bXAKIGNvbmZpZ3VyZToxMDc4ODogY2hl Y2tpbmcgZm9yIHJhbmxpYgotY29uZmlndXJlOjEwODIxOiByZXN1bHQ6IG5vCi1jb25maWd1cmU6 MTA5MzM6IGNoZWNraW5nIGZvciByYW5saWIKLWNvbmZpZ3VyZToxMDk0OTogZm91bmQgL3Vzci9i aW4vcmFubGliCi1jb25maWd1cmU6MTA5NTk6IHJlc3VsdDogcmFubGliCitjb25maWd1cmU6MTA4 MDY6IGZvdW5kIC91c3IvbG9jYWwveDg2XzY0LXBvcnRibGQtZnJlZWJzZDkuMC9iaW4vcmFubGli Citjb25maWd1cmU6MTA4MTg6IHJlc3VsdDogL3Vzci9sb2NhbC94ODZfNjQtcG9ydGJsZC1mcmVl YnNkOS4wL2Jpbi9yYW5saWIKIGNvbmZpZ3VyZToxMTAxMTogY2hlY2tpbmcgZm9yIHN0cmlwCi1j b25maWd1cmU6MTEwNDQ6IHJlc3VsdDogbm8KLWNvbmZpZ3VyZToxMTE1NjogY2hlY2tpbmcgZm9y IHN0cmlwCi1jb25maWd1cmU6MTExNzI6IGZvdW5kIC91c3IvYmluL3N0cmlwCi1jb25maWd1cmU6 MTExODI6IHJlc3VsdDogc3RyaXAKK2NvbmZpZ3VyZToxMTAyOTogZm91bmQgL3Vzci9sb2NhbC94 ODZfNjQtcG9ydGJsZC1mcmVlYnNkOS4wL2Jpbi9zdHJpcAorY29uZmlndXJlOjExMDQxOiByZXN1 bHQ6IC91c3IvbG9jYWwveDg2XzY0LXBvcnRibGQtZnJlZWJzZDkuMC9iaW4vc3RyaXAKIGNvbmZp Z3VyZToxMTIzNDogY2hlY2tpbmcgZm9yIHdpbmRyZXMKIGNvbmZpZ3VyZToxMTI2NzogcmVzdWx0 OiBubwogY29uZmlndXJlOjExMzc5OiBjaGVja2luZyBmb3Igd2luZHJlcwpAQCAtNDkzLDkgKzQ3 OSw5IEBACiBjb25maWd1cmU6MTE2MDI6IGNoZWNraW5nIGZvciB3aW5kbWMKIGNvbmZpZ3VyZTox MTYzMTogcmVzdWx0OiBubwogY29uZmlndXJlOjExNjU4OiBjaGVja2luZyB3aGVyZSB0byBmaW5k IHRoZSB0YXJnZXQgYXIKLWNvbmZpZ3VyZToxMTY5MTogcmVzdWx0OiBob3N0IHRvb2wKK2NvbmZp Z3VyZToxMTY4NjogcmVzdWx0OiBwcmUtaW5zdGFsbGVkIGluIC91c3IvbG9jYWwveDg2XzY0LXBv cnRibGQtZnJlZWJzZDkuMC9iaW4KIGNvbmZpZ3VyZToxMTcwMDogY2hlY2tpbmcgd2hlcmUgdG8g ZmluZCB0aGUgdGFyZ2V0IGFzCi1jb25maWd1cmU6MTE3MzM6IHJlc3VsdDogaG9zdCB0b29sCitj b25maWd1cmU6MTE3Mjg6IHJlc3VsdDogcHJlLWluc3RhbGxlZCBpbiAvdXNyL2xvY2FsL3g4Nl82 NC1wb3J0YmxkLWZyZWVic2Q5LjAvYmluCiBjb25maWd1cmU6MTE3NDI6IGNoZWNraW5nIHdoZXJl IHRvIGZpbmQgdGhlIHRhcmdldCBjYwogY29uZmlndXJlOjExNzY1OiByZXN1bHQ6IGp1c3QgY29t cGlsZWQKIGNvbmZpZ3VyZToxMTc4NDogY2hlY2tpbmcgd2hlcmUgdG8gZmluZCB0aGUgdGFyZ2V0 IGMrKwpAQCAtNTExLDE3ICs0OTcsMTcgQEAKIGNvbmZpZ3VyZToxMjAwMzogY2hlY2tpbmcgd2hl cmUgdG8gZmluZCB0aGUgdGFyZ2V0IGdmb3J0cmFuCiBjb25maWd1cmU6MTIwMjk6IHJlc3VsdDog anVzdCBjb21waWxlZAogY29uZmlndXJlOjEyMDQ4OiBjaGVja2luZyB3aGVyZSB0byBmaW5kIHRo ZSB0YXJnZXQgbGQKLWNvbmZpZ3VyZToxMjA4MTogcmVzdWx0OiBob3N0IHRvb2wKK2NvbmZpZ3Vy ZToxMjA3NjogcmVzdWx0OiBwcmUtaW5zdGFsbGVkIGluIC91c3IvbG9jYWwveDg2XzY0LXBvcnRi bGQtZnJlZWJzZDkuMC9iaW4KIGNvbmZpZ3VyZToxMjA5MDogY2hlY2tpbmcgd2hlcmUgdG8gZmlu ZCB0aGUgdGFyZ2V0IGxpcG8KIGNvbmZpZ3VyZToxMjExMjogcmVzdWx0OiBob3N0IHRvb2wKIGNv bmZpZ3VyZToxMjEyMTogY2hlY2tpbmcgd2hlcmUgdG8gZmluZCB0aGUgdGFyZ2V0IG5tCi1jb25m aWd1cmU6MTIxNTQ6IHJlc3VsdDogaG9zdCB0b29sCitjb25maWd1cmU6MTIxNDk6IHJlc3VsdDog cHJlLWluc3RhbGxlZCBpbiAvdXNyL2xvY2FsL3g4Nl82NC1wb3J0YmxkLWZyZWVic2Q5LjAvYmlu CiBjb25maWd1cmU6MTIxNjM6IGNoZWNraW5nIHdoZXJlIHRvIGZpbmQgdGhlIHRhcmdldCBvYmpk dW1wCi1jb25maWd1cmU6MTIxOTY6IHJlc3VsdDogaG9zdCB0b29sCitjb25maWd1cmU6MTIxOTE6 IHJlc3VsdDogcHJlLWluc3RhbGxlZCBpbiAvdXNyL2xvY2FsL3g4Nl82NC1wb3J0YmxkLWZyZWVi c2Q5LjAvYmluCiBjb25maWd1cmU6MTIyMDU6IGNoZWNraW5nIHdoZXJlIHRvIGZpbmQgdGhlIHRh cmdldCByYW5saWIKLWNvbmZpZ3VyZToxMjIzODogcmVzdWx0OiBob3N0IHRvb2wKK2NvbmZpZ3Vy ZToxMjIzMzogcmVzdWx0OiBwcmUtaW5zdGFsbGVkIGluIC91c3IvbG9jYWwveDg2XzY0LXBvcnRi bGQtZnJlZWJzZDkuMC9iaW4KIGNvbmZpZ3VyZToxMjI0NzogY2hlY2tpbmcgd2hlcmUgdG8gZmlu ZCB0aGUgdGFyZ2V0IHN0cmlwCi1jb25maWd1cmU6MTIyODA6IHJlc3VsdDogaG9zdCB0b29sCitj b25maWd1cmU6MTIyNzU6IHJlc3VsdDogcHJlLWluc3RhbGxlZCBpbiAvdXNyL2xvY2FsL3g4Nl82 NC1wb3J0YmxkLWZyZWVic2Q5LjAvYmluCiBjb25maWd1cmU6MTIyODk6IGNoZWNraW5nIHdoZXJl IHRvIGZpbmQgdGhlIHRhcmdldCB3aW5kcmVzCiBjb25maWd1cmU6MTIzMjI6IHJlc3VsdDogaG9z dCB0b29sCiBjb25maWd1cmU6MTIzMzE6IGNoZWNraW5nIHdoZXJlIHRvIGZpbmQgdGhlIHRhcmdl dCB3aW5kbWMKQEAgLTY0MiwxMCArNjI4LDE1IEBACiBhY19jdl9ob3N0PXg4Nl82NC1wb3J0Ymxk LWZyZWVic2Q5LjAKIGFjX2N2X2hvc3RfYWxpYXM9eDg2XzY0LXBvcnRibGQtZnJlZWJzZDkuMAog YWNfY3Zfb2JqZXh0PW8KK2FjX2N2X3BhdGhfQVJfRk9SX1RBUkdFVD0vdXNyL2xvY2FsL3g4Nl82 NC1wb3J0YmxkLWZyZWVic2Q5LjAvYmluL2FyCithY19jdl9wYXRoX0FTX0ZPUl9UQVJHRVQ9L3Vz ci9sb2NhbC94ODZfNjQtcG9ydGJsZC1mcmVlYnNkOS4wL2Jpbi9hcworYWNfY3ZfcGF0aF9MRF9G T1JfVEFSR0VUPS91c3IvbG9jYWwveDg2XzY0LXBvcnRibGQtZnJlZWJzZDkuMC9iaW4vbGQKK2Fj X2N2X3BhdGhfTk1fRk9SX1RBUkdFVD0vdXNyL2xvY2FsL3g4Nl82NC1wb3J0YmxkLWZyZWVic2Q5 LjAvYmluL25tCithY19jdl9wYXRoX09CSkRVTVBfRk9SX1RBUkdFVD0vdXNyL2xvY2FsL3g4Nl82 NC1wb3J0YmxkLWZyZWVic2Q5LjAvYmluL29iamR1bXAKK2FjX2N2X3BhdGhfUkFOTElCX0ZPUl9U QVJHRVQ9L3Vzci9sb2NhbC94ODZfNjQtcG9ydGJsZC1mcmVlYnNkOS4wL2Jpbi9yYW5saWIKK2Fj X2N2X3BhdGhfU1RSSVBfRk9SX1RBUkdFVD0vdXNyL2xvY2FsL3g4Nl82NC1wb3J0YmxkLWZyZWVi c2Q5LjAvYmluL3N0cmlwCiBhY19jdl9wcm9nX0FSPWFyCi1hY19jdl9wcm9nX0FSX0ZPUl9UQVJH RVQ9YXIKIGFjX2N2X3Byb2dfQVM9YXMKLWFjX2N2X3Byb2dfQVNfRk9SX1RBUkdFVD1hcwogYWNf Y3ZfcHJvZ19CSVNPTj1iaXNvbgogYWNfY3ZfcHJvZ19DQ19GT1JfVEFSR0VUPWNjCiBhY19jdl9w cm9nX0NYWF9GT1JfVEFSR0VUPWMrKwpAQCAtNjUzLDIwICs2NDQsMTUgQEAKIGFjX2N2X3Byb2df RkxFWD1mbGV4CiBhY19jdl9wcm9nX0dDQ19GT1JfVEFSR0VUPWdjYwogYWNfY3ZfcHJvZ19MRD0v dXNyL2Jpbi9sZAotYWNfY3ZfcHJvZ19MRF9GT1JfVEFSR0VUPWxkCiBhY19jdl9wcm9nX0xFWD1m bGV4CiBhY19jdl9wcm9nX000PWdtNAogYWNfY3ZfcHJvZ19NQUtFSU5GTz1tYWtlaW5mbwogYWNf Y3ZfcHJvZ19OTT1ubQotYWNfY3ZfcHJvZ19OTV9GT1JfVEFSR0VUPW5tCiBhY19jdl9wcm9nX09C SkNPUFk9b2JqY29weQogYWNfY3ZfcHJvZ19PQkpEVU1QPW9iamR1bXAKLWFjX2N2X3Byb2dfT0JK RFVNUF9GT1JfVEFSR0VUPW9iamR1bXAKIGFjX2N2X3Byb2dfUkFOTElCPXJhbmxpYgotYWNfY3Zf cHJvZ19SQU5MSUJfRk9SX1RBUkdFVD1yYW5saWIKIGFjX2N2X3Byb2dfUlVOVEVTVD1ydW50ZXN0 CiBhY19jdl9wcm9nX1NUUklQPXN0cmlwCi1hY19jdl9wcm9nX1NUUklQX0ZPUl9UQVJHRVQ9c3Ry aXAKIGFjX2N2X3Byb2dfWUFDQz0nYmlzb24gLXknCiBhY19jdl9wcm9nX2FjX2N0X0NDPWNjCiBh Y19jdl9wcm9nX2FjX2N0X0dOQVRCSU5EPW5vCkBAIC02ODksMTAgKzY3NSwxMCBAQAogCiBBUj0n YXInCiBBUl9GT1JfQlVJTEQ9JyQoQVIpJwotQVJfRk9SX1RBUkdFVD0nJChBUiknCitBUl9GT1Jf VEFSR0VUPScvdXNyL2xvY2FsL3g4Nl82NC1wb3J0YmxkLWZyZWVic2Q5LjAvYmluL2FyJwogQVM9 J2FzJwogQVNfRk9SX0JVSUxEPSckKEFTKScKLUFTX0ZPUl9UQVJHRVQ9JyQoQVMpJworQVNfRk9S X1RBUkdFVD0nL3Vzci9sb2NhbC94ODZfNjQtcG9ydGJsZC1mcmVlYnNkOS4wL2Jpbi9hcycKIEJJ U09OPSdiaXNvbicKIENDPSdjYycKIENDX0ZPUl9CVUlMRD0nJChDQyknCkBAIC03NDAsNyArNzI2 LDcgQEAKIExERkxBR1M9JycKIExERkxBR1NfRk9SX0JVSUxEPScnCiBMRF9GT1JfQlVJTEQ9JyQo TEQpJwotTERfRk9SX1RBUkdFVD0nJChMRCknCitMRF9GT1JfVEFSR0VUPScvdXNyL2xvY2FsL3g4 Nl82NC1wb3J0YmxkLWZyZWVic2Q5LjAvYmluL2xkJwogTEVYPSdmbGV4JwogTElCT0JKUz0nJwog TElCUz0nLUwvbGliIC1sY2xvb2cgLUwvbGliIC1scHBsX2MgLWxwcGwgLWxnbXB4eCAgJwpAQCAt NzU2LDEwICs3NDIsMTAgQEAKIE1BS0VJTkZPPSdtYWtlaW5mbycKIE5NPSdubScKIE5NX0ZPUl9C VUlMRD0nJChOTSknCi1OTV9GT1JfVEFSR0VUPSckKE5NKScKK05NX0ZPUl9UQVJHRVQ9Jy91c3Iv bG9jYWwveDg2XzY0LXBvcnRibGQtZnJlZWJzZDkuMC9iaW4vbm0nCiBPQkpDT1BZPSdvYmpjb3B5 JwogT0JKRFVNUD0nb2JqZHVtcCcKLU9CSkRVTVBfRk9SX1RBUkdFVD0nJChPQkpEVU1QKScKK09C SkRVTVBfRk9SX1RBUkdFVD0nL3Vzci9sb2NhbC94ODZfNjQtcG9ydGJsZC1mcmVlYnNkOS4wL2Jp bi9vYmpkdW1wJwogT0JKRVhUPSdvJwogUEFDS0FHRV9CVUdSRVBPUlQ9JycKIFBBQ0tBR0VfTkFN RT0nJwpAQCAtNzY5LDEzICs3NTUsMTMgQEAKIFBBVEhfU0VQQVJBVE9SPSc6JwogUkFOTElCPSdy YW5saWInCiBSQU5MSUJfRk9SX0JVSUxEPSckKFJBTkxJQiknCi1SQU5MSUJfRk9SX1RBUkdFVD0n JChSQU5MSUIpJworUkFOTElCX0ZPUl9UQVJHRVQ9Jy91c3IvbG9jYWwveDg2XzY0LXBvcnRibGQt ZnJlZWJzZDkuMC9iaW4vcmFubGliJwogUkFXX0NYWF9GT1JfVEFSR0VUPSckJHIvJChIT1NUX1NV QkRJUikvZ2NjL3hnY2MgLXNoYXJlZC1saWJnY2MgLUIkJHIvJChIT1NUX1NVQkRJUikvZ2NjIC1u b3N0ZGluYysrIC1MJCRyLyQoVEFSR0VUX1NVQkRJUikvbGlic3RkYysrLXYzL3NyYyAtTCQkci8k KFRBUkdFVF9TVUJESVIpL2xpYnN0ZGMrKy12My9zcmMvLmxpYnMnCiBSUEFUSF9FTlZWQVI9J0xE X0xJQlJBUllfUEFUSCcKIFJVTlRFU1Q9J3J1bnRlc3QnCiBTSEVMTD0nL2Jpbi9zaCcKIFNUUklQ PSdzdHJpcCcKLVNUUklQX0ZPUl9UQVJHRVQ9JyQoU1RSSVApJworU1RSSVBfRk9SX1RBUkdFVD0n L3Vzci9sb2NhbC94ODZfNjQtcG9ydGJsZC1mcmVlYnNkOS4wL2Jpbi9zdHJpcCcKIFNZU1JPT1Rf Q0ZMQUdTX0ZPUl9UQVJHRVQ9JycKIFRPUExFVkVMX0NPTkZJR1VSRV9BUkdVTUVOVFM9Jy4vLi4v Z2NjLTQuNC0yMDEwMDIwOS9jb25maWd1cmUgLS1kaXNhYmxlLW5scyAtLXdpdGgtc3lzdGVtLXps aWIgLS13aXRoLWxpYmljb252LXByZWZpeD0vdXNyL2xvY2FsIC0td2l0aC1nbXA9L3Vzci9sb2Nh bCAtLXByb2dyYW0tc3VmZml4PTQ0IC0tbGliZGlyPS91c3IvbG9jYWwvbGliL2djYzQ0IC0tbGli ZXhlY2Rpcj0vdXNyL2xvY2FsL2xpYmV4ZWMvZ2NjNDQgLS13aXRoLWd4eC1pbmNsdWRlLWRpcj0v dXNyL2xvY2FsL2xpYi9nY2M0NC9pbmNsdWRlL2MrKy8gLS1kaXNhYmxlLWxpYmdjaiAtLXByZWZp eD0vdXNyL2xvY2FsIC0tbWFuZGlyPS91c3IvbG9jYWwvbWFuIC0taW5mb2Rpcj0vdXNyL2xvY2Fs L2luZm8vZ2NjNDQgLS1idWlsZD14ODZfNjQtcG9ydGJsZC1mcmVlYnNkOS4wJwogV0lORE1DPSd3 aW5kbWMnCmRpZmYgLXJ1TiBub2JpbnV0L2NvbmZpZy5zdGF0dXMgYmludXQvY29uZmlnLnN0YXR1 cwotLS0gbm9iaW51dC9jb25maWcuc3RhdHVzCTIwMTAtMDItMTUgMTc6NDU6NTAuMDAwMDAwMDAw IC0wNTAwCisrKyBiaW51dC9jb25maWcuc3RhdHVzCTIwMTAtMDItMTUgMTc6NDM6NTUuMDAwMDAw MDAwIC0wNTAwCkBAIC01NjcsMTUgKzU2NywxNSBAQAogcyxAR0NDX0ZPUl9UQVJHRVRALCQkci8k KEhPU1RfU1VCRElSKS9nY2MveGdjYyAtQiQkci8kKEhPU1RfU1VCRElSKS9nY2MvLDt0IHQKIHMs QEdDSl9GT1JfVEFSR0VUQCwkKEdDSiksO3QgdAogcyxAR0ZPUlRSQU5fRk9SX1RBUkdFVEAsJCRy LyQoSE9TVF9TVUJESVIpL2djYy9nZm9ydHJhbiAtQiQkci8kKEhPU1RfU1VCRElSKS9nY2MvLDt0 IHQKLXMsQEFSX0ZPUl9UQVJHRVRALCQoQVIpLDt0IHQKLXMsQEFTX0ZPUl9UQVJHRVRALCQoQVMp LDt0IHQKK3MsQEFSX0ZPUl9UQVJHRVRALC91c3IvbG9jYWwveDg2XzY0LXBvcnRibGQtZnJlZWJz ZDkuMC9iaW4vYXIsO3QgdAorcyxAQVNfRk9SX1RBUkdFVEAsL3Vzci9sb2NhbC94ODZfNjQtcG9y dGJsZC1mcmVlYnNkOS4wL2Jpbi9hcyw7dCB0CiBzLEBETExUT09MX0ZPUl9UQVJHRVRALCQoRExM VE9PTCksO3QgdAotcyxATERfRk9SX1RBUkdFVEAsJChMRCksO3QgdAorcyxATERfRk9SX1RBUkdF VEAsL3Vzci9sb2NhbC94ODZfNjQtcG9ydGJsZC1mcmVlYnNkOS4wL2Jpbi9sZCw7dCB0CiBzLEBM SVBPX0ZPUl9UQVJHRVRALCQoTElQTyksO3QgdAotcyxATk1fRk9SX1RBUkdFVEAsJChOTSksO3Qg dAotcyxAT0JKRFVNUF9GT1JfVEFSR0VUQCwkKE9CSkRVTVApLDt0IHQKLXMsQFJBTkxJQl9GT1Jf VEFSR0VUQCwkKFJBTkxJQiksO3QgdAotcyxAU1RSSVBfRk9SX1RBUkdFVEAsJChTVFJJUCksO3Qg dAorcyxATk1fRk9SX1RBUkdFVEAsL3Vzci9sb2NhbC94ODZfNjQtcG9ydGJsZC1mcmVlYnNkOS4w L2Jpbi9ubSw7dCB0CitzLEBPQkpEVU1QX0ZPUl9UQVJHRVRALC91c3IvbG9jYWwveDg2XzY0LXBv cnRibGQtZnJlZWJzZDkuMC9iaW4vb2JqZHVtcCw7dCB0CitzLEBSQU5MSUJfRk9SX1RBUkdFVEAs L3Vzci9sb2NhbC94ODZfNjQtcG9ydGJsZC1mcmVlYnNkOS4wL2Jpbi9yYW5saWIsO3QgdAorcyxA U1RSSVBfRk9SX1RBUkdFVEAsL3Vzci9sb2NhbC94ODZfNjQtcG9ydGJsZC1mcmVlYnNkOS4wL2Jp bi9zdHJpcCw7dCB0CiBzLEBXSU5EUkVTX0ZPUl9UQVJHRVRALCQoV0lORFJFUyksO3QgdAogcyxA V0lORE1DX0ZPUl9UQVJHRVRALCQoV0lORE1DKSw7dCB0CiBzLEBSQVdfQ1hYX0ZPUl9UQVJHRVRA LCQkci8kKEhPU1RfU1VCRElSKS9nY2MveGdjYyAtc2hhcmVkLWxpYmdjYyAtQiQkci8kKEhPU1Rf U1VCRElSKS9nY2MgLW5vc3RkaW5jKysgLUwkJHIvJChUQVJHRVRfU1VCRElSKS9saWJzdGRjKyst djMvc3JjIC1MJCRyLyQoVEFSR0VUX1NVQkRJUikvbGlic3RkYysrLXYzL3NyYy8ubGlicyw7dCB0 Cg== --0016e6daa82b498db9047faf120d-- From owner-freebsd-python@FreeBSD.ORG Tue Feb 16 04:30:05 2010 Return-Path: Delivered-To: freebsd-python@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A62651065670 for ; Tue, 16 Feb 2010 04:30:05 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 955128FC12 for ; Tue, 16 Feb 2010 04:30:05 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id o1G4U5oi076479 for ; Tue, 16 Feb 2010 04:30:05 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id o1G4U5Ph076471; Tue, 16 Feb 2010 04:30:05 GMT (envelope-from gnats) Date: Tue, 16 Feb 2010 04:30:05 GMT Message-Id: <201002160430.o1G4U5Ph076471@freefall.freebsd.org> To: freebsd-python@FreeBSD.org From: "Li-Lun Wang (Leland Wang)" Cc: Subject: Re: ports/143529: [PATCH] math/py-numpy: does not build X-BeenThere: freebsd-python@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: "Li-Lun Wang \(Leland Wang\)" List-Id: FreeBSD-specific Python issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Feb 2010 04:30:05 -0000 The following reply was made to PR ports/143529; it has been noted by GNATS. From: "Li-Lun Wang (Leland Wang)" To: bug-followup@freebsd.org Cc: bf1783@gmail.com, gerald@pfeifer.com, amdmi3@amdmi3.ru Subject: Re: ports/143529: [PATCH] math/py-numpy: does not build Date: Tue, 16 Feb 2010 12:26:56 +0800 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hello, Please take a look at the following patch. I hope it addresses all of the concerns mentioned so far. I had too much fun with the version strings of as. Hopefully there wouldn't be yet another format for the version string. diff -urN py-numpy.orig/Makefile py-numpy/Makefile - --- py-numpy.orig/Makefile 2010-02-07 12:08:47.306031963 -0600 +++ py-numpy/Makefile 2010-02-15 22:12:23.719903465 -0600 @@ -33,6 +33,16 @@ .include +.if ${OSVERSION} <= 900009 && (${ARCH} == "i386" || ${ARCH} == "amd64") +MASTER_SITES+= http://svn.freebsd.org/base/head/lib/msun/:fp +.if ${ARCH} == "i386" +FP_ARCH= i387 +.elif ${ARCH} == "amd64" +FP_ARCH= ${ARCH} +.endif +DISTFILES+= ${FP_ARCH}/fenv.c?p=203441:fp ${FP_ARCH}/fenv.h?p=203441:fp +.endif + .if defined(WITH_ATLAS) LIB_DEPENDS+= atlas.2:${PORTSDIR}/math/atlas .if !exists(${LOCALBASE}/lib/libalapack.a) @@ -59,6 +69,14 @@ GCCLIBDIR= `${FC} -print-file-name=libgfortran.so|${SED} -e s/libgfortran.so//` pre-configure: +.if ${OSVERSION} <= 900009 && (${ARCH} == "i386" || ${ARCH} == "amd64") + @if [ "`${PKG_VERSION} -t \"\`\\\`${CC} -print-prog-name=as\\\` --version | ${AWK} 'NR==1 {sub(/\(GNU Binutils\)/,""); print $$3}'\`\" 2.18.49`" = ">" ] ; then \ + ${CP} ${DISTDIR}/${FP_ARCH}/fenv.c?p=203441 ${WRKSRC}/numpy/core/include/numpy/fenv/fenv.c; \ + ${CP} ${DISTDIR}/${FP_ARCH}/fenv.h?p=203441 ${WRKSRC}/numpy/core/include/numpy/fenv/fenv.h; \ + ${REINPLACE_CMD} -e 's||"fenv.h"|' ${WRKSRC}/numpy/core/include/numpy/fenv/fenv.c; \ + ${PATCH} ${PATCH_DIST_ARGS} < ${FILESDIR}/fenv.patch; \ + fi +.endif .ifdef WITH_ATLAS @${REINPLACE_CMD} -e "s+%%GCCLIBDIR%%+${GCCLIBDIR}+" \ -e "s+%%LOCALBASE%%+${LOCALBASE}+g" \ @@ -72,11 +90,25 @@ .endif @${REINPLACE_CMD} -e "s+%%GCCLIBDIR%%+${GCCLIBDIR}+" ${WRKSRC}/numpy/distutils/system_info.py +pre-install: +.if ${OSVERSION} <= 900009 && (${ARCH} == "i386" || ${ARCH} == "amd64") + @if [ "`${PKG_VERSION} -t \"\`\\\`${CC} -print-prog-name=as\\\` --version | ${AWK} 'NR==1 {sub(/\(GNU Binutils\)/,""); print $$3}'\`\" 2.18.49`" = ">" ] ; then \ + ${RM} ${WRKSRC}/numpy/core/include/numpy/fenv/fenv.c.bak; \ + fi +.endif + post-install: ${INSTALL_MAN} ${WRKSRC}/numpy/f2py/f2py.1 ${MAN1PREFIX}/man/man1 .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKDIR}/numpybook.pdf ${DOCSDIR} .endif +.if ${OSVERSION} <= 900009 && (${ARCH} == "i386" || ${ARCH} == "amd64") + @if [ "`${PKG_VERSION} -t \"\`\\\`${CC} -print-prog-name=as\\\` --version | ${AWK} 'NR==1 {sub(/\(GNU Binutils\)/,""); print $$3}'\`\" 2.18.49`" = ">" ] ; then \ + ${REINPLACE_CMD} -e "s|%%FENV%%||g" ${TMPPLIST}; \ + else \ + ${REINPLACE_CMD} -e "s|%%FENV%%|@comment |g" ${TMPPLIST}; \ + fi +.endif .include diff -urN py-numpy.orig/distinfo py-numpy/distinfo - --- py-numpy.orig/distinfo 2010-02-07 12:08:47.346034919 -0600 +++ py-numpy/distinfo 2010-02-15 19:51:49.134852482 -0600 @@ -4,3 +4,15 @@ MD5 (numpybook.pdf) = 637180cd704dc8be4036c09412501397 SHA256 (numpybook.pdf) = 8c9692db7373838c585073e4141ae4bd3b8793dffd59ce3544bf851e71e9b865 SIZE (numpybook.pdf) = 2148630 +MD5 (i387/fenv.c?p=203441) = d371542b4c2d17088d52f73862726496 +SHA256 (i387/fenv.c?p=203441) = c7c558ddb6ab6604c83062fe0655d3ce8cf4d60edb4c9c82777962c49d23ca54 +SIZE (i387/fenv.c?p=203441) = 4791 +MD5 (i387/fenv.h?p=203441) = d7c13d3c58b762a7a8814e7d6c585689 +SHA256 (i387/fenv.h?p=203441) = 40c72f3cdd6990076394056e06461e1daeb6087b6a32f1962d3c33b0a00c0e0d +SIZE (i387/fenv.h?p=203441) = 6774 +MD5 (amd64/fenv.c?p=203441) = be35d718bd9113d9efa6fc777298d12d +SHA256 (amd64/fenv.c?p=203441) = 9741a9ad3f8406f8292a268b0bc288dc7cb042e3e102440696d48c9a8b7955f0 +SIZE (amd64/fenv.c?p=203441) = 3601 +MD5 (amd64/fenv.h?p=203441) = 564a4e973990e4f66a5b3ab0e5ded5e1 +SHA256 (amd64/fenv.h?p=203441) = 2daf607fea1bf7e8de5e174599d963fc3bbbe48e293cf2ff08e221351472c9d6 +SIZE (amd64/fenv.h?p=203441) = 5810 diff -urN py-numpy.orig/files/fenv.patch py-numpy/files/fenv.patch - --- py-numpy.orig/files/fenv.patch 1969-12-31 18:00:00.000000000 -0600 +++ py-numpy/files/fenv.patch 2010-02-15 19:01:10.775996010 -0600 @@ -0,0 +1,40 @@ +--- numpy/core/include/numpy/ufuncobject.h.orig 2009-12-15 06:47:53.000000000 -0600 ++++ numpy/core/include/numpy/ufuncobject.h 2010-02-15 18:54:28.490863602 -0600 +@@ -306,7 +306,11 @@ + #elif defined(__GLIBC__) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__MINGW32__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 502114)) + + #if defined(__GLIBC__) || defined(__APPLE__) || defined(__MINGW32__) || defined(__FreeBSD__) ++#if defined(__FreeBSD__) && (__FreeBSD_version <= 900009) ++#include "fenv/fenv.c" ++#else + #include ++#endif + #elif defined(__CYGWIN__) + #include "fenv/fenv.c" + #endif +--- numpy/numarray/_capi.c.orig 2009-12-28 08:00:09.000000000 -0600 ++++ numpy/numarray/_capi.c 2010-02-15 18:57:25.993127759 -0600 +@@ -9,7 +9,12 @@ + #endif + + #if defined(__GLIBC__) || defined(__APPLE__) || defined(__MINGW32__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 502114)) ++#if defined(__FreeBSD__) && (__FreeBSD_version <= 900009) ++#include "numpy/fenv/fenv.h" ++#include "numpy/fenv/fenv.c" ++#else + #include ++#endif + #elif defined(__CYGWIN__) + #include "numpy/fenv/fenv.h" + #include "numpy/fenv/fenv.c" +--- numpy/core/setup.py.orig 2009-12-28 08:00:09.000000000 -0600 ++++ numpy/core/setup.py 2010-02-15 19:00:44.715666850 -0600 +@@ -625,7 +625,7 @@ + ] + + # Don't install fenv unless we need them. +- if sys.platform == 'cygwin': ++ if sys.platform == 'cygwin' or sys.platform.startswith('freebsd'): + config.add_data_dir('include/numpy/fenv') + + config.add_extension('_sort', diff -urN py-numpy.orig/pkg-plist py-numpy/pkg-plist - --- py-numpy.orig/pkg-plist 2010-02-07 12:08:47.366021172 -0600 +++ py-numpy/pkg-plist 2010-02-15 21:23:46.322187473 -0600 @@ -64,6 +64,8 @@ %%PYTHON_SITELIBDIR%%/numpy/core/include/numpy/_numpyconfig.h %%PYTHON_SITELIBDIR%%/numpy/core/include/numpy/arrayobject.h %%PYTHON_SITELIBDIR%%/numpy/core/include/numpy/arrayscalars.h +%%FENV%%%%PYTHON_SITELIBDIR%%/numpy/core/include/numpy/fenv/fenv.c +%%FENV%%%%PYTHON_SITELIBDIR%%/numpy/core/include/numpy/fenv/fenv.h %%PYTHON_SITELIBDIR%%/numpy/core/include/numpy/multiarray_api.txt %%PYTHON_SITELIBDIR%%/numpy/core/include/numpy/ndarrayobject.h %%PYTHON_SITELIBDIR%%/numpy/core/include/numpy/noprefix.h @@ -966,6 +968,7 @@ @dirrm %%PYTHON_SITELIBDIR%%/numpy/core/tests @dirrm %%PYTHON_SITELIBDIR%%/numpy/core/lib/npy-pkg-config @dirrm %%PYTHON_SITELIBDIR%%/numpy/core/lib +%%FENV%%@dirrm %%PYTHON_SITELIBDIR%%/numpy/core/include/numpy/fenv @dirrm %%PYTHON_SITELIBDIR%%/numpy/core/include/numpy @dirrm %%PYTHON_SITELIBDIR%%/numpy/core/include @dirrm %%PYTHON_SITELIBDIR%%/numpy/core -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.12 (FreeBSD) iD8DBQFLeh6OCQM7t5B2mhARAtIoAJ0Ta2RLjhYsEpk6/m64g/l5KbuoegCeKYkk UtCn8bYFiOJWrdsfJYSYlV0= =to7p -----END PGP SIGNATURE----- From owner-freebsd-python@FreeBSD.ORG Tue Feb 16 20:20:11 2010 Return-Path: Delivered-To: freebsd-python@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EE78E1065695; Tue, 16 Feb 2010 20:20:11 +0000 (UTC) (envelope-from edwin@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id C527B8FC14; Tue, 16 Feb 2010 20:20:11 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id o1GKKBmN033526; Tue, 16 Feb 2010 20:20:11 GMT (envelope-from edwin@freefall.freebsd.org) Received: (from edwin@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id o1GKKB0W033515; Tue, 16 Feb 2010 20:20:11 GMT (envelope-from edwin) Date: Tue, 16 Feb 2010 20:20:11 GMT Message-Id: <201002162020.o1GKKB0W033515@freefall.freebsd.org> To: edwin@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org, freebsd-python@FreeBSD.org From: edwin@FreeBSD.org Cc: Subject: Re: ports/144017: Update port: www/py-pywebdav to 0.9.3 X-BeenThere: freebsd-python@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: FreeBSD-specific Python issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Feb 2010 20:20:12 -0000 Synopsis: Update port: www/py-pywebdav to 0.9.3 Responsible-Changed-From-To: freebsd-ports-bugs->freebsd-python Responsible-Changed-By: edwin Responsible-Changed-When: Tue Feb 16 20:20:11 UTC 2010 Responsible-Changed-Why: freebsd-python@ wants this port PRs (via the GNATS Auto Assign Tool) http://www.freebsd.org/cgi/query-pr.cgi?pr=144017 From owner-freebsd-python@FreeBSD.ORG Tue Feb 16 20:20:17 2010 Return-Path: Delivered-To: freebsd-python@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8D1811065693; Tue, 16 Feb 2010 20:20:17 +0000 (UTC) (envelope-from edwin@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 64CEE8FC13; Tue, 16 Feb 2010 20:20:17 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id o1GKKHUP034119; Tue, 16 Feb 2010 20:20:17 GMT (envelope-from edwin@freefall.freebsd.org) Received: (from edwin@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id o1GKKHr3034114; Tue, 16 Feb 2010 20:20:17 GMT (envelope-from edwin) Date: Tue, 16 Feb 2010 20:20:17 GMT Message-Id: <201002162020.o1GKKHr3034114@freefall.freebsd.org> To: hizel@vyborg.ru, edwin@FreeBSD.org, freebsd-python@FreeBSD.org From: edwin@FreeBSD.org Cc: Subject: Re: ports/144017: Update port: www/py-pywebdav to 0.9.3 X-BeenThere: freebsd-python@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: FreeBSD-specific Python issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Feb 2010 20:20:17 -0000 Synopsis: Update port: www/py-pywebdav to 0.9.3 State-Changed-From-To: open->feedback State-Changed-By: edwin State-Changed-When: Tue Feb 16 20:20:16 UTC 2010 State-Changed-Why: Awaiting maintainers feedback (via the GNATS Auto Assign Tool) http://www.freebsd.org/cgi/query-pr.cgi?pr=144017 From owner-freebsd-python@FreeBSD.ORG Tue Feb 16 20:30:05 2010 Return-Path: Delivered-To: freebsd-python@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7D80F1065672 for ; Tue, 16 Feb 2010 20:30:05 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 6BBBA8FC17 for ; Tue, 16 Feb 2010 20:30:05 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id o1GKU5qb041381 for ; Tue, 16 Feb 2010 20:30:05 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id o1GKU5mC041376; Tue, 16 Feb 2010 20:30:05 GMT (envelope-from gnats) Date: Tue, 16 Feb 2010 20:30:05 GMT Message-Id: <201002162030.o1GKU5mC041376@freefall.freebsd.org> To: freebsd-python@FreeBSD.org From: Edwin Groothuis Cc: Subject: Re: ports/144017: Update port: www/py-pywebdav to 0.9.3 X-BeenThere: freebsd-python@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Edwin Groothuis List-Id: FreeBSD-specific Python issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Feb 2010 20:30:05 -0000 The following reply was made to PR ports/144017; it has been noted by GNATS. From: Edwin Groothuis To: wenheping@gmail.com Cc: bug-followup@FreeBSD.org Subject: Re: ports/144017: Update port: www/py-pywebdav to 0.9.3 Date: Tue, 16 Feb 2010 20:20:13 UT Maintainer of www/py-pywebdav, Please note that PR ports/144017 has just been submitted. If it contains a patch for an upgrade, an enhancement or a bug fix you agree on, reply to this email stating that you approve the patch and a committer will take care of it. The full text of the PR can be found at: http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/144017 -- Edwin Groothuis via the GNATS Auto Assign Tool edwin@FreeBSD.org From owner-freebsd-python@FreeBSD.ORG Wed Feb 17 11:40:16 2010 Return-Path: Delivered-To: python@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6A6D3106566B; Wed, 17 Feb 2010 11:40:16 +0000 (UTC) (envelope-from edwin@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 42CD48FC22; Wed, 17 Feb 2010 11:40:16 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id o1HBeG1B062362; Wed, 17 Feb 2010 11:40:16 GMT (envelope-from edwin@freefall.freebsd.org) Received: (from edwin@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id o1HBeG3l062353; Wed, 17 Feb 2010 11:40:16 GMT (envelope-from edwin) Date: Wed, 17 Feb 2010 11:40:16 GMT Message-Id: <201002171140.o1HBeG3l062353@freefall.freebsd.org> To: edwin@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org, python@FreeBSD.org From: edwin@FreeBSD.org Cc: Subject: Re: ports/144035: ports/databases/py-sqlite3 does not start to build X-BeenThere: freebsd-python@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: FreeBSD-specific Python issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Feb 2010 11:40:16 -0000 Synopsis: ports/databases/py-sqlite3 does not start to build Responsible-Changed-From-To: freebsd-ports-bugs->python Responsible-Changed-By: edwin Responsible-Changed-When: Wed Feb 17 11:40:15 UTC 2010 Responsible-Changed-Why: Over to maintainer (via the GNATS Auto Assign Tool) http://www.freebsd.org/cgi/query-pr.cgi?pr=144035 From owner-freebsd-python@FreeBSD.ORG Wed Feb 17 12:06:48 2010 Return-Path: Delivered-To: python@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4654A1065679; Wed, 17 Feb 2010 12:06:48 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 1E5028FC15; Wed, 17 Feb 2010 12:06:48 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id o1HC6m9Z085832; Wed, 17 Feb 2010 12:06:48 GMT (envelope-from lwhsu@freefall.freebsd.org) Received: (from lwhsu@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id o1HC6lV6085828; Wed, 17 Feb 2010 12:06:47 GMT (envelope-from lwhsu) Date: Wed, 17 Feb 2010 12:06:47 GMT Message-Id: <201002171206.o1HC6lV6085828@freefall.freebsd.org> To: O.Seibert@cs.ru.nl, lwhsu@FreeBSD.org, python@FreeBSD.org From: lwhsu@FreeBSD.org Cc: Subject: Re: ports/144035: ports/databases/py-sqlite3 does not start to build X-BeenThere: freebsd-python@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: FreeBSD-specific Python issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Feb 2010 12:06:48 -0000 Synopsis: ports/databases/py-sqlite3 does not start to build State-Changed-From-To: open->analyzed State-Changed-By: lwhsu State-Changed-When: Wed Feb 17 12:03:53 UTC 2010 State-Changed-Why: The py-sqlite3 port version should be synchronized with python port, and the python installed on your system is out of date with the one in ports. Currently the best way to solve this is upgrade python in your system, then install py-sqlite3 again. Thanks for your notification, and I would try to put a proper warning message or a better way to solve this. http://www.freebsd.org/cgi/query-pr.cgi?pr=144035 From owner-freebsd-python@FreeBSD.ORG Wed Feb 17 22:40:08 2010 Return-Path: Delivered-To: freebsd-python@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6AEC31065694 for ; Wed, 17 Feb 2010 22:40:08 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 3FDD88FC15 for ; Wed, 17 Feb 2010 22:40:08 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id o1HMe8ow041324 for ; Wed, 17 Feb 2010 22:40:08 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id o1HMe8aM041323; Wed, 17 Feb 2010 22:40:08 GMT (envelope-from gnats) Date: Wed, 17 Feb 2010 22:40:08 GMT Message-Id: <201002172240.o1HMe8aM041323@freefall.freebsd.org> To: freebsd-python@FreeBSD.org From: "Li-Lun Wang (Leland Wang)" Cc: Subject: Re: ports/143529: [PATCH] math/py-numpy: does not build X-BeenThere: freebsd-python@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: "Li-Lun Wang \(Leland Wang\)" List-Id: FreeBSD-specific Python issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Feb 2010 22:40:08 -0000 The following reply was made to PR ports/143529; it has been noted by GNATS. From: "Li-Lun Wang (Leland Wang)" To: bug-followup@freebsd.org Cc: Subject: Re: ports/143529: [PATCH] math/py-numpy: does not build Date: Thu, 18 Feb 2010 06:31:59 +0800 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 I forgot to substitute the %%FENV%% in plist in one case. The following is the updated patch. diff -urN py-numpy.orig/Makefile py-numpy/Makefile - --- py-numpy.orig/Makefile 2010-02-07 12:08:47.306031963 -0600 +++ py-numpy/Makefile 2010-02-17 16:28:10.471278208 -0600 @@ -33,6 +33,16 @@ .include +.if ${OSVERSION} <= 900009 && (${ARCH} == "i386" || ${ARCH} == "amd64") +MASTER_SITES+= http://svn.freebsd.org/base/head/lib/msun/:fp +.if ${ARCH} == "i386" +FP_ARCH= i387 +.elif ${ARCH} == "amd64" +FP_ARCH= ${ARCH} +.endif +DISTFILES+= ${FP_ARCH}/fenv.c?p=203441:fp ${FP_ARCH}/fenv.h?p=203441:fp +.endif + .if defined(WITH_ATLAS) LIB_DEPENDS+= atlas.2:${PORTSDIR}/math/atlas .if !exists(${LOCALBASE}/lib/libalapack.a) @@ -59,6 +69,14 @@ GCCLIBDIR= `${FC} -print-file-name=libgfortran.so|${SED} -e s/libgfortran.so//` pre-configure: +.if ${OSVERSION} <= 900009 && (${ARCH} == "i386" || ${ARCH} == "amd64") + @if [ "`${PKG_VERSION} -t \"\`\\\`${CC} -print-prog-name=as\\\` --version | ${AWK} 'NR==1 {sub(/\(GNU Binutils\)/,""); print $$3}'\`\" 2.18.49`" = ">" ] ; then \ + ${CP} ${DISTDIR}/${FP_ARCH}/fenv.c?p=203441 ${WRKSRC}/numpy/core/include/numpy/fenv/fenv.c; \ + ${CP} ${DISTDIR}/${FP_ARCH}/fenv.h?p=203441 ${WRKSRC}/numpy/core/include/numpy/fenv/fenv.h; \ + ${REINPLACE_CMD} -e 's||"fenv.h"|' ${WRKSRC}/numpy/core/include/numpy/fenv/fenv.c; \ + ${PATCH} ${PATCH_DIST_ARGS} < ${FILESDIR}/fenv.patch; \ + fi +.endif .ifdef WITH_ATLAS @${REINPLACE_CMD} -e "s+%%GCCLIBDIR%%+${GCCLIBDIR}+" \ -e "s+%%LOCALBASE%%+${LOCALBASE}+g" \ @@ -72,11 +90,27 @@ .endif @${REINPLACE_CMD} -e "s+%%GCCLIBDIR%%+${GCCLIBDIR}+" ${WRKSRC}/numpy/distutils/system_info.py +pre-install: +.if ${OSVERSION} <= 900009 && (${ARCH} == "i386" || ${ARCH} == "amd64") + @if [ "`${PKG_VERSION} -t \"\`\\\`${CC} -print-prog-name=as\\\` --version | ${AWK} 'NR==1 {sub(/\(GNU Binutils\)/,""); print $$3}'\`\" 2.18.49`" = ">" ] ; then \ + ${RM} ${WRKSRC}/numpy/core/include/numpy/fenv/fenv.c.bak; \ + fi +.endif + post-install: ${INSTALL_MAN} ${WRKSRC}/numpy/f2py/f2py.1 ${MAN1PREFIX}/man/man1 .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKDIR}/numpybook.pdf ${DOCSDIR} .endif +.if ${OSVERSION} <= 900009 && (${ARCH} == "i386" || ${ARCH} == "amd64") + @if [ "`${PKG_VERSION} -t \"\`\\\`${CC} -print-prog-name=as\\\` --version | ${AWK} 'NR==1 {sub(/\(GNU Binutils\)/,""); print $$3}'\`\" 2.18.49`" = ">" ] ; then \ + ${REINPLACE_CMD} -e "s|%%FENV%%||g" ${TMPPLIST}; \ + else \ + ${REINPLACE_CMD} -e "s|%%FENV%%|@comment |g" ${TMPPLIST}; \ + fi +.else + @${REINPLACE_CMD} -e "s|%%FENV%%|@comment |g" ${TMPPLIST} +.endif .include diff -urN py-numpy.orig/distinfo py-numpy/distinfo - --- py-numpy.orig/distinfo 2010-02-07 12:08:47.346034919 -0600 +++ py-numpy/distinfo 2010-02-15 19:51:49.134852482 -0600 @@ -4,3 +4,15 @@ MD5 (numpybook.pdf) = 637180cd704dc8be4036c09412501397 SHA256 (numpybook.pdf) = 8c9692db7373838c585073e4141ae4bd3b8793dffd59ce3544bf851e71e9b865 SIZE (numpybook.pdf) = 2148630 +MD5 (i387/fenv.c?p=203441) = d371542b4c2d17088d52f73862726496 +SHA256 (i387/fenv.c?p=203441) = c7c558ddb6ab6604c83062fe0655d3ce8cf4d60edb4c9c82777962c49d23ca54 +SIZE (i387/fenv.c?p=203441) = 4791 +MD5 (i387/fenv.h?p=203441) = d7c13d3c58b762a7a8814e7d6c585689 +SHA256 (i387/fenv.h?p=203441) = 40c72f3cdd6990076394056e06461e1daeb6087b6a32f1962d3c33b0a00c0e0d +SIZE (i387/fenv.h?p=203441) = 6774 +MD5 (amd64/fenv.c?p=203441) = be35d718bd9113d9efa6fc777298d12d +SHA256 (amd64/fenv.c?p=203441) = 9741a9ad3f8406f8292a268b0bc288dc7cb042e3e102440696d48c9a8b7955f0 +SIZE (amd64/fenv.c?p=203441) = 3601 +MD5 (amd64/fenv.h?p=203441) = 564a4e973990e4f66a5b3ab0e5ded5e1 +SHA256 (amd64/fenv.h?p=203441) = 2daf607fea1bf7e8de5e174599d963fc3bbbe48e293cf2ff08e221351472c9d6 +SIZE (amd64/fenv.h?p=203441) = 5810 diff -urN py-numpy.orig/files/fenv.patch py-numpy/files/fenv.patch - --- py-numpy.orig/files/fenv.patch 1969-12-31 18:00:00.000000000 -0600 +++ py-numpy/files/fenv.patch 2010-02-15 19:01:10.775996010 -0600 @@ -0,0 +1,40 @@ +--- numpy/core/include/numpy/ufuncobject.h.orig 2009-12-15 06:47:53.000000000 -0600 ++++ numpy/core/include/numpy/ufuncobject.h 2010-02-15 18:54:28.490863602 -0600 +@@ -306,7 +306,11 @@ + #elif defined(__GLIBC__) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__MINGW32__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 502114)) + + #if defined(__GLIBC__) || defined(__APPLE__) || defined(__MINGW32__) || defined(__FreeBSD__) ++#if defined(__FreeBSD__) && (__FreeBSD_version <= 900009) ++#include "fenv/fenv.c" ++#else + #include ++#endif + #elif defined(__CYGWIN__) + #include "fenv/fenv.c" + #endif +--- numpy/numarray/_capi.c.orig 2009-12-28 08:00:09.000000000 -0600 ++++ numpy/numarray/_capi.c 2010-02-15 18:57:25.993127759 -0600 +@@ -9,7 +9,12 @@ + #endif + + #if defined(__GLIBC__) || defined(__APPLE__) || defined(__MINGW32__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 502114)) ++#if defined(__FreeBSD__) && (__FreeBSD_version <= 900009) ++#include "numpy/fenv/fenv.h" ++#include "numpy/fenv/fenv.c" ++#else + #include ++#endif + #elif defined(__CYGWIN__) + #include "numpy/fenv/fenv.h" + #include "numpy/fenv/fenv.c" +--- numpy/core/setup.py.orig 2009-12-28 08:00:09.000000000 -0600 ++++ numpy/core/setup.py 2010-02-15 19:00:44.715666850 -0600 +@@ -625,7 +625,7 @@ + ] + + # Don't install fenv unless we need them. +- if sys.platform == 'cygwin': ++ if sys.platform == 'cygwin' or sys.platform.startswith('freebsd'): + config.add_data_dir('include/numpy/fenv') + + config.add_extension('_sort', diff -urN py-numpy.orig/pkg-plist py-numpy/pkg-plist - --- py-numpy.orig/pkg-plist 2010-02-07 12:08:47.366021172 -0600 +++ py-numpy/pkg-plist 2010-02-15 21:23:46.322187473 -0600 @@ -64,6 +64,8 @@ %%PYTHON_SITELIBDIR%%/numpy/core/include/numpy/_numpyconfig.h %%PYTHON_SITELIBDIR%%/numpy/core/include/numpy/arrayobject.h %%PYTHON_SITELIBDIR%%/numpy/core/include/numpy/arrayscalars.h +%%FENV%%%%PYTHON_SITELIBDIR%%/numpy/core/include/numpy/fenv/fenv.c +%%FENV%%%%PYTHON_SITELIBDIR%%/numpy/core/include/numpy/fenv/fenv.h %%PYTHON_SITELIBDIR%%/numpy/core/include/numpy/multiarray_api.txt %%PYTHON_SITELIBDIR%%/numpy/core/include/numpy/ndarrayobject.h %%PYTHON_SITELIBDIR%%/numpy/core/include/numpy/noprefix.h @@ -966,6 +968,7 @@ @dirrm %%PYTHON_SITELIBDIR%%/numpy/core/tests @dirrm %%PYTHON_SITELIBDIR%%/numpy/core/lib/npy-pkg-config @dirrm %%PYTHON_SITELIBDIR%%/numpy/core/lib +%%FENV%%@dirrm %%PYTHON_SITELIBDIR%%/numpy/core/include/numpy/fenv @dirrm %%PYTHON_SITELIBDIR%%/numpy/core/include/numpy @dirrm %%PYTHON_SITELIBDIR%%/numpy/core/include @dirrm %%PYTHON_SITELIBDIR%%/numpy/core -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.12 (FreeBSD) iD8DBQFLfG5dCQM7t5B2mhARAlXgAJ9oDC4jSXmtikkbaZx3GTS1YAhqJACdFGQb eOdjZ0ANVyp31EGsuWvI4/c= =ZubZ -----END PGP SIGNATURE----- From owner-freebsd-python@FreeBSD.ORG Thu Feb 18 04:30:16 2010 Return-Path: Delivered-To: freebsd-python@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8BEC2106566C; Thu, 18 Feb 2010 04:30:16 +0000 (UTC) (envelope-from edwin@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 632B78FC16; Thu, 18 Feb 2010 04:30:16 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id o1I4UGfL049125; Thu, 18 Feb 2010 04:30:16 GMT (envelope-from edwin@freefall.freebsd.org) Received: (from edwin@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id o1I4UGJu049115; Thu, 18 Feb 2010 04:30:16 GMT (envelope-from edwin) Date: Thu, 18 Feb 2010 04:30:16 GMT Message-Id: <201002180430.o1I4UGJu049115@freefall.freebsd.org> To: edwin@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org, freebsd-python@FreeBSD.org From: edwin@FreeBSD.org Cc: Subject: Re: ports/144053: update port: multimedia/py-kaa-metadata to 0.7.7 X-BeenThere: freebsd-python@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: FreeBSD-specific Python issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Feb 2010 04:30:16 -0000 Synopsis: update port: multimedia/py-kaa-metadata to 0.7.7 Responsible-Changed-From-To: freebsd-ports-bugs->freebsd-python Responsible-Changed-By: edwin Responsible-Changed-When: Thu Feb 18 04:30:15 UTC 2010 Responsible-Changed-Why: freebsd-python@ wants this port PRs (via the GNATS Auto Assign Tool) http://www.freebsd.org/cgi/query-pr.cgi?pr=144053 From owner-freebsd-python@FreeBSD.ORG Thu Feb 18 09:28:48 2010 Return-Path: Delivered-To: freebsd-python@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4DFF31065701; Thu, 18 Feb 2010 09:28:48 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 25D3A8FC18; Thu, 18 Feb 2010 09:28:48 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id o1I9SmtV040475; Thu, 18 Feb 2010 09:28:48 GMT (envelope-from lwhsu@freefall.freebsd.org) Received: (from lwhsu@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id o1I9SmaJ040471; Thu, 18 Feb 2010 09:28:48 GMT (envelope-from lwhsu) Date: Thu, 18 Feb 2010 09:28:48 GMT Message-Id: <201002180928.o1I9SmaJ040471@freefall.freebsd.org> To: fbsd@opal.com, lwhsu@FreeBSD.org, freebsd-python@FreeBSD.org From: lwhsu@FreeBSD.org Cc: Subject: Re: ports/144053: update port: multimedia/py-kaa-metadata to 0.7.7 X-BeenThere: freebsd-python@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: FreeBSD-specific Python issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Feb 2010 09:28:48 -0000 Synopsis: update port: multimedia/py-kaa-metadata to 0.7.7 State-Changed-From-To: open->closed State-Changed-By: lwhsu State-Changed-When: Thu Feb 18 09:28:47 UTC 2010 State-Changed-Why: Committed. Thanks! http://www.freebsd.org/cgi/query-pr.cgi?pr=144053 From owner-freebsd-python@FreeBSD.ORG Thu Feb 18 09:30:04 2010 Return-Path: Delivered-To: freebsd-python@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E106F1065676 for ; Thu, 18 Feb 2010 09:30:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id B79E78FC12 for ; Thu, 18 Feb 2010 09:30:04 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id o1I9U48v040731 for ; Thu, 18 Feb 2010 09:30:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id o1I9U4Mp040725; Thu, 18 Feb 2010 09:30:04 GMT (envelope-from gnats) Date: Thu, 18 Feb 2010 09:30:04 GMT Message-Id: <201002180930.o1I9U4Mp040725@freefall.freebsd.org> To: freebsd-python@FreeBSD.org From: dfilter@FreeBSD.ORG (dfilter service) Cc: Subject: Re: ports/144053: commit references a PR X-BeenThere: freebsd-python@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: dfilter service List-Id: FreeBSD-specific Python issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Feb 2010 09:30:05 -0000 The following reply was made to PR ports/144053; it has been noted by GNATS. From: dfilter@FreeBSD.ORG (dfilter service) To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/144053: commit references a PR Date: Thu, 18 Feb 2010 09:28:47 +0000 (UTC) lwhsu 2010-02-18 09:28:39 UTC FreeBSD ports repository Modified files: multimedia/py-kaa-metadata Makefile distinfo Log: - Update to 0.7.7 PR: ports/144053 Submitted by: "J.R. Oldroyd" (maintainer) Feature safe: yes Revision Changes Path 1.7 +1 -2 ports/multimedia/py-kaa-metadata/Makefile 1.3 +3 -3 ports/multimedia/py-kaa-metadata/distinfo _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org" From owner-freebsd-python@FreeBSD.ORG Thu Feb 18 10:50:05 2010 Return-Path: Delivered-To: freebsd-python@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 64148106566C for ; Thu, 18 Feb 2010 10:50:05 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 3984C8FC18 for ; Thu, 18 Feb 2010 10:50:05 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id o1IAo41f010035 for ; Thu, 18 Feb 2010 10:50:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id o1IAo42C010034; Thu, 18 Feb 2010 10:50:04 GMT (envelope-from gnats) Date: Thu, 18 Feb 2010 10:50:04 GMT Message-Id: <201002181050.o1IAo42C010034@freefall.freebsd.org> To: freebsd-python@FreeBSD.org From: Hizel Ildar Cc: Subject: Re: ports/143799: [MANTAINER UPDATE] sysutils/py-supervisor update to 3.0a8 bug fix release X-BeenThere: freebsd-python@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Hizel Ildar List-Id: FreeBSD-specific Python issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Feb 2010 10:50:05 -0000 The following reply was made to PR ports/143799; it has been noted by GNATS. From: Hizel Ildar To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/143799: [MANTAINER UPDATE] sysutils/py-supervisor update to 3.0a8 bug fix release Date: Thu, 18 Feb 2010 13:46:58 +0300 hm, i approve my work :) From owner-freebsd-python@FreeBSD.ORG Thu Feb 18 19:01:34 2010 Return-Path: Delivered-To: python@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3E1E61065676; Thu, 18 Feb 2010 19:01:34 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 16DB28FC0A; Thu, 18 Feb 2010 19:01:34 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id o1IJ1XOr061561; Thu, 18 Feb 2010 19:01:33 GMT (envelope-from lwhsu@freefall.freebsd.org) Received: (from lwhsu@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id o1IJ1XdC061557; Thu, 18 Feb 2010 19:01:33 GMT (envelope-from lwhsu) Date: Thu, 18 Feb 2010 19:01:33 GMT Message-Id: <201002181901.o1IJ1XdC061557@freefall.freebsd.org> To: lwhsu@FreeBSD.org, python@FreeBSD.org, freebsd-python@FreeBSD.org From: lwhsu@FreeBSD.org Cc: Subject: Re: ports/144035: ports/databases/py-sqlite3 does not start to build X-BeenThere: freebsd-python@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: FreeBSD-specific Python issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Feb 2010 19:01:34 -0000 Synopsis: ports/databases/py-sqlite3 does not start to build Responsible-Changed-From-To: python->freebsd-python Responsible-Changed-By: lwhsu Responsible-Changed-When: Thu Feb 18 19:01:33 UTC 2010 Responsible-Changed-Why: Canonicalize assignment. http://www.freebsd.org/cgi/query-pr.cgi?pr=144035 From owner-freebsd-python@FreeBSD.ORG Thu Feb 18 19:01:34 2010 Return-Path: Delivered-To: freebsd-python@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3E1E61065676; Thu, 18 Feb 2010 19:01:34 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 16DB28FC0A; Thu, 18 Feb 2010 19:01:34 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id o1IJ1XOr061561; Thu, 18 Feb 2010 19:01:33 GMT (envelope-from lwhsu@freefall.freebsd.org) Received: (from lwhsu@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id o1IJ1XdC061557; Thu, 18 Feb 2010 19:01:33 GMT (envelope-from lwhsu) Date: Thu, 18 Feb 2010 19:01:33 GMT Message-Id: <201002181901.o1IJ1XdC061557@freefall.freebsd.org> To: lwhsu@FreeBSD.org, python@FreeBSD.org, freebsd-python@FreeBSD.org From: lwhsu@FreeBSD.org Cc: Subject: Re: ports/144035: ports/databases/py-sqlite3 does not start to build X-BeenThere: freebsd-python@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: FreeBSD-specific Python issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Feb 2010 19:01:34 -0000 Synopsis: ports/databases/py-sqlite3 does not start to build Responsible-Changed-From-To: python->freebsd-python Responsible-Changed-By: lwhsu Responsible-Changed-When: Thu Feb 18 19:01:33 UTC 2010 Responsible-Changed-Why: Canonicalize assignment. http://www.freebsd.org/cgi/query-pr.cgi?pr=144035 From owner-freebsd-python@FreeBSD.ORG Fri Feb 19 12:30:04 2010 Return-Path: Delivered-To: freebsd-python@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 38863106568F for ; Fri, 19 Feb 2010 12:30:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 0D24D8FC1C for ; Fri, 19 Feb 2010 12:30:04 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id o1JCU3tk066351 for ; Fri, 19 Feb 2010 12:30:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id o1JCU34Q066346; Fri, 19 Feb 2010 12:30:03 GMT (envelope-from gnats) Date: Fri, 19 Feb 2010 12:30:03 GMT Message-Id: <201002191230.o1JCU34Q066346@freefall.freebsd.org> To: freebsd-python@FreeBSD.org From: Hizel Ildar Cc: Subject: Re: ports/143799: [MANTAINER UPDATE] sysutils/py-supervisor update to 3.0a8 bug fix release X-BeenThere: freebsd-python@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Hizel Ildar List-Id: FreeBSD-specific Python issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Feb 2010 12:30:04 -0000 The following reply was made to PR ports/143799; it has been noted by GNATS. From: Hizel Ildar To: bug-followup@FreeBSD.org Cc: Li-Wen Hsu Subject: Re: ports/143799: [MANTAINER UPDATE] sysutils/py-supervisor update to 3.0a8 bug fix release Date: Fri, 19 Feb 2010 15:25:49 +0300 sorry :( fixing rc script fixing pkg-plist: add @exec mkdir /var/run adding to RUN_DEPEND cElementTree because the daemon to issue a warning but it works >WARN cElementTree not installed, using slower XML parser for XML-RPC diff --git a/sysutils/py-supervisor/Makefile b/sysutils/py-supervisor/Makefile index d3fe85c..19990f7 100644 --- a/sysutils/py-supervisor/Makefile +++ b/sysutils/py-supervisor/Makefile @@ -6,7 +6,7 @@ # PORTNAME= supervisor -PORTVERSION= 3.0a7 +PORTVERSION= 3.0a8 CATEGORIES= sysutils python MASTER_SITES= http://dist.supervisord.org/\ CHEESESHOP @@ -18,8 +18,19 @@ COMMENT= System to monitor and control a number of processes on UNIX-like OS USE_PYTHON= 2.4+ USE_PYDISTUTILS= easy_install +SUB_LIST= PYTHONVER=${PYTHON_VERSION} +USE_RC_SUBR= supervisord + RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}elementtree>=1.2.6:${PORTSDIR}/devel/py-elementtree \ ${PYTHON_PKGNAMEPREFIX}meld3>=0.6.4:${PORTSDIR}/www/py-meld3 \ - ${PYTHON_PKGNAMEPREFIX}medusa>=0.5.4:${PORTSDIR}/net/py-medusa + ${PYTHON_PKGNAMEPREFIX}cElementTree>=1.0.5:${PORTSDIR}/devel/py-celementtree + +post-install: + [ -d /var/run/supervisor ] || ${MKDIR} /var/run/supervisor + [ -f ${PREFIX}/etc/supervisord.conf ] || \ + ( ${PREFIX}/bin/echo_supervisord_conf > ${PREFIX}/etc/supervisord.conf && \ + ${REINPLACE_CMD} -e 's!/tmp/supervisor.sock!/var/run/supervisor/supervisor.sock!g' \ + -e 's!/tmp/supervisord.log!/var/log/supervisord.log!g' -e 's!/tmp/supervisord.pid!/var/run/supervisor/supervisord.pid!g' \ + -e 's!unix:///tmp/supervisor.sock!unix:///var/run/supervisor/supervisor.sock!g' ${PREFIX}/etc/supervisord.conf ) .include diff --git a/sysutils/py-supervisor/distinfo b/sysutils/py-supervisor/distinfo index b99c658..c4bfe0e 100644 --- a/sysutils/py-supervisor/distinfo +++ b/sysutils/py-supervisor/distinfo @@ -1,3 +1,3 @@ -MD5 (supervisor-3.0a7.tar.gz) = d2e6c491fcb2606e4fd0afe4ebfd4b13 -SHA256 (supervisor-3.0a7.tar.gz) = 4c4e48f94298e80e21209458d57471c19c40b3e1993f6e780f31826192eaff99 -SIZE (supervisor-3.0a7.tar.gz) = 292408 +MD5 (supervisor-3.0a8.tar.gz) = 7a775455f3a53c2ea375d18dcfe9e522 +SHA256 (supervisor-3.0a8.tar.gz) = ce61afd01780ffba3e40ec244205b6db309da3b84ef27b5c5b179456050e5b8b +SIZE (supervisor-3.0a8.tar.gz) = 287705 diff --git a/sysutils/py-supervisor/files/patch-aa b/sysutils/py-supervisor/files/patch-aa new file mode 100644 index 0000000..94fc597 --- /dev/null +++ b/sysutils/py-supervisor/files/patch-aa @@ -0,0 +1,11 @@ +--- src/supervisor/options.py.orig 2010-02-11 13:25:24.000000000 +0300 ++++ src/supervisor/options.py 2010-02-11 13:25:55.000000000 +0300 +@@ -105,7 +105,7 @@ + def default_configfile(self): + """Return the name of the found config file or raise. """ + paths = ['supervisord.conf', 'etc/supervisord.conf', +- '/etc/supervisord.conf'] ++ '/etc/supervisord.conf', '/usr/local/etc/supervisord.conf'] + config = None + for path in paths: + if os.path.exists(path): diff --git a/sysutils/py-supervisor/files/supervisord.in b/sysutils/py-supervisor/files/supervisord.in new file mode 100644 index 0000000..97408a6 --- /dev/null +++ b/sysutils/py-supervisor/files/supervisord.in @@ -0,0 +1,27 @@ +#!/bin/sh +# +# PROVIDE: supervisord +# REQUIRE: DAEMON +# KEYWORD: shutdown +# +# Add the following line to /etc/rc.conf to enable trac: +# supervisord_enable="YES" +# + +. %%RC_SUBR%% + +# Set some defaults +supervisord_enable=${supervisord_enable:-"NO"} +supervisord_pid=${supervisord_pid:-"/var/run/supervisor/supervisord.pid"} + +name=supervisord +rcvar=`set_rcvar` + +load_rc_config $name + +pidfile=${supervisord_pid} +command="%%PREFIX%%/bin/supervisord" +command_interpreter="/usr/local/bin/%%PYTHONVER%%" + +run_rc_command "$1" + diff --git a/sysutils/py-supervisor/pkg-plist b/sysutils/py-supervisor/pkg-plist index 595ec79..5eeedda 100644 --- a/sysutils/py-supervisor/pkg-plist +++ b/sysutils/py-supervisor/pkg-plist @@ -2,14 +2,6 @@ bin/echo_supervisord_conf bin/pidproxy bin/supervisorctl bin/supervisord -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/._PKG-INFO -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/._SOURCES.txt -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/._dependency_links.txt -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/._entry_points.txt -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/._namespace_packages.txt -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/._not-zip-safe -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/._requires.txt -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/._top_level.txt %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt @@ -278,6 +270,9 @@ bin/supervisord %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/tests/test_childutils.py %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/tests/test_childutils.pyc %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/tests/test_childutils.pyo +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/tests/test_confecho.py +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/tests/test_confecho.pyc +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/tests/test_confecho.pyo %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/tests/test_datatypes.py %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/tests/test_datatypes.pyc %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/tests/test_datatypes.pyo @@ -293,9 +288,6 @@ bin/supervisord %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/tests/test_loggers.py %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/tests/test_loggers.pyc %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/tests/test_loggers.pyo -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/tests/test_memmon.py -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/tests/test_memmon.pyc -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/tests/test_memmon.pyo %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/tests/test_options.py %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/tests/test_options.pyc %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/tests/test_options.pyo @@ -308,6 +300,9 @@ bin/supervisord %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/tests/test_socket_manager.py %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/tests/test_socket_manager.pyc %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/tests/test_socket_manager.pyo +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/tests/test_states.py +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/tests/test_states.pyc +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/tests/test_states.pyo %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/tests/test_supervisorctl.py %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/tests/test_supervisorctl.pyc %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/tests/test_supervisorctl.pyo @@ -359,4 +354,6 @@ bin/supervisord @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/doc @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%% - +@stopdaemon supervisord +@exec mkdir -p /var/run/supervisor +@unexec rm -rf /var/run/supervisor From owner-freebsd-python@FreeBSD.ORG Sat Feb 20 07:10:18 2010 Return-Path: Delivered-To: freebsd-python@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BF245106568B; Sat, 20 Feb 2010 07:10:18 +0000 (UTC) (envelope-from edwin@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 9700C8FC18; Sat, 20 Feb 2010 07:10:18 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id o1K7AI8C033581; Sat, 20 Feb 2010 07:10:18 GMT (envelope-from edwin@freefall.freebsd.org) Received: (from edwin@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id o1K7AIDI033570; Sat, 20 Feb 2010 07:10:18 GMT (envelope-from edwin) Date: Sat, 20 Feb 2010 07:10:18 GMT Message-Id: <201002200710.o1K7AIDI033570@freefall.freebsd.org> To: edwin@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org, freebsd-python@FreeBSD.org From: edwin@FreeBSD.org Cc: Subject: Re: ports/144123: audio/py-mutagen: Update to 1.19 X-BeenThere: freebsd-python@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: FreeBSD-specific Python issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Feb 2010 07:10:18 -0000 Synopsis: audio/py-mutagen: Update to 1.19 Responsible-Changed-From-To: freebsd-ports-bugs->freebsd-python Responsible-Changed-By: edwin Responsible-Changed-When: Sat Feb 20 07:10:18 UTC 2010 Responsible-Changed-Why: freebsd-python@ wants this port PRs (via the GNATS Auto Assign Tool) http://www.freebsd.org/cgi/query-pr.cgi?pr=144123 From owner-freebsd-python@FreeBSD.ORG Sat Feb 20 09:48:57 2010 Return-Path: Delivered-To: freebsd-python@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E07FE1065670; Sat, 20 Feb 2010 09:48:57 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id B83818FC12; Sat, 20 Feb 2010 09:48:57 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id o1K9mvDL097300; Sat, 20 Feb 2010 09:48:57 GMT (envelope-from lwhsu@freefall.freebsd.org) Received: (from lwhsu@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id o1K9mvtZ097296; Sat, 20 Feb 2010 09:48:57 GMT (envelope-from lwhsu) Date: Sat, 20 Feb 2010 09:48:57 GMT Message-Id: <201002200948.o1K9mvtZ097296@freefall.freebsd.org> To: lwhsu@FreeBSD.org, freebsd-python@FreeBSD.org, lwhsu@FreeBSD.org From: lwhsu@FreeBSD.org Cc: Subject: Re: ports/144123: audio/py-mutagen: Update to 1.19 X-BeenThere: freebsd-python@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: FreeBSD-specific Python issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Feb 2010 09:48:58 -0000 Synopsis: audio/py-mutagen: Update to 1.19 Responsible-Changed-From-To: freebsd-python->lwhsu Responsible-Changed-By: lwhsu Responsible-Changed-When: Sat Feb 20 09:48:57 UTC 2010 Responsible-Changed-Why: I'll take it. http://www.freebsd.org/cgi/query-pr.cgi?pr=144123 From owner-freebsd-python@FreeBSD.ORG Sat Feb 20 10:50:11 2010 Return-Path: Delivered-To: freebsd-python@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 27BF11065694; Sat, 20 Feb 2010 10:50:11 +0000 (UTC) (envelope-from edwin@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id F38418FC0A; Sat, 20 Feb 2010 10:50:10 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id o1KAoAFH050203; Sat, 20 Feb 2010 10:50:10 GMT (envelope-from edwin@freefall.freebsd.org) Received: (from edwin@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id o1KAoAjf050193; Sat, 20 Feb 2010 10:50:10 GMT (envelope-from edwin) Date: Sat, 20 Feb 2010 10:50:10 GMT Message-Id: <201002201050.o1KAoAjf050193@freefall.freebsd.org> To: edwin@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org, freebsd-python@FreeBSD.org From: edwin@FreeBSD.org Cc: Subject: Re: ports/144131: [UPDATE] devel/py-waf to 1.5.13 X-BeenThere: freebsd-python@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: FreeBSD-specific Python issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Feb 2010 10:50:11 -0000 Synopsis: [UPDATE] devel/py-waf to 1.5.13 Responsible-Changed-From-To: freebsd-ports-bugs->freebsd-python Responsible-Changed-By: edwin Responsible-Changed-When: Sat Feb 20 10:50:10 UTC 2010 Responsible-Changed-Why: freebsd-python@ wants this port PRs (via the GNATS Auto Assign Tool) http://www.freebsd.org/cgi/query-pr.cgi?pr=144131