mirror of
https://github.com/crazywhalecc/static-php-cli.git
synced 2026-07-12 11:25:35 +08:00
pkg-config patch
This commit is contained in:
@@ -30,6 +30,7 @@ class SourcePatcher
|
|||||||
FileSystem::addSourceExtractHook('php-src', [__CLASS__, 'patchImapLicense']);
|
FileSystem::addSourceExtractHook('php-src', [__CLASS__, 'patchImapLicense']);
|
||||||
FileSystem::addSourceExtractHook('ext-imagick', [__CLASS__, 'patchImagickWith84']);
|
FileSystem::addSourceExtractHook('ext-imagick', [__CLASS__, 'patchImagickWith84']);
|
||||||
FileSystem::addSourceExtractHook('libaom', [__CLASS__, 'patchLibaomForAlpine']);
|
FileSystem::addSourceExtractHook('libaom', [__CLASS__, 'patchLibaomForAlpine']);
|
||||||
|
FileSystem::addSourceExtractHook('pkg-config', [__CLASS__, 'patchPkgConfigForGcc15']);
|
||||||
FileSystem::addSourceExtractHook('attr', [__CLASS__, 'patchAttrForAlpine']);
|
FileSystem::addSourceExtractHook('attr', [__CLASS__, 'patchAttrForAlpine']);
|
||||||
FileSystem::addSourceExtractHook('gmssl', [__CLASS__, 'patchGMSSL']);
|
FileSystem::addSourceExtractHook('gmssl', [__CLASS__, 'patchGMSSL']);
|
||||||
}
|
}
|
||||||
@@ -498,6 +499,12 @@ class SourcePatcher
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static function patchPkgConfigForGcc15(): bool
|
||||||
|
{
|
||||||
|
self::patchFile('pkg-config_gcc15.patch', SOURCE_PATH . '/pkg-config');
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
public static function patchLibaomForAlpine(): bool
|
public static function patchLibaomForAlpine(): bool
|
||||||
{
|
{
|
||||||
if (PHP_OS_FAMILY === 'Linux' && SystemUtil::isMuslDist()) {
|
if (PHP_OS_FAMILY === 'Linux' && SystemUtil::isMuslDist()) {
|
||||||
|
|||||||
22
src/globals/patch/pkg-config_gcc15.patch
Normal file
22
src/globals/patch/pkg-config_gcc15.patch
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
diff --git a/glib/glib/goption.c b/glib/glib/goption.c
|
||||||
|
index 0a22f6f..f439fd4 100644
|
||||||
|
--- a/glib/glib/goption.c
|
||||||
|
+++ b/glib/glib/goption.c
|
||||||
|
@@ -166,7 +166,7 @@ typedef struct
|
||||||
|
gpointer arg_data;
|
||||||
|
union
|
||||||
|
{
|
||||||
|
- gboolean bool;
|
||||||
|
+ gboolean boolean;
|
||||||
|
gint integer;
|
||||||
|
gchar *str;
|
||||||
|
gchar **array;
|
||||||
|
@@ -1600,7 +1600,7 @@ free_changes_list (GOptionContext *context,
|
||||||
|
switch (change->arg_type)
|
||||||
|
{
|
||||||
|
case G_OPTION_ARG_NONE:
|
||||||
|
- *(gboolean *)change->arg_data = change->prev.bool;
|
||||||
|
+ *(gboolean *)change->arg_data = change->prev.boolean;
|
||||||
|
break;
|
||||||
|
case G_OPTION_ARG_INT:
|
||||||
|
*(gint *)change->arg_data = change->prev.integer;
|
||||||
Reference in New Issue
Block a user