From 72d1cda89787e3cc71b0b4a5e46b62146446b004 Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Tue, 31 Oct 2023 18:49:43 -0500 Subject: [PATCH 1/6] Update shadow home page --- packages.ent | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages.ent b/packages.ent index 558ca79f0..9e0b0db2d 100644 --- a/packages.ent +++ b/packages.ent @@ -640,7 +640,7 @@ - + From 8223937f4c12139f9209fe79e23a5d28383c448f Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Wed, 1 Nov 2023 16:18:43 +0800 Subject: [PATCH 2/6] setuptools: Fix installed directory list --- chapter08/setuptools.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/chapter08/setuptools.xml b/chapter08/setuptools.xml index dac35c5ef..257a50328 100644 --- a/chapter08/setuptools.xml +++ b/chapter08/setuptools.xml @@ -57,8 +57,10 @@ - /usr/lib/python&python-minor;/site-packages/flit_core and - /usr/lib/python&python-minor;/site-packages/flit_core-&setuptools-version;.dist-info + /usr/lib/python&python-minor;/site-packages/_distutils_hack, + /usr/lib/python&python-minor;/site-packages/pkg_resources, + /usr/lib/python&python-minor;/site-packages/setuptools, and + /usr/lib/python&python-minor;/site-packages/setuptools-&setuptools-version;.dist-info From fe2791d41951ef7ec790a458de6c07ebf3fef029 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Wed, 1 Nov 2023 16:33:36 +0800 Subject: [PATCH 3/6] dependencies: Add Setuptools By the way, complete the dependencies on Wheel too. --- appendices/dependencies.xml | 49 ++++++++++++++++++++++++++++++++----- 1 file changed, 43 insertions(+), 6 deletions(-) diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml index 2bec3dd93..9ed06a9b7 100644 --- a/appendices/dependencies.xml +++ b/appendices/dependencies.xml @@ -1501,7 +1501,7 @@ &dependencies; - MarkupSafe and Python + MarkupSafe, Python, Setuptools, and Wheel @@ -2141,7 +2141,7 @@ &dependencies; - Python + Python, Setuptools, and Wheel @@ -2179,7 +2179,7 @@ &dependencies; - Ninja and Python + Ninja, Python, Setuptools, and Wheel @@ -2741,6 +2741,44 @@ + + Setuptools + + + &dependencies; + + Python and Wheel + + + + + &runtime; + + Python + + + + + &testsuites; + + No test suite available + + + + + &before; + + Jinja2, MarkupSafe, and Meson + + + + + &external; + + None + + + Shadow @@ -3216,7 +3254,7 @@ - wheel + Wheel &dependencies; @@ -3243,8 +3281,7 @@ &before; - None - Jinja2 + Jinja2, MarkupSafe, Meson, and Setuptools From c62883bd83304032893b8a98a5e6c1792352628c Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Wed, 1 Nov 2023 17:30:18 +0800 Subject: [PATCH 4/6] dependencies: Remove useless --- appendices/dependencies.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml index 9ed06a9b7..73194612c 100644 --- a/appendices/dependencies.xml +++ b/appendices/dependencies.xml @@ -3281,7 +3281,7 @@ &before; - Jinja2, MarkupSafe, Meson, and Setuptools + Jinja2, MarkupSafe, Meson, and Setuptools From 23d67d844b95075f27ee04dcebb7e87c8655092c Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Wed, 1 Nov 2023 21:34:44 +0800 Subject: [PATCH 5/6] python: Remove --with-system-ffi This option is removed by upstream in 3.12. Link: https://github.com/python/cpython/pull/100544 --- chapter08/python.xml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/chapter08/python.xml b/chapter08/python.xml index a4bfeaf91..f7bc19d47 100644 --- a/chapter08/python.xml +++ b/chapter08/python.xml @@ -48,7 +48,6 @@ ./configure --prefix=/usr \ --enable-shared \ --with-system-expat \ - --with-system-ffi \ --enable-optimizations @@ -62,14 +61,6 @@ - - --with-system-ffi - - This switch enables linking against the system version of - libffi.so. - - - --enable-optimizations From 6b1661a6374a52230e81bca1476aefe0aa3b0290 Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Wed, 1 Nov 2023 11:10:45 -0500 Subject: [PATCH 6/6] Update currency for setuptools --- lfs-latest-git.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lfs-latest-git.php b/lfs-latest-git.php index 6894b4a9e..162d8d6c8 100644 --- a/lfs-latest-git.php +++ b/lfs-latest-git.php @@ -128,6 +128,7 @@ if ( $package == "expect" ) $dirpath = "https://sourceforge.net/projects/exp if ( $package == "file" ) $dirpath = "https://github.com/file/file/tags"; if ( $package == "flex" ) $dirpath = github("westes/flex"); if ( $package == "flit_core" ) $dirpath = "https://pypi.org/project/flit-core/"; +if ( $package == "setuptools" ) $dirpath = "https://pypi.org/project/setuptools/"; if ( $package == "gcc" ) $dirpath = max_parent( $dirpath, "gcc-" ); if ( $package == "iana-etc" ) $dirpath = github("Mic92/iana-etc"); if ( $package == "intltool" ) $dirpath = "https://launchpad.net/intltool/trunk"; @@ -294,6 +295,9 @@ if ( $package == "zstd" ) $dirpath = github("facebook/zstd"); if ( $package == "flit_core" ) return find_max( $lines, "/flit-core /", "/^.*flit-core ([\d\.]+)$/" ); + if ( $package == "setuptools" ) + return find_max( $lines, "/setuptools /", "/^.*setuptools ([\d\.]+)$/" ); + if ( $package == "procps-ng" ) return find_max( $lines, "/v\d/", "/^.*v([\d\.]+)$/" );