CVS commit: pkgsrc/lang/python38

["Manuel Bouyer" <bouyer%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bouyer
Date:           Sat May 22 09:48:02 UTC 2021

Modified Files:
        pkgsrc/lang/python38: Makefile distinfo
        pkgsrc/lang/python38/patches: patch-Modules_socketmodule.h
            patch-configure

Log Message:
Properly detect NetBSD's socketcan implementation.
Bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/lang/python38/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/lang/python38/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/lang/python38/patches/patch-Modules_socketmodule.h
cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/python38/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/python38/Makefile
diff -u pkgsrc/lang/python38/Makefile:1.18 pkgsrc/lang/python38/Makefile:1.19
--- pkgsrc/lang/python38/Makefile:1.18  Sat Jan  2 09:51:48 2021
+++ pkgsrc/lang/python38/Makefile       Sat May 22 09:48:01 2021
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2021/01/02 09:51:48 adam Exp $
+# $NetBSD: Makefile,v 1.19 2021/05/22 09:48:01 bouyer Exp $
 
 .include "dist.mk"
 
 PKGNAME=       python38-${PY_DISTVERSION}
+PKGREVISION=   1
 CATEGORIES=    lang python
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/lang/python38/distinfo
diff -u pkgsrc/lang/python38/distinfo:1.19 pkgsrc/lang/python38/distinfo:1.20
--- pkgsrc/lang/python38/distinfo:1.19  Tue May  4 05:16:07 2021
+++ pkgsrc/lang/python38/distinfo       Sat May 22 09:48:01 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2021/05/04 05:16:07 adam Exp $
+$NetBSD: distinfo,v 1.20 2021/05/22 09:48:01 bouyer Exp $
 
 SHA1 (Python-3.8.10.tar.xz) = f6579351d42a81c77b55aa4ca8b1280b4f5b37f9
 RMD160 (Python-3.8.10.tar.xz) = eaffc74bd79021ef7a6309f494ca387860e8af9c
@@ -15,11 +15,11 @@ SHA1 (patch-Modules_makesetup) = a06786e
 SHA1 (patch-Modules_nismodule.c) = 1bafe9b06359586d027a77011b103877590d947d
 SHA1 (patch-Modules_posixmodule.c) = ea24a1aa19b596b5d4457a4eff761e516406145f
 SHA1 (patch-Modules_socketmodule.c) = e99fd9e30e3feafef1747a2f52446d8fec543362
-SHA1 (patch-Modules_socketmodule.h) = 13a3290eb72078067060d3e71b7baa08f3eb591c
+SHA1 (patch-Modules_socketmodule.h) = 9ba713069aeb4e262d0bf621e3873002a11f97bb
 SHA1 (patch-Modules_timemodule.c) = 10dc2769432bbfd4360f90fedfa6504d8b6f6347
 SHA1 (patch-Python_bootstrap__hash.c) = 2e7d24ded1369624b2983b15784988517a9697a5
 SHA1 (patch-Python_pytime.c) = 41981f821e0b420abcb0334312148deb9a9fed5e
 SHA1 (patch-Python_thread__pthread.h) = fb81eaa604b4ed7c1b64c3f4731d58a8aee257be
-SHA1 (patch-configure) = 5607f103279127b4465294af1f9601a3c1e3e89e
+SHA1 (patch-configure) = 114060a92a3d6fc20ad4adc12ae396307b5f4c16
 SHA1 (patch-pyconfig.h.in) = dc98ffe351623df2e8453e9350c30d705f4e99bd
 SHA1 (patch-setup.py) = 0b05bdc61289ee75758dcf8e422b988ff2067cba

Index: pkgsrc/lang/python38/patches/patch-Modules_socketmodule.h
diff -u pkgsrc/lang/python38/patches/patch-Modules_socketmodule.h:1.1 pkgsrc/lang/python38/patches/patch-Modules_socketmodule.h:1.2
--- pkgsrc/lang/python38/patches/patch-Modules_socketmodule.h:1.1       Tue Oct 15 16:50:11 2019
+++ pkgsrc/lang/python38/patches/patch-Modules_socketmodule.h   Sat May 22 09:48:02 2021
@@ -1,15 +1,13 @@
-$NetBSD: patch-Modules_socketmodule.h,v 1.1 2019/10/15 16:50:11 adam Exp $
+$NetBSD: patch-Modules_socketmodule.h,v 1.2 2021/05/22 09:48:02 bouyer Exp $
 
---- Modules/socketmodule.h.orig        2017-03-21 07:32:38.000000000 +0100
-+++ Modules/socketmodule.h     2017-05-30 12:36:59.254776235 +0200
-@@ -91,6 +91,10 @@
- #include <linux/can/bcm.h>
- #endif
+--- Modules/socketmodule.h.orig        2021-05-03 11:47:56.000000000 +0200
++++ Modules/socketmodule.h     2021-05-21 23:47:53.387781121 +0200
+@@ -90,6 +90,8 @@
  
-+#ifdef HAVE_NETCAN_CAN_H
+ #ifdef HAVE_LINUX_CAN_H
+ # include <linux/can.h>
++#elif defined(HAVE_NETCAN_CAN_H)
 +#include <netcan/can.h>
-+#endif
-+
- #ifdef HAVE_SYS_SYS_DOMAIN_H
- #include <sys/sys_domain.h>
- #endif
+ #else
+ # undef AF_CAN
+ # undef PF_CAN

Index: pkgsrc/lang/python38/patches/patch-configure
diff -u pkgsrc/lang/python38/patches/patch-configure:1.8 pkgsrc/lang/python38/patches/patch-configure:1.9
--- pkgsrc/lang/python38/patches/patch-configure:1.8    Tue May  4 05:16:07 2021
+++ pkgsrc/lang/python38/patches/patch-configure        Sat May 22 09:48:02 2021
@@ -1,13 +1,14 @@
-$NetBSD: patch-configure,v 1.8 2021/05/04 05:16:07 adam Exp $
+$NetBSD: patch-configure,v 1.9 2021/05/22 09:48:02 bouyer Exp $
 
 - Use gnu99 instead of c99 to avoid "alloca() undefined" problems.
 - Fix linking on Darwin; don't use -stack_size.
 - Changes for consistency across pkgsrc platforms.
 - Simplify _sysconfigdata to include only platform name.
+- detect netcan/can.h on NetBSD
 
---- configure.orig     2021-05-03 09:47:56.000000000 +0000
-+++ configure
-@@ -6917,7 +6917,7 @@ UNIVERSAL_ARCH_FLAGS=
+--- configure.orig     2021-05-03 11:47:56.000000000 +0200
++++ configure  2021-05-21 13:07:18.622777201 +0200
+@@ -6917,7 +6917,7 @@
  # tweak BASECFLAGS based on compiler and platform
  case $GCC in
  yes)
@@ -16,7 +17,16 @@ $NetBSD: patch-configure,v 1.8 2021/05/0
  
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Wextra" >&5
  $as_echo_n "checking for -Wextra... " >&6; }
-@@ -9564,7 +9569,6 @@ then
+@@ -8253,7 +8253,7 @@
+ 
+ 
+ # On Linux, can.h and can/raw.h require sys/socket.h
+-for ac_header in linux/can.h linux/can/raw.h linux/can/bcm.h
++for ac_header in linux/can.h linux/can/raw.h linux/can/bcm.h netcan/can.h
+ 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" "
+@@ -9564,7 +9564,6 @@
                # to ensure that tests don't crash
                # Note: This matches the value of THREAD_STACK_SIZE in
                # thread_pthread.h
@@ -24,7 +34,7 @@ $NetBSD: patch-configure,v 1.8 2021/05/0
  
                if test "$enable_framework"
                then
-@@ -14356,10 +14385,10 @@ _ACEOF
+@@ -14356,10 +14355,10 @@
  if ac_fn_c_try_compile "$LINENO"; then :
  
  
@@ -37,7 +47,7 @@ $NetBSD: patch-configure,v 1.8 2021/05/0
    if test "$ax_cv_c_float_words_bigendian" = unknown; then
      ax_cv_c_float_words_bigendian=no
    else
-@@ -15244,7 +15273,7 @@ _ACEOF
+@@ -15244,7 +15243,7 @@
  fi
  
  
@@ -46,7 +56,7 @@ $NetBSD: patch-configure,v 1.8 2021/05/0
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking LDVERSION" >&5
  $as_echo_n "checking LDVERSION... " >&6; }
-@@ -15261,11 +15290,7 @@ else
+@@ -15261,11 +15260,7 @@
  fi