conda-forge · mattip · Jan 18, 2023 · Dec 7, 2022 · Dec 7, 2022 · Dec 7, 2022
@@ -3,7 +3,7 @@ bzip2:
 c_compiler:
 - gcc
 c_compiler_version:
-- '10'
+- '11'
 cdt_name:
 - cos6
 channel_sources:

@@ -3,7 +3,7 @@ bzip2:
 c_compiler:
 - gcc
 c_compiler_version:
-- '10'
+- '11'
 cdt_name:
 - cos6
 channel_sources:

@@ -3,7 +3,7 @@ bzip2:
 c_compiler:
 - gcc
 c_compiler_version:
-- '10'
+- '11'
 cdt_name:
 - cos6
 channel_sources:

@@ -3,7 +3,7 @@ bzip2:
 c_compiler:
 - gcc
 c_compiler_version:
-- '10'
+- '11'
 cdt_name:
 - cos6
 channel_sources:

@@ -12,6 +12,7 @@ set "PYPY_PKG_NAME=pypy3"
 set "BUILD_DIR=%PREFIX%\..\build"
 set "TARGET_DIR=%PREFIX%\..\target"
 set "ARCHIVE_NAME=%PYPY_PKG_NAME%-%PKG_VERSION%"
+set PYPY_PACKAGE_NO_DLLS=1
 
 REM Report system info
 systeminfo

@@ -31,6 +31,9 @@ PYPY_PKG_NAME=pypy3
 BUILD_DIR=${PREFIX}/../build
 TARGET_DIR=${PREFIX}/../target
 ARCHIVE_NAME="${PYPY_PKG_NAME}-${PKG_VERSION}"
+PYPY_PACKAGE_WITHOUTTK=1
+PYPY_NO_EMBED_DEPENDENCIES=1
+PYPY_NO_MAKE_PORTABLE=1
 
 # Build PyPy in stages
 # Force the build to use this directory

@@ -2,16 +2,16 @@
 {% set name_suffix = "3.8" %}
 {% endif %}
 {% set name = "pypy" ~ name_suffix %}
-{% set version = "7.3.9" %}
+{% set version = "7.3.11" %}
 
 package:
   name: {{ name }}
   version: {{ version }}
 
 source:
   - url: https://downloads.python.org/pypy/{{ name }}-v{{ version }}-src.tar.bz2
-    sha256: 5b5d9d9256f12a129af8384e2f581bdfab3bc0fbbe3a0a480d9c1d2e95490eb1  # [name_suffix == "3.8"]
-    sha256: 2abaa1e9fe1ec0e233c9fbc377a0c8e9a0634080a8f4f30eb6898301f6618c12  # [name_suffix == "3.9"]
+    sha256: 4d6769bfca73734e8666fd70503b7ceb06a6e259110e617331bb3899ca4e6058  # [name_suffix == "3.8"]
+    sha256: b0f3166fb2a5aadfd5ceb9db5cdd5f7929a0eccca02b4a26c0dae0492f7ca8ea  # [name_suffix == "3.9"]
     folder: pypy3
     patches:
       - patches/fficurses.patch
@@ -33,22 +33,14 @@ source:
       - patches/0020-Use-ranlib-from-env-if-env-variable-is-set.patch
       - patches/0024-Fix-LDSHARED-when-CC-is-overriden-on-Linux-too.patch
       # Patches to be removed for the next version
-      - patches/0019a-Disable-copying-dlls.patch  # [name_suffix=="3.8"]
-      - patches/0019b-Disable-copying-dlls.patch  # [name_suffix=="3.9"]
-      - patches/0031-pre-v7.3.10-fix-generic-alias.patch  # [name_suffix=="3.9"]
-      - patches/0031-Disable-embedding-and-portable.patch
-      - patches/0032a-pre-v7.3.10-fix-object-h.patch  # [name_suffix=="3.8"]
-      - patches/0032b-pre-v7.3.10-fix-object-h.patch  # [name_suffix=="3.9"]
-      - patches/0033-pre-v7.3.10-fix-windows-scratch-reg.patch
-      - patches/0034-pre-v7.3.10-libc-darwin-path.patch
-      - patches/fix_tzpath.patch   # [name_suffix != "3.8"]
+      - patches/0019-Disable-copying-dlls.patch
 
   - url: https://downloads.python.org/pypy/pypy2.7-v7.3.6-win64.zip           # [win]
     sha256: fcc8f6b3b472a77eaa754951f288fe234b4953bfba845888dd839b9b862cb891  # [win]
     folder: pypy2-binary                                                      # [win]
 
 build:
-  number: 7
+  number: 0
   skip_compile_pyc:
     - lib*
 

@@ -0,0 +1,25 @@
+# HG changeset patch
+# Date 1673190532 -7200
+#      Sun Jan 08 17:08:52 2023 +0200
+# Branch py3.8
+# Node ID d8e6b37f5231c7b59b2b639a651dd696a3732cc3
+# Parent  c758c7d7097f60adffc8d9e8a8fc0dea18902e6f
+make code compatible with conda
+
+diff -r c758c7d7097f -r d8e6b37f5231 lib_pypy/_ssl_build.py
+--- a/lib_pypy/_ssl_build.py	Fri Jan 06 00:00:39 2023 +0200
++++ b/lib_pypy/_ssl_build.py	Sun Jan 08 17:08:52 2023 +0200
+@@ -1,3 +1,4 @@
++import os
+ import sys
+ from _cffi_ssl import _cffi_src
+ sys.modules['_cffi_src'] = _cffi_src
+@@ -60,7 +61,7 @@
+
+ if __name__ == '__main__':
+     ffi.compile(verbose=True)
+-    if sys.platform == 'win32':
++    if sys.platform == 'win32' and "PYPY_PACKAGE_NO_DLLS" not in os.environ:
+         # copy dlls from externals to the pwd
+         # maybe we should link to libraries instead of the dlls
+         # to avoid this mess
@@ -1,15 +1,12 @@
-conda modifies the build to put the dll in base/lib not base/bin
-
-diff -r cbafdee73af5 lib_pypy/_sysconfigdata.py
---- a/lib_pypy/_sysconfigdata.py	Sun Feb 20 16:59:41 2022 +0200
-+++ b/lib_pypy/_sysconfigdata.py	Sun Feb 20 17:38:50 2022 +0200
-@@ -51,7 +51,7 @@
+diff -r c758c7d7097f lib_pypy/_sysconfigdata.py
+--- a/lib_pypy/_sysconfigdata.py	Fri Jan 06 00:00:39 2023 +0200
++++ b/lib_pypy/_sysconfigdata.py	Sun Jan 08 13:05:27 2023 +0200
+@@ -52,7 +52,7 @@
  else:
      build_time_vars['LDLIBRARY'] = 'libpypy3-c.so'
      build_time_vars['INCLUDEPY'] = os.path.join(mybase, 'include', 'pypy' + pydot)
 -    build_time_vars['LIBDIR'] = os.path.join(mybase, 'bin')
 +    build_time_vars['LIBDIR'] = os.path.join(mybase, 'lib')
+     build_time_vars['CONFINCLUDEPY'] = build_time_vars['INCLUDEPY']
 
- if find_executable("gcc"):
-     build_time_vars.update({
-
+ if which("gcc"):
@@ -1,15 +1,12 @@
-conda modifies the build to put the dll in base/lib not base/bin
-
-diff -r ab92c5997c51 lib_pypy/_sysconfigdata.py
---- a/lib_pypy/_sysconfigdata.py	Sun Feb 20 17:00:07 2022 +0200
-+++ b/lib_pypy/_sysconfigdata.py	Sun Feb 20 17:27:41 2022 +0200
-@@ -51,7 +51,7 @@
+diff -r cc1e666384ea lib_pypy/_sysconfigdata.py
+--- a/lib_pypy/_sysconfigdata.py	Fri Jan 06 00:01:13 2023 +0200
++++ b/lib_pypy/_sysconfigdata.py	Sun Jan 08 13:05:57 2023 +0200
+@@ -52,7 +52,7 @@
  else:
-     build_time_vars['LDLIBRARY'] = 'libpypy3-c.so'
+     build_time_vars['LDLIBRARY'] = 'libpypy3.9-c.so'
      build_time_vars['INCLUDEPY'] = os.path.join(mybase, 'include', 'pypy' + pydot)
 -    build_time_vars['LIBDIR'] = os.path.join(mybase, 'bin')
 +    build_time_vars['LIBDIR'] = os.path.join(mybase, 'lib')
+     build_time_vars['CONFINCLUDEPY'] = build_time_vars['INCLUDEPY']
      # try paths relative to sys.base_prefix first
      tzpaths = [
-         os.path.join(mybase, 'share', 'zoneinfo'),
-