-
-
Notifications
You must be signed in to change notification settings - Fork 18
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
gpkg/glib gpkg/libarchive gpkg/cmake gpkg/fribidi gpkg/git gpkg/harfbuzz gpkg/libuv recompilation with new python: - gpkg/asciidoc - gpkg/libxcb - gpkg/libxslt - gpkg/opengl - gpkg/subversion - gpkg/xcb-proto - gpkg/gobject-introspection - gpkg/libxml2
- Loading branch information
Showing
18 changed files
with
89 additions
and
30 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,7 +21,7 @@ jobs: | |
| build: | ||
| permissions: | ||
| contents: read # actions/upload-artifact doesn't need contents: write | ||
| runs-on: ubuntu-22.04 | ||
| runs-on: ubuntu-24.04 | ||
| strategy: | ||
| matrix: | ||
| target_arch: [aarch64, arm, i686, x86_64] | ||
|
|
@@ -33,7 +33,12 @@ jobs: | |
| fetch-depth: 1000 | ||
|
|
||
| - name: Set up QEMU | ||
| uses: docker/[email protected] | ||
| run: | | ||
| sudo apt update | ||
| yes | sudo apt install qemu-user qemu-user-static binfmt-support | ||
| sudo update-binfmts --enable qemu-aarch64 | ||
| sudo update-binfmts --enable qemu-arm | ||
| docker run --rm --privileged tonistiigi/binfmt --install all | ||
| - name: Get files from termux-packages repository | ||
| run: ./get-build-package.sh | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| --- Python-3.12.6/Python/initconfig.c 2024-09-06 22:03:47.000000000 +0300 | ||
| +++ Python-3.12.6/Python/initconfig.c.patch 2024-09-28 15:11:27.913324313 +0300 | ||
| @@ -1454,11 +1454,40 @@ | ||
| #endif | ||
| } | ||
|
|
||
| - | ||
| #define CONFIG_GET_ENV_DUP(CONFIG, DEST, WNAME, NAME) \ | ||
| config_get_env_dup(CONFIG, DEST, WNAME, NAME, "cannot decode " NAME) | ||
|
|
||
|
|
||
| +static PyStatus | ||
| +config_get_env_dup2(PyConfig *config, | ||
| + wchar_t **dest, | ||
| + char *name1, char *name2, | ||
| + const char *decode_err_msg) | ||
| +{ | ||
| + assert(*dest == NULL); | ||
| + assert(config->use_environment >= 0); | ||
| + | ||
| + if (!config->use_environment) { | ||
| + *dest = NULL; | ||
| + return _PyStatus_OK(); | ||
| + } | ||
| + | ||
| + const char *var = getenv(name1); | ||
| + if (!var) | ||
| + var = getenv(name2); | ||
| + | ||
| + if (!var || var[0] == '\0') { | ||
| + *dest = NULL; | ||
| + return _PyStatus_OK(); | ||
| + } | ||
| + | ||
| + return config_set_bytes_string(config, dest, var, decode_err_msg); | ||
| +} | ||
| + | ||
| +#define CONFIG_GET_ENV_DUP2(CONFIG, DEST, NAME1, NAME2) \ | ||
| + config_get_env_dup2(CONFIG, DEST, NAME1, NAME2, "cannot decode " NAME2) | ||
| + | ||
| + | ||
| static void | ||
| config_get_global_vars(PyConfig *config) | ||
| { | ||
| @@ -1668,8 +1697,8 @@ | ||
| } | ||
|
|
||
| if (config->pythonpath_env == NULL) { | ||
| - status = CONFIG_GET_ENV_DUP(config, &config->pythonpath_env, | ||
| - L"PYTHONPATH", "PYTHONPATH"); | ||
| + status = CONFIG_GET_ENV_DUP2(config, &config->pythonpath_env, | ||
| + "TERMUX_PYTHON_MAINPATH", "PYTHONPATH"); | ||
| if (_PyStatus_EXCEPTION(status)) { | ||
| return status; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters