Fix gevent patch to not depend on environment variables, and incremen…

…t build numbers of recently-updated recipes (though they have not been released)
chaquo · Sep 19, 2023 · 0fa0527 · 0fa0527
1 parent 73a1e53
commit 0fa0527
Show file tree

Hide file tree

Showing 15 changed files with 36 additions and 13 deletions.
diff --git a/server/pypi/packages/chaquopy-flac/meta.yaml b/server/pypi/packages/chaquopy-flac/meta.yaml
@@ -4,6 +4,9 @@ package:
   name: chaquopy-flac
   version: {{ version }}
 
+build:
+  number: 1
+
 source:
   url: https://ftp.osuosl.org/pub/xiph/releases/flac/flac-{{ version }}.tar.xz
 

diff --git a/server/pypi/packages/chaquopy-geos/meta.yaml b/server/pypi/packages/chaquopy-geos/meta.yaml
@@ -4,5 +4,8 @@ package:
   name: chaquopy-geos
   version: {{ version }}
 
+build:
+  number: 1
+
 source:
   url: http://download.osgeo.org/geos/geos-{{ version }}.tar.bz2
diff --git a/server/pypi/packages/chaquopy-hdf5/meta.yaml b/server/pypi/packages/chaquopy-hdf5/meta.yaml
@@ -5,7 +5,7 @@ package:
   version: {{ version }}
 
 build:
-  number: 1
+  number: 2
 
 source:
   url: https://github.com/hdfgroup/hdf5/archive/hdf5-{{ version | replace(".", "_") }}.tar.gz
diff --git a/server/pypi/packages/chaquopy-libjpeg/meta.yaml b/server/pypi/packages/chaquopy-libjpeg/meta.yaml
@@ -3,7 +3,7 @@ package:
   version: "1.5.3"
 
 build:
-  number: 1
+  number: 2
 
 source:
   url: https://downloads.sourceforge.net/project/libjpeg-turbo/1.5.3/libjpeg-turbo-1.5.3.tar.gz
diff --git a/server/pypi/packages/chaquopy-libogg/meta.yaml b/server/pypi/packages/chaquopy-libogg/meta.yaml
@@ -4,5 +4,8 @@ package:
   name: chaquopy-libogg
   version: {{ version }}
 
+build:
+  number: 1
+
 source:
   url: https://ftp.osuosl.org/pub/xiph/releases/ogg/libogg-{{ version }}.tar.gz
diff --git a/server/pypi/packages/chaquopy-libpng/meta.yaml b/server/pypi/packages/chaquopy-libpng/meta.yaml
@@ -3,7 +3,7 @@ package:
   version: "1.6.34"
 
 build:
-  number: 1
+  number: 2
 
 source:
   url: ftp://ftp-osl.osuosl.org/pub/libpng/src/libpng16/libpng-1.6.34.tar.gz
diff --git a/server/pypi/packages/chaquopy-libraw/meta.yaml b/server/pypi/packages/chaquopy-libraw/meta.yaml
@@ -6,5 +6,8 @@ package:
   name: chaquopy-libraw
   version: {{ version }}
 
+build:
+  number: 1
+
 source:
   url: https://www.libraw.org/data/LibRaw-{{ version }}.tar.gz
diff --git a/server/pypi/packages/chaquopy-libsndfile/meta.yaml b/server/pypi/packages/chaquopy-libsndfile/meta.yaml
@@ -4,6 +4,9 @@ package:
   name: chaquopy-libsndfile
   version: {{ version }}
 
+build:
+  number: 1
+
 source:
   url: http://www.mega-nerd.com/libsndfile/files/libsndfile-{{ version }}.tar.gz
 

diff --git a/server/pypi/packages/chaquopy-libvorbis/meta.yaml b/server/pypi/packages/chaquopy-libvorbis/meta.yaml
@@ -4,6 +4,9 @@ package:
   name: chaquopy-libvorbis
   version: {{ version }}
 
+build:
+  number: 1
+
 source:
   url: https://ftp.osuosl.org/pub/xiph/releases/vorbis/libvorbis-{{ version }}.tar.gz
 

diff --git a/server/pypi/packages/chaquopy-libxml2/meta.yaml b/server/pypi/packages/chaquopy-libxml2/meta.yaml
@@ -3,7 +3,7 @@ package:
   version: "2.9.8"
 
 build:
-  number: 2
+  number: 3
 
 source:
   url: ftp://xmlsoft.org/libxml2/libxml2-2.9.8.tar.gz
diff --git a/server/pypi/packages/chaquopy-libxslt/meta.yaml b/server/pypi/packages/chaquopy-libxslt/meta.yaml
@@ -3,7 +3,7 @@ package:
   version: "1.1.32"
 
 build:
-  number: 2
+  number: 3
 
 source:
   url: ftp://xmlsoft.org/libxslt/libxslt-1.1.32.tar.gz

diff --git a/server/pypi/packages/chaquopy-secp256k1/meta.yaml b/server/pypi/packages/chaquopy-secp256k1/meta.yaml
@@ -6,7 +6,7 @@ package:
   version: "20191011"  # Date of below commit.
 
 build:
-  number: 1
+  number: 2
 
 source:
   # Commit ID from coincurve's setup.py.

diff --git a/server/pypi/packages/chaquopy-ta-lib/meta.yaml b/server/pypi/packages/chaquopy-ta-lib/meta.yaml
@@ -2,5 +2,8 @@ package:
   name: chaquopy-ta-lib
   version: "0.4.0"
 
+build:
+  number: 1
+
 source:
   url: http://prdownloads.sourceforge.net/ta-lib/ta-lib-0.4.0-src.tar.gz
diff --git a/server/pypi/packages/gevent/meta.yaml b/server/pypi/packages/gevent/meta.yaml
@@ -3,7 +3,7 @@ package:
   version: "1.4.0"
 
 build:
-  number: 3
+  number: 4
 
 requirements:
   host:

diff --git a/server/pypi/packages/gevent/patches/chaquopy.patch b/server/pypi/packages/gevent/patches/chaquopy.patch
@@ -1,17 +1,19 @@
-diff -ur src-original/_setuplibev.py src/_setuplibev.py
---- src-original/_setuplibev.py	2019-01-04 11:51:44.000000000 +0000
-+++ src/_setuplibev.py	2019-08-05 14:16:18.730590045 +0000
-@@ -29,9 +29,12 @@
+--- src-original/_setuplibev.py 2019-01-04 11:51:44.000000000 +0000
++++ src/_setuplibev.py  2023-09-19 18:16:51.442556988 +0000
+@@ -29,9 +29,15 @@
  # the build/temp.XXX/libev/ directory. If we're building from a
  # source checkout on pypy, OLDPWD will be the location of setup.py
  # and the PyPy branch will clean it up.
 +
-+# Chaquopy: added --host.
++# Chaquopy
 +import os
++host = os.environ.get("HOST")
++host_arg = f" --host={host}" if host else ""
++
  libev_configure_command = ' '.join([
      "(cd ", quoted_dep_abspath('libev'),
 -    " && sh ./configure ",
-+    " && sh ./configure --host=" + os.environ["HOST"],
++    " && sh ./configure " + host_arg,
      " && cp config.h \"$OLDPWD\"",
      ")",
      '> configure-output.txt'