diff options
| author | Ørjan Malde <red@foxi.me> | 2022-02-21 11:16:07 +0100 |
|---|---|---|
| committer | Ørjan Malde <red@foxi.me> | 2022-02-21 11:16:07 +0100 |
| commit | dd910045208e974abd6558c96acdc37444dd376c (patch) | |
| tree | 44fbc9dc044c19e657e1a98a4e5807a5857e8e45 | |
| parent | 293bc94ad8b63f89f291fa75052b936e51f370ef (diff) | |
| download | midipix_build-dd910045208e974abd6558c96acdc37444dd376c.tar.bz2 midipix_build-dd910045208e974abd6558c96acdc37444dd376c.tar.xz | |
groups/231.native_packages_etc.group: php: fix DEPENDS
Signed-off-by: Ørjan Malde <red@foxi.me>
| -rw-r--r-- | groups/231.native_packages_etc.group | 2 | ||||
| -rw-r--r-- | patches/php-8.1.2_pre.local.patch | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/groups/231.native_packages_etc.group b/groups/231.native_packages_etc.group index 31943e9b..f92fa7b3 100644 --- a/groups/231.native_packages_etc.group +++ b/groups/231.native_packages_etc.group @@ -376,7 +376,7 @@ gl_cv_func_getopt_gnu=yes"}; : ${PKG_PCRE2_VERSION:=10.37}; : ${PKG_PCRE2_URL:=https://ftp.pcre.org/pub/pcre/pcre2-${PKG_PCRE2_VERSION}.tar.bz2}; : ${PKG_PCRE2_CONFIGURE_ARGS_EXTRA:="--enable-pcre2grep-libz --enable-pcre2grep-libbz2 --enable-pcre2-16 --enable-pcre2-32 --enable-jit"}; -: ${PKG_PHP_DEPENDS:="bzip2 curl libz libzip libxml2 sqlite3 pcre2 readline libressl onig"}; +: ${PKG_PHP_DEPENDS:="bzip2 curl libz libzip libxml2 sqlite3 pcre2 readline libressl onig libiconv"}; : ${PKG_PHP_SHA256SUM:=6b448242fd360c1a9f265b7263abf3da25d28f2b2b0f5465533b69be51a391dd}; : ${PKG_PHP_VERSION:=8.1.2}; : ${PKG_PHP_URL:=https://www.php.net/distributions/php-${PKG_PHP_VERSION}.tar.xz}; diff --git a/patches/php-8.1.2_pre.local.patch b/patches/php-8.1.2_pre.local.patch index 76b7f170..fc10b05d 100644 --- a/patches/php-8.1.2_pre.local.patch +++ b/patches/php-8.1.2_pre.local.patch @@ -224,7 +224,7 @@ diff -Nru php-8.1.0.orig/configure php-8.1.0/configure $ext_builddir/iconv.$suffix: \$(shared_objects_iconv) \$(ICONV_SHARED_DEPENDENCIES) - \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_iconv) \$(ICONV_SHARED_LIBADD) -+ \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_iconv) \$(ICONV_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so ++ \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_iconv) \$(ICONV_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so \-liconv EOF |