Re: svn commit: r371567 - in head/lang/python34: . files

2014-10-28 Thread Antoine Brodin 
On Mon, Oct 27, 2014 at 12:54 PM, Dmitry Sivachenko  wrote:
> Author: demon
> Date: Mon Oct 27 12:54:04 2014
> New Revision: 371567
> URL: https://svnweb.freebsd.org/changeset/ports/371567
> QAT: https://qat.redports.org/buildarchive/r371567/
>
> Log:
>   Update to version 3.4.2.
>   Two deleted patches were integrated upstream.
>
>   Reviewed by:  koobs in D967
>
> Deleted:
>   head/lang/python34/files/patch-issue21166
>   head/lang/python34/files/patch-issue21704
> Modified:
>   head/lang/python34/Makefile
>   head/lang/python34/distinfo
>   head/lang/python34/files/patch-Makefile.pre.in
>   head/lang/python34/files/patch-Modules-_ctypes-libffi-configure
>   head/lang/python34/pkg-plist

Hi,

This fails to build on i386 (_ctypes/libffi error)

Cheers,

Antoine

>
> Modified: head/lang/python34/Makefile
> ==
> --- head/lang/python34/Makefile Mon Oct 27 12:49:22 2014(r371566)
> +++ head/lang/python34/Makefile Mon Oct 27 12:54:04 2014(r371567)
> @@ -2,8 +2,7 @@
>  # $FreeBSD$
>
>  PORTNAME=  python34
> -PORTVERSION=   3.4.1
> -PORTREVISION=  5
> +PORTVERSION=   3.4.2
>  CATEGORIES=lang python ipv6
>  MASTER_SITES=  PYTHON
>  MASTER_SITE_SUBDIR=ftp/python/${PORTVERSION}
>
> Modified: head/lang/python34/distinfo
> ==
> --- head/lang/python34/distinfo Mon Oct 27 12:49:22 2014(r371566)
> +++ head/lang/python34/distinfo Mon Oct 27 12:54:04 2014(r371567)
> @@ -1,2 +1,2 @@
> -SHA256 (python/Python-3.4.1.tar.xz) = 
> c595a163104399041fcbe1c5c04db4c1da94f917b82ce89e8944c8edff7aedc4
> -SIZE (python/Python-3.4.1.tar.xz) = 14125788
> +SHA256 (python/Python-3.4.2.tar.xz) = 
> 1c6d9682d145c056537e477bbfa060ce727f9edd38df1827e0f970dcf04b2def
> +SIZE (python/Python-3.4.2.tar.xz) = 14223804
>
> Modified: head/lang/python34/files/patch-Makefile.pre.in
> ==
> --- head/lang/python34/files/patch-Makefile.pre.in  Mon Oct 27 12:49:22 
> 2014(r371566)
> +++ head/lang/python34/files/patch-Makefile.pre.in  Mon Oct 27 12:54:04 
> 2014(r371567)
> @@ -6,13 +6,17 @@
>  # Submitted by: antoine@ (r358029)
>  # TODO: Upstream
>
>  ./Makefile.pre.in.orig 2014-05-19 05:19:39.0 +
> -+++ ./Makefile.pre.in  2014-06-15 12:12:17.0 +
> -@@ -70,18 +70,15 @@
> +--- Makefile.pre.in.orig   2014-10-08 12:18:14.0 +0400
>  Makefile.pre.in2014-10-19 12:37:14.0 +0400
> +@@ -70,23 +70,20 @@
>   OPT=  @OPT@
>   BASECFLAGS=   @BASECFLAGS@
>   BASECPPFLAGS= @BASECPPFLAGS@
>  -CONFIGURE_CFLAGS= @CFLAGS@
> + # CFLAGS_NODIST is used for building the interpreter and stdlib C 
> extensions.
> + # Use it when a compiler flag should _not_ be part of the distutils CFLAGS
> + # once Python is installed (Issue #21121).
> + CONFIGURE_CFLAGS_NODIST=@CFLAGS_NODIST@
>  -CONFIGURE_CPPFLAGS=   @CPPFLAGS@
>  -CONFIGURE_LDFLAGS=@LDFLAGS@
>   # Avoid assigning CFLAGS, LDFLAGS, etc. so users can use them on the
> @@ -20,6 +24,7 @@
>   # values.
>  -PY_CFLAGS=$(BASECFLAGS) $(OPT) $(CONFIGURE_CFLAGS) $(CFLAGS) 
> $(EXTRA_CFLAGS)
>  +PY_CFLAGS=$(BASECFLAGS) $(OPT) $(CFLAGS) $(EXTRA_CFLAGS)
> + PY_CFLAGS_NODIST=$(CONFIGURE_CFLAGS_NODIST) $(CFLAGS_NODIST)
>   # Both CPPFLAGS and LDFLAGS need to contain the shell's value for setup.py 
> to
>   # be able to build extension modules using the directories specified in the
>   # environment variables
> @@ -30,7 +35,7 @@
>   NO_AS_NEEDED= @NO_AS_NEEDED@
>   LDLAST=   @LDLAST@
>   SGI_ABI=  @SGI_ABI@
> -@@ -1065,12 +1062,6 @@
> +@@ -1080,12 +1077,6 @@
> else true; \
> fi
> (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)$(EXE) 
> python3$(EXE))
> @@ -43,7 +48,7 @@
> -rm -f $(DESTDIR)$(BINDIR)/python3-config
> (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config 
> python3-config)
> -rm -f $(DESTDIR)$(LIBPC)/python3.pc
> -@@ -1333,6 +1324,12 @@
> +@@ -1348,6 +1339,12 @@
> $(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh
> $(INSTALL_SCRIPT) python-config.py $(DESTDIR)$(LIBPL)/python-config.py
> $(INSTALL_SCRIPT) python-config 
> $(DESTDIR)$(BINDIR)/python$(LDVERSION)-config
>
> Modified: head/lang/python34/files/patch-Modules-_ctypes-libffi-configure
> ==
> --- head/lang/python34/files/patch-Modules-_ctypes-libffi-configure Mon 
> Oct 27 12:49:22 2014(r371566)
> +++ head/lang/python34/files/patch-Modules-_ctypes-libffi-configure Mon 
> Oct 27 12:54:04 2014(r371567)
> @@ -1,11 +1,11 @@
>  ./Modules/_ctypes/libffi/configure.orig2013-05-15 20:32:57.0 
> +0400
> -+++ ./Modules/_ctypes/libffi/configure 2013-05-18 10:56:03.0 +0400
> -@@ -6889,

Re: svn commit: r371567 - in head/lang/python34: . files

2014-10-28 Thread Dmitry Sivachenko 

> On 28 окт. 2014 г., at 12:29, Antoine Brodin  wrote:
> 
> On Mon, Oct 27, 2014 at 12:54 PM, Dmitry Sivachenko  wrote:
>> Author: demon
>> Date: Mon Oct 27 12:54:04 2014
>> New Revision: 371567
>> URL: https://svnweb.freebsd.org/changeset/ports/371567
>> QAT: https://qat.redports.org/buildarchive/r371567/
>> 
>> Log:
>>  Update to version 3.4.2.
>>  Two deleted patches were integrated upstream.
>> 
>>  Reviewed by:  koobs in D967
>> 
>> Deleted:
>>  head/lang/python34/files/patch-issue21166
>>  head/lang/python34/files/patch-issue21704
>> Modified:
>>  head/lang/python34/Makefile
>>  head/lang/python34/distinfo
>>  head/lang/python34/files/patch-Makefile.pre.in
>>  head/lang/python34/files/patch-Modules-_ctypes-libffi-configure
>>  head/lang/python34/pkg-plist
> 
> Hi,
> 
> This fails to build on i386 (_ctypes/libffi error)


Where can I see build logs?  QAT link leads to empty page.
___
freebsd-python@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-python
To unsubscribe, send any mail to "freebsd-python-unsubscr...@freebsd.org"

Re: svn commit: r371567 - in head/lang/python34: . files

2014-10-28 Thread Dmitry Sivachenko 

> On 28 окт. 2014 г., at 12:38, Antoine Brodin  wrote:
> 
> On Tue, Oct 28, 2014 at 9:30 AM, Dmitry Sivachenko  wrote:
>> 
>>> On 28 окт. 2014 г., at 12:29, Antoine Brodin  wrote:
>>> 
>>> On Mon, Oct 27, 2014 at 12:54 PM, Dmitry Sivachenko  
>>> wrote:
 Author: demon
 Date: Mon Oct 27 12:54:04 2014
 New Revision: 371567
 URL: https://svnweb.freebsd.org/changeset/ports/371567
 QAT: https://qat.redports.org/buildarchive/r371567/
 
 Log:
 Update to version 3.4.2.
 Two deleted patches were integrated upstream.
 
 Reviewed by:  koobs in D967
 
 Deleted:
 head/lang/python34/files/patch-issue21166
 head/lang/python34/files/patch-issue21704
 Modified:
 head/lang/python34/Makefile
 head/lang/python34/distinfo
 head/lang/python34/files/patch-Makefile.pre.in
 head/lang/python34/files/patch-Modules-_ctypes-libffi-configure
 head/lang/python34/pkg-plist
>>> 
>>> Hi,
>>> 
>>> This fails to build on i386 (_ctypes/libffi error)
>> 
>> 
>> Where can I see build logs?  QAT link leads to empty page.
> 
> I have this log:
> 
> http://gohan1.ysv.freebsd.org/data/101i386-default-baseline/2014-10-27_21h27m36s/logs/errors/python34-3.4.2.log
> 


Well, I can't figure ATM what's wrong with _ctypes and libffi.  But the 
proposed patch to use libffi from ports should fix that.
What do you think about this patch (and to force it unconditionally for i386)?

BTW, I took a look at NetBSD pkgsrc: they always build python with libffi from 
ports (--with-system-libffi).

___
freebsd-python@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-python
To unsubscribe, send any mail to "freebsd-python-unsubscr...@freebsd.org"

Re: svn commit: r371567 - in head/lang/python34: . files

2014-10-28 Thread Cy Schubert 
In message 
, Antoine Brodin writes:
> On Mon, Oct 27, 2014 at 12:54 PM, Dmitry Sivachenko  wrote
> :
> > Author: demon
> > Date: Mon Oct 27 12:54:04 2014
> > New Revision: 371567
> > URL: https://svnweb.freebsd.org/changeset/ports/371567
> > QAT: https://qat.redports.org/buildarchive/r371567/
> >
> > Log:
> >   Update to version 3.4.2.
> >   Two deleted patches were integrated upstream.
> >
> >   Reviewed by:  koobs in D967
> >
> > Deleted:
> >   head/lang/python34/files/patch-issue21166
> >   head/lang/python34/files/patch-issue21704
> > Modified:
> >   head/lang/python34/Makefile
> >   head/lang/python34/distinfo
> >   head/lang/python34/files/patch-Makefile.pre.in
> >   head/lang/python34/files/patch-Modules-_ctypes-libffi-configure
> >   head/lang/python34/pkg-plist
> 
> Hi,
> 
> This fails to build on i386 (_ctypes/libffi error)

Take a look at my patch posted to this list late last night (PDT).


-- 
Cheers,
Cy Schubert 
FreeBSD UNIX: Web:  http://www.FreeBSD.org

The need of the many outweighs the greed of the few.


___
freebsd-python@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-python
To unsubscribe, send any mail to "freebsd-python-unsubscr...@freebsd.org"

Re: svn commit: r371567 - in head/lang/python34: . files

2014-10-28 Thread Cy Schubert 
In message <805a5998-26f1-4cab-a565-382c13509...@freebsd.org>, Dmitry 
Sivachenk
o writes:
> 
> > On 28 окт. 2014 г., at 12:38, Antoine Brodin  
> > wrote:
> > 
> > On Tue, Oct 28, 2014 at 9:30 AM, Dmitry Sivachenko  wrot
> e:
> >> 
> >>> On 28 окт. 2014 г., at 12:29, Antoine Brodin  
> >>> wrote:
> >>> 
> >>> On Mon, Oct 27, 2014 at 12:54 PM, Dmitry Sivachenko  w
> rote:
>  Author: demon
>  Date: Mon Oct 27 12:54:04 2014
>  New Revision: 371567
>  URL: https://svnweb.freebsd.org/changeset/ports/371567
>  QAT: https://qat.redports.org/buildarchive/r371567/
>  
>  Log:
>  Update to version 3.4.2.
>  Two deleted patches were integrated upstream.
>  
>  Reviewed by:  koobs in D967
>  
>  Deleted:
>  head/lang/python34/files/patch-issue21166
>  head/lang/python34/files/patch-issue21704
>  Modified:
>  head/lang/python34/Makefile
>  head/lang/python34/distinfo
>  head/lang/python34/files/patch-Makefile.pre.in
>  head/lang/python34/files/patch-Modules-_ctypes-libffi-configure
>  head/lang/python34/pkg-plist
> >>> 
> >>> Hi,
> >>> 
> >>> This fails to build on i386 (_ctypes/libffi error)
> >> 
> >> 
> >> Where can I see build logs?  QAT link leads to empty page.
> > 
> > I have this log:
> > 
> > http://gohan1.ysv.freebsd.org/data/101i386-default-baseline/2014-10-27_21h2
> 7m36s/logs/errors/python34-3.4.2.log
> > 
> 
> 
> Well, I can't figure ATM what's wrong with _ctypes and libffi.  But the propo
> sed patch to use libffi from ports should fix that.
> What do you think about this patch (and to force it unconditionally for i386)
> ?
> 
> BTW, I took a look at NetBSD pkgsrc: they always build python with libffi fro
> m ports (--with-system-libffi).

Would anyone mind if I committed the patch I posted last night (PDT)? Here 
it is for anyone who's missed it.




Index: python27/Makefile
===
--- python27/Makefile   (revision 371620)
+++ python27/Makefile   (working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=  python27
 PORTVERSION=   2.7.8
-PORTREVISION=  5
+PORTREVISION=  6
 CATEGORIES=lang python ipv6
 MASTER_SITES=  PYTHON
 MASTER_SITE_SUBDIR=ftp/python/${PORTVERSION}
@@ -34,8 +34,8 @@
PORTVERSION=${PORTVERSION} \
OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/} 
# For plat-freebsd* in pkg-plist. http://bugs.python.org/issue19554
 
-OPTIONS_DEFINE=DEBUG IPV6 NLS PYMALLOC SEM THREADS
-OPTIONS_DEFAULT=   IPV6 NLS PYMALLOC SEM THREADS UCS4
+OPTIONS_DEFINE=DEBUG IPV6 NLS PYMALLOC SEM THREADS PORT_FFI
+OPTIONS_DEFAULT=   IPV6 NLS PYMALLOC SEM THREADS UCS4 PORT_FFI
 OPTIONS_SINGLE=UNICODE
 OPTIONS_SINGLE_UNICODE=UCS2 UCS4
 
@@ -45,6 +45,7 @@
 UCS2_DESC= Enable UCS2 Unicode Strings
 UCS4_DESC= Enable UCS4 Unicode Strings
 PYMALLOC_DESC= Enable specialized mallocs
+PORT_FFI_DESC= Use devel/ffi instead of ffi bundled with Python
 
 DEBUG_CONFIGURE_WITH=  pydebug
 IPV6_CONFIGURE_ENABLE= ipv6
@@ -88,6 +89,12 @@
 CFLAGS+=   -DPYTHON_DEFAULT_RECURSION_LIMIT=900
 .endif
 
+.if ${PORT_OPTIONS:MPORT_FFI}
+CONFIGURE_ARGS+=   --with-system-ffi
+BUILD_DEPENDS+=libffi>=0:${PORTSDIR}/devel/libffi
+RUN_DEPENDS+=  libffi>=0:${PORTSDIR}/devel/libffi
+.endif
+
 # See http://bugs.freebsd.org/115940
 .if !exists(/usr/bin/ypcat) || defined(WITHOUT_NIS) # the world with NO_NIS
 PLIST_SUB+=NO_NIS="@comment "
Index: python32/Makefile
===
--- python32/Makefile   (revision 371620)
+++ python32/Makefile   (working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=  python32
 PORTVERSION=   3.2.5
-PORTREVISION=  11
+PORTREVISION=  12
 CATEGORIES=lang python ipv6
 MASTER_SITES=  PYTHON
 MASTER_SITE_SUBDIR=ftp/python/${PORTVERSION}
@@ -33,13 +33,15 @@
 PLIST_SUB= ABI=${ABIFLAGS} \
OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/} 
# For plat-freebsd* in pkg-plist. http://bugs.python.org/issue19554
 
-OPTIONS_DEFINE=DEBUG IPV6 NLS PYMALLOC THREADS TSC UCS4
-OPTIONS_DEFAULT=   IPV6 NLS PYMALLOC THREADS UCS4
+OPTIONS_DEFINE=DEBUG IPV6 NLS PYMALLOC THREADS TSC PORT_FFI
+OPTIONS_DEFAULT=   IPV6 NLS PYMALLOC THREADS PORT_FFI
+
 OPTIONS_SUB=   yes
 
 NLS_DESC=  Enable gettext support for the locale module
 PYMALLOC_DESC= Enable specialized mallocs
 TSC_DESC=  Enable processor timestamp counter profiling
+PORT_FFI_DESC= Use devel/ffi instead of ffi bundled with Python
 
 DEBUG_CONFIGURE_WITH=  pydebug
 IPV6_CONFIGURE_ENABLE= ipv6
@@ -75,6 +77,12 @@
 ABIFLAGS:= d${ABIFLAGS}
 .endif
 
+.if ${PORT_OPTIONS:MPORT_FFI}
+CONFIGURE_ARGS+=   --with-system-ffi
+BUILD_DEPENDS+=  libffi>=0:${PORTSDIR}/devel/libffi
+RUN_DEPENDS+=libffi>=0:${PORTSDIR}/devel/libffi

Re: svn commit: r371567 - in head/lang/python34: . files

2014-10-28 Thread Dmitry Sivachenko 
On 29 окт. 2014 г., at 4:16, Cy Schubert  wrote:
> 
> In message <805a5998-26f1-4cab-a565-382c13509...@freebsd.org>, Dmitry 
> Sivachenk
> o writes:
>> 
>>> On 28 окт. 2014 г., at 12:38, Antoine Brodin  
>>> wrote:
>>> 
>>> On Tue, Oct 28, 2014 at 9:30 AM, Dmitry Sivachenko  wrot
>> e:
 
> On 28 окт. 2014 г., at 12:29, Antoine Brodin  
> wrote:
> 
> On Mon, Oct 27, 2014 at 12:54 PM, Dmitry Sivachenko  w
>> rote:
>> Author: demon
>> Date: Mon Oct 27 12:54:04 2014
>> New Revision: 371567
>> URL: https://svnweb.freebsd.org/changeset/ports/371567
>> QAT: https://qat.redports.org/buildarchive/r371567/
>> 
>> Log:
>> Update to version 3.4.2.
>> Two deleted patches were integrated upstream.
>> 
>> Reviewed by:  koobs in D967
>> 
>> Deleted:
>> head/lang/python34/files/patch-issue21166
>> head/lang/python34/files/patch-issue21704
>> Modified:
>> head/lang/python34/Makefile
>> head/lang/python34/distinfo
>> head/lang/python34/files/patch-Makefile.pre.in
>> head/lang/python34/files/patch-Modules-_ctypes-libffi-configure
>> head/lang/python34/pkg-plist
> 
> Hi,
> 
> This fails to build on i386 (_ctypes/libffi error)
 
 
 Where can I see build logs?  QAT link leads to empty page.
>>> 
>>> I have this log:
>>> 
>>> http://gohan1.ysv.freebsd.org/data/101i386-default-baseline/2014-10-27_21h2
>> 7m36s/logs/errors/python34-3.4.2.log
>>> 
>> 
>> 
>> Well, I can't figure ATM what's wrong with _ctypes and libffi.  But the propo
>> sed patch to use libffi from ports should fix that.
>> What do you think about this patch (and to force it unconditionally for i386)
>> ?
>> 
>> BTW, I took a look at NetBSD pkgsrc: they always build python with libffi fro
>> m ports (--with-system-libffi).
> 
> Would anyone mind if I committed the patch I posted last night (PDT)? Here 
> it is for anyone who's missed it.
> 


Yes, I was talking about your patch in "But the proposed  patch to use libffi 
from ports should fix that".
___
freebsd-python@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-python
To unsubscribe, send any mail to "freebsd-python-unsubscr...@freebsd.org"