From: TinfoilSubmarine <TinfoilSubmarine@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] php8.[01]: add php8.[01]-pear subpackage.
Date: Thu, 29 Sep 2022 15:16:02 +0200 [thread overview]
Message-ID: <20220929131602.6W2OzJQuKPMEOw-BwpExFy10IAdvXiHBu_oSwsn4Yfo@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-39438@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1287 bytes --]
There is an updated pull request by TinfoilSubmarine against master on the void-packages repository
https://github.com/TinfoilSubmarine/void-packages maint/php-pear
https://github.com/void-linux/void-packages/pull/39438
php8.[01]: add php8.[01]-pear subpackage.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39438.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maint/php-pear-39438.patch --]
[-- Type: text/x-diff, Size: 5473 bytes --]
From da09cf132ee95560d06318c4a77d0f848c49b60a Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 23 Sep 2022 12:03:12 -0400
Subject: [PATCH 1/2] php8.0: add php8.0-pear subpackage.
---
srcpkgs/php8.0-pear | 1 +
srcpkgs/php8.0/template | 28 ++++++++++++++++++++++++----
2 files changed, 25 insertions(+), 4 deletions(-)
create mode 120000 srcpkgs/php8.0-pear
diff --git a/srcpkgs/php8.0-pear b/srcpkgs/php8.0-pear
new file mode 120000
index 000000000000..104f2d35908d
--- /dev/null
+++ b/srcpkgs/php8.0-pear
@@ -0,0 +1 @@
+php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0/template b/srcpkgs/php8.0/template
index 4b2fa162e3e3..17c46a76c1ec 100644
--- a/srcpkgs/php8.0/template
+++ b/srcpkgs/php8.0/template
@@ -1,7 +1,7 @@
# Template file for 'php8.0'
pkgname=php8.0
version=8.0.23
-revision=1
+revision=2
_php_version=8.0
wrksrc="php-${version}"
hostmakedepends="bison pkg-config apache-devel"
@@ -23,7 +23,7 @@ conf_files="/etc/php${_php_version}/php.ini"
lib32disabled=yes
if [ -n "$CROSS_BUILD" ]; then
- # phar needs php to build
+ # phar and pear need php to build
hostmakedepends+=" php${_php_version}"
CFLAGS+=" -DHAVE_LIBDL
-DHAVE_DLOPEN
@@ -90,7 +90,7 @@ do_build() {
--with-mysqli=shared,mysqlnd \
--with-openssl=shared \
--with-external-pcre \
- --without-pear \
+ --with-pear=/usr/share/pear${_php_version}
--with-pdo-mysql=shared,mysqlnd \
--with-pdo-odbc=shared,unixODBC,$XBPS_CROSS_BASE/usr \
--with-pdo-pgsql=shared,$XBPS_CROSS_BASE/usr \
@@ -112,7 +112,7 @@ do_build() {
EXTENSION_DIR="/usr/lib/php${_php_version}/modules"
export EXTENSION_DIR
- PEAR_INSTALLDIR=/usr/share/pear
+ PEAR_INSTALLDIR=/usr/share/pear${_php_version}
export PEAR_INSTALLDIR
EXTRA_LIBS="-ldl"
export EXTRA_LIBS
@@ -218,6 +218,26 @@ php8.0-embed_package() {
}
}
+php8.0-pear_package() {
+ lib32disabled=yes
+ depends="php${_php_version}-${version}_${revision}"
+ short_desc+=' - PHP Extension and Application Repository'
+ conf_files="/etc/php${_php_version}/pear.conf"
+ pkg_install() {
+ cd ${wrksrc}/build
+ local _env="INSTALL_ROOT=${PKGDESTDIR} PHP_PEAR_PHP_BIN=php${_php_version}"
+ if [ -n "$CROSS_BUILD" ]; then
+ _env+=" PEAR_PHP=/usr/bin/php${_php_version}"
+ fi
+ make install-pear ${_env}
+ rm -rf ${PKGDESTDIR}/.{channels,depdb,depdblock,filemap,lock,registry}
+ rm -rf ${PKGDESTDIR}/usr/share/pear/.{channels,depdb,depdblock,filemap,lock,registry}
+ mv ${PKGDESTDIR}/usr/bin/pear{,${_php_version}}
+ mv ${PKGDESTDIR}/usr/bin/peardev{,${_php_version}}
+ mv ${PKGDESTDIR}/usr/bin/pecl{,${_php_version}}
+ }
+}
+
php8.0-enchant_package() {
lib32disabled=yes
depends="php${_php_version}-${version}_${revision}"
From 0ae1fe34a28792f0adafe9825cf91c4557e96e26 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 23 Sep 2022 12:06:45 -0400
Subject: [PATCH 2/2] php8.1: add php8.1-pear subpackage.
---
srcpkgs/php8.1-pear | 1 +
srcpkgs/php8.1/template | 28 ++++++++++++++++++++++++----
2 files changed, 25 insertions(+), 4 deletions(-)
create mode 120000 srcpkgs/php8.1-pear
diff --git a/srcpkgs/php8.1-pear b/srcpkgs/php8.1-pear
new file mode 120000
index 000000000000..4ad857cc7c08
--- /dev/null
+++ b/srcpkgs/php8.1-pear
@@ -0,0 +1 @@
+php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index f18fa2cb9a7c..5b531400f541 100644
--- a/srcpkgs/php8.1/template
+++ b/srcpkgs/php8.1/template
@@ -1,7 +1,7 @@
# Template file for 'php8.1'
pkgname=php8.1
version=8.1.10
-revision=1
+revision=2
_php_version=8.1
wrksrc="php-${version}"
hostmakedepends="bison pkg-config apache-devel"
@@ -23,7 +23,7 @@ conf_files="/etc/php${_php_version}/php.ini"
lib32disabled=yes
if [ -n "$CROSS_BUILD" ]; then
- # phar needs php to build
+ # phar and pear need php to build
hostmakedepends+=" php${_php_version}"
CFLAGS+=" -DHAVE_LIBDL
-DHAVE_DLOPEN
@@ -90,7 +90,7 @@ do_build() {
--with-mysqli=shared,mysqlnd \
--with-openssl=shared \
--with-external-pcre \
- --without-pear \
+ --with-pear=/usr/share/pear${_php_version} \
--with-pdo-mysql=shared,mysqlnd \
--with-pdo-odbc=shared,unixODBC,$XBPS_CROSS_BASE/usr \
--with-pdo-pgsql=shared,$XBPS_CROSS_BASE/usr \
@@ -112,7 +112,7 @@ do_build() {
EXTENSION_DIR="/usr/lib/php${_php_version}/modules"
export EXTENSION_DIR
- PEAR_INSTALLDIR=/usr/share/pear
+ PEAR_INSTALLDIR=/usr/share/pear${_php_version}
export PEAR_INSTALLDIR
EXTRA_LIBS="-ldl"
export EXTRA_LIBS
@@ -218,6 +218,26 @@ php8.1-embed_package() {
}
}
+php8.1-pear_package() {
+ lib32disabled=yes
+ depends="php${_php_version}-${version}_${revision}"
+ short_desc+=' - PHP Extension and Application Repository'
+ conf_files="/etc/php${_php_version}/pear.conf"
+ pkg_install() {
+ cd ${wrksrc}/build
+ local _env="INSTALL_ROOT=${PKGDESTDIR} PHP_PEAR_PHP_BIN=php${_php_version}"
+ if [ -n "$CROSS_BUILD" ]; then
+ _env+=" PEAR_PHP=/usr/bin/php${_php_version}"
+ fi
+ make install-pear ${_env}
+ rm -rf ${PKGDESTDIR}/.{channels,depdb,depdblock,filemap,lock,registry}
+ rm -rf ${PKGDESTDIR}/usr/share/pear/.{channels,depdb,depdblock,filemap,lock,registry}
+ mv ${PKGDESTDIR}/usr/bin/pear{,${_php_version}}
+ mv ${PKGDESTDIR}/usr/bin/peardev{,${_php_version}}
+ mv ${PKGDESTDIR}/usr/bin/pecl{,${_php_version}}
+ }
+}
+
php8.1-enchant_package() {
lib32disabled=yes
depends="php${_php_version}-${version}_${revision}"
next prev parent reply other threads:[~2022-09-29 13:16 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-23 17:51 [PR PATCH] " TinfoilSubmarine
2022-09-26 14:40 ` [PR PATCH] [Updated] " TinfoilSubmarine
2022-09-29 13:16 ` TinfoilSubmarine [this message]
2022-09-29 13:28 ` TinfoilSubmarine
2022-09-30 13:19 ` TinfoilSubmarine
2022-09-30 13:32 ` [PR PATCH] [Updated] " TinfoilSubmarine
2022-10-07 13:12 ` [PR PATCH] [Updated] PHP 7.4.32, PHP 8.0.24 + pear, PHP 8.1.11 + pear TinfoilSubmarine
2022-10-07 13:17 ` [PR PATCH] [Updated] PHP 7.4.32, PHP 8.0.24 + pear, PHP 8.1.11 + pear, php.*apcu 5.1.22 TinfoilSubmarine
2022-10-07 14:12 ` TinfoilSubmarine
2022-10-07 14:14 ` TinfoilSubmarine
2022-10-07 17:25 ` TinfoilSubmarine
2022-10-31 13:02 ` [PR PATCH] [Updated] " TinfoilSubmarine
2022-11-03 15:30 ` [PR PATCH] [Updated] PHP 7.4.32, PHP 8.0.25 + pear, PHP 8.1.12 + pear, php.*apcu 5.1.22, php.*igbinary 3.2.9 TinfoilSubmarine
2022-11-03 17:06 ` PHP 7.4.33, " TinfoilSubmarine
2022-11-15 14:29 ` [PR PATCH] [Updated] " TinfoilSubmarine
2022-11-15 14:48 ` [PR PATCH] [Updated] php.*: 7.4.33, 8.0.25 + pear, 8.1.12 + pear, apcu 5.1.22, igbinary 3.2.12 TinfoilSubmarine
2022-11-17 11:51 ` [PR PATCH] [Merged]: " paper42
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220929131602.6W2OzJQuKPMEOw-BwpExFy10IAdvXiHBu_oSwsn4Yfo@z \
--to=tinfoilsubmarine@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).