CVS commit: pkgsrc/lang/python36

["Youri Mouton" <youri%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   youri
Date:           Sat Jun  2 23:31:48 UTC 2018

Modified Files:
        pkgsrc/lang/python36: distinfo
        pkgsrc/lang/python36/patches: patch-configure

Log Message:
Fix packages depending on python-config on macos where ld doesn't
support -stack_size yet.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/lang/python36/distinfo
cvs rdiff -u -r1.10 -r1.11 pkgsrc/lang/python36/patches/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/python36/distinfo
diff -u pkgsrc/lang/python36/distinfo:1.18 pkgsrc/lang/python36/distinfo:1.19
--- pkgsrc/lang/python36/distinfo:1.18  Thu Mar 29 15:28:16 2018
+++ pkgsrc/lang/python36/distinfo       Sat Jun  2 23:31:48 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2018/03/29 15:28:16 adam Exp $
+$NetBSD: distinfo,v 1.19 2018/06/02 23:31:48 youri Exp $
 
 SHA1 (Python-3.6.5.tar.xz) = 5a7a833a36f1006257d298787f4c38493c5d1689
 RMD160 (Python-3.6.5.tar.xz) = 213ced5e09552468b1efc855727b743a3ab30e8b
@@ -14,6 +14,6 @@ SHA1 (patch-Modules_nismodule.c) = 1bafe
 SHA1 (patch-Modules_socketmodule.c) = e6bdb8990cd9b8cf0b0ff48e6ae7b664681a9924
 SHA1 (patch-Modules_socketmodule.h) = 13a3290eb72078067060d3e71b7baa08f3eb591c
 SHA1 (patch-Python_thread__pthread.h) = fb81eaa604b4ed7c1b64c3f4731d58a8aee257be
-SHA1 (patch-configure) = d999d63bd437500a3a8f176fcd5aa3c48ded836e
+SHA1 (patch-configure) = ab2fb05bb25ba11baecfeb58918f436d3717b2ae
 SHA1 (patch-pyconfig.h.in) = 58e2c03489f9b6e4d88f144d8c09773f92eacd61
 SHA1 (patch-setup.py) = 95d4b411b81e18635556af6c8c4e7af6a8a2a14c

Index: pkgsrc/lang/python36/patches/patch-configure
diff -u pkgsrc/lang/python36/patches/patch-configure:1.10 pkgsrc/lang/python36/patches/patch-configure:1.11
--- pkgsrc/lang/python36/patches/patch-configure:1.10   Tue Jul 18 13:43:40 2017
+++ pkgsrc/lang/python36/patches/patch-configure        Sat Jun  2 23:31:48 2018
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.10 2017/07/18 13:43:40 adam Exp $
+$NetBSD: patch-configure,v 1.11 2018/06/02 23:31:48 youri Exp $
 
 Simplify _sysconfigdata to include only platform name.
 
@@ -7,15 +7,15 @@ http://bugs.python.org/issue21458
 
 Changes for consistency across pkgsrc platforms.
 
-Fix linking on Darwin.
+Fix linking on Darwin. -stack_size is not yet supported.
 
 Use gnu99 instead of c99 to avoid "alloca() undefined" problems on macppc.
 
 detect netcan/can.h on NetBSD
 
---- configure.orig     2017-07-08 03:33:27.000000000 +0000
+--- configure.orig     2018-03-28 09:19:31.000000000 +0000
 +++ configure
-@@ -2925,7 +2925,7 @@ $as_echo_n "checking for python interpre
+@@ -2926,7 +2926,7 @@ $as_echo_n "checking for python interpre
        fi
          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $interp" >&5
  $as_echo "$interp" >&6; }
@@ -24,7 +24,7 @@ detect netcan/can.h on NetBSD
      fi
  elif test "$cross_compiling" = maybe; then
      as_fn_error $? "Cross compiling required --host=HOST-TUPLE and --build=ARCH" "$LINENO" 5
-@@ -3317,7 +3317,7 @@ case $ac_sys_system/$ac_sys_release in
+@@ -3318,7 +3318,7 @@ case $ac_sys_system/$ac_sys_release in
    # Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish.
    # In addition, Stefan Krah confirms that issue #1244610 exists through
    # OpenBSD 4.6, but is fixed in 4.7.
@@ -33,7 +33,7 @@ detect netcan/can.h on NetBSD
      define_xopen_source=no
      # OpenBSD undoes our definition of __BSD_VISIBLE if _XOPEN_SOURCE is
      # also defined. This can be overridden by defining _BSD_SOURCE
-@@ -5962,7 +5962,7 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>
+@@ -5963,7 +5963,7 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>
              PY3LIBRARY=libpython3.so
          fi
            ;;
@@ -42,7 +42,7 @@ detect netcan/can.h on NetBSD
          LDLIBRARY='libpython$(LDVERSION).so'
          BLDLIBRARY='-L. -lpython$(LDVERSION)'
          RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
-@@ -6937,7 +6937,7 @@ UNIVERSAL_ARCH_FLAGS=
+@@ -6938,7 +6938,7 @@ UNIVERSAL_ARCH_FLAGS=
  # tweak BASECFLAGS based on compiler and platform
  case $GCC in
  yes)
@@ -51,7 +51,7 @@ detect netcan/can.h on NetBSD
  
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Wextra" >&5
  $as_echo_n "checking for -Wextra... " >&6; }
-@@ -8112,7 +8112,7 @@ done
+@@ -8121,7 +8121,7 @@ done
  
  
  # On Linux, can.h and can/raw.h require sys/socket.h
@@ -60,7 +60,7 @@ detect netcan/can.h on NetBSD
  do :
    as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
  ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "
-@@ -9228,8 +9228,8 @@ then
+@@ -9237,8 +9237,8 @@ then
                        LDCXXSHARED="$LDCXXSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
                else
                        # No framework, use the Python app as bundle-loader
@@ -71,7 +71,7 @@ detect netcan/can.h on NetBSD
                        LDCXXSHARED="$LDCXXSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
                fi ;;
        Darwin/*)
-@@ -9253,9 +9253,9 @@ then
+@@ -9262,9 +9262,9 @@ then
                                LDCXXSHARED="$LDCXXSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
                        else
                                # No framework, use the Python app as bundle-loader
@@ -84,7 +84,7 @@ detect netcan/can.h on NetBSD
                        fi
                else
                        # building for OS X 10.3 and later
-@@ -9294,6 +9294,9 @@ then
+@@ -9303,6 +9303,9 @@ then
                                   ;;
                                esac
                fi;;
@@ -94,7 +94,7 @@ detect netcan/can.h on NetBSD
        NetBSD*|DragonFly*)
                LDSHARED='$(CC) -shared'
                LDCXXSHARED='$(CXX) -shared';;
-@@ -9338,7 +9341,7 @@ then
+@@ -9347,7 +9350,7 @@ then
        Linux-android*) ;;
        Linux*|GNU*) CCSHARED="-fPIC";;
        BSD/OS*/4*) CCSHARED="-fpic";;
@@ -103,7 +103,16 @@ detect netcan/can.h on NetBSD
        OpenUNIX*|UnixWare*)
                if test "$GCC" = "yes"
                then CCSHARED="-fPIC"
-@@ -9388,7 +9391,7 @@ then
+@@ -9387,7 +9390,7 @@ then
+               # Issue #18075: the default maximum stack size (8MBytes) is too
+               # small for the default recursion limit. Increase the stack size
+               # to ensure that tests don't crash
+-              LINKFORSHARED="-Wl,-stack_size,1000000 $LINKFORSHARED"
++              #LINKFORSHARED="-Wl,-stack_size,1000000 $LINKFORSHARED"
+ 
+               if test "$enable_framework"
+               then
+@@ -9397,7 +9400,7 @@ then
        OpenUNIX*|UnixWare*) LINKFORSHARED="-Wl,-Bexport";;
        SCO_SV*) LINKFORSHARED="-Wl,-Bexport";;
        ReliantUNIX*) LINKFORSHARED="-W1 -Blargedynsym";;
@@ -112,7 +121,7 @@ detect netcan/can.h on NetBSD
                if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
                then
                        LINKFORSHARED="-Wl,--export-dynamic"
-@@ -11165,7 +11168,7 @@ if ${ac_cv_dtrace_link+:} false; then :
+@@ -11174,7 +11177,7 @@ if ${ac_cv_dtrace_link+:} false; then :
    $as_echo_n "(cached) " >&6
  else
                ac_cv_dtrace_link=no
@@ -121,7 +130,7 @@ detect netcan/can.h on NetBSD
              "$DTRACE" -G -s conftest.d -o conftest.o > /dev/null 2>&1 && \
                  ac_cv_dtrace_link=yes
  
-@@ -14992,8 +14995,6 @@ $as_echo "$SOABI" >&6; }
+@@ -15001,8 +15004,6 @@ $as_echo "$SOABI" >&6; }
  
  
  case $ac_sys_system in
@@ -130,7 +139,7 @@ detect netcan/can.h on NetBSD
      *)
        EXT_SUFFIX=${SHLIB_SUFFIX};;
  esac
-@@ -15005,11 +15006,7 @@ LDVERSION='$(VERSION)$(ABIFLAGS)'
+@@ -15014,11 +15015,7 @@ LDVERSION='$(VERSION)$(ABIFLAGS)'
  $as_echo "$LDVERSION" >&6; }