* [PR PATCH] php: brokeness with the new extraction because they have a package.xml on top level
@ 2022-11-08 16:16 sgn
2022-11-08 16:17 ` [PR PATCH] [Updated] " sgn
2022-11-08 16:24 ` [PR PATCH] [Merged]: " sgn
0 siblings, 2 replies; 3+ messages in thread
From: sgn @ 2022-11-08 16:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1306 bytes --]
There is a new pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages php-php
https://github.com/void-linux/void-packages/pull/40383
php: brokeness with the new extraction because they have a package.xml on top level
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### 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/40383.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-php-php-40383.patch --]
[-- Type: text/x-diff, Size: 10250 bytes --]
From e6786b65f377f2d0e438139f7e6fbf0e35a100ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 8 Nov 2022 23:07:26 +0700
Subject: [PATCH 01/11] xdebug: move source up 1 level
really, I'm not understand php's reason to include a package.xml there.
---
srcpkgs/xdebug/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/xdebug/template b/srcpkgs/xdebug/template
index c9b33a8fb79b..cab8e455139f 100644
--- a/srcpkgs/xdebug/template
+++ b/srcpkgs/xdebug/template
@@ -3,7 +3,7 @@ pkgname=xdebug
version=2.9.3
revision=1
build_style=gnu-configure
-hostmakedepends="autoconf"
+hostmakedepends="autoconf php-devel"
makedepends="php-devel"
short_desc="PHP debugging extension"
maintainer="Alexander Mamay <alexander@mamay.su>"
@@ -12,9 +12,9 @@ homepage="http://xdebug.org"
distfiles="http://xdebug.org/files/${pkgname}-${version,,}.tgz"
checksum=a63f567f2238d75a2244c2a4bd6f5abee817280b3567f9006c99481488dc977c
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" php-devel"
-fi
+post_extract() {
+ mv xdebug-$version/* .
+}
pre_configure() {
phpize
From 17b7d4d3fa1ab410907a2813207faf8d342e4e20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 8 Nov 2022 23:14:02 +0700
Subject: [PATCH 02/11] $pkg: move files up 1 level
since php put a package.xml in top-level
---
srcpkgs/php-ast/template | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/srcpkgs/php-ast/template b/srcpkgs/php-ast/template
index 11c50fe190b0..615361fe50fe 100644
--- a/srcpkgs/php-ast/template
+++ b/srcpkgs/php-ast/template
@@ -16,6 +16,10 @@ distfiles="https://pecl.php.net/get/ast-${version}.tgz"
checksum=ee3d4f67e24d82e4d340806a24052012e4954d223122949377665427443e6d13
make_check_pre="env NO_INTERACTION=1"
+post_extract() {
+ mv ast-$version/* .
+}
+
pre_configure() {
phpize
}
From 07cb3d366af1a348ddeacd69d61b9fa7c7765de9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 8 Nov 2022 23:14:02 +0700
Subject: [PATCH 03/11] $pkg: move files up 1 level
since php put a package.xml in top-level
---
srcpkgs/php-imagick/template | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/srcpkgs/php-imagick/template b/srcpkgs/php-imagick/template
index bfd5393ea055..1f3248f28884 100644
--- a/srcpkgs/php-imagick/template
+++ b/srcpkgs/php-imagick/template
@@ -14,6 +14,10 @@ homepage="https://pecl.php.net/package/imagick"
distfiles="https://pecl.php.net/get/imagick-$version.tgz"
checksum=8dd5aa16465c218651fc8993e1faecd982e6a597870fd4b937e9ece02d567077
+post_extract() {
+ mv imagick-$version/* .
+}
+
pre_configure() {
phpize
}
From 9441047e3080e9a532424396a1ab08f8c3d4dbf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 8 Nov 2022 23:14:02 +0700
Subject: [PATCH 04/11] $pkg: move files up 1 level
since php put a package.xml in top-level
---
srcpkgs/php8.0-apcu/template | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/srcpkgs/php8.0-apcu/template b/srcpkgs/php8.0-apcu/template
index deadc7678aa2..d022a08f3a30 100644
--- a/srcpkgs/php8.0-apcu/template
+++ b/srcpkgs/php8.0-apcu/template
@@ -15,6 +15,10 @@ homepage="https://pecl.php.net/package/APCu"
distfiles="https://pecl.php.net/get/apcu-${version}.tgz"
checksum=1033530448696ee7cadec85050f6df5135fb1330072ef2a74569392acfecfbc1
+post_extract() {
+ mv apcu-$version/* .
+}
+
pre_configure() {
phpize8.0
}
From 4a5ee79528fb61adf3c044ea8c8a87a31ad4596e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 8 Nov 2022 23:14:02 +0700
Subject: [PATCH 05/11] $pkg: move files up 1 level
since php put a package.xml in top-level
---
srcpkgs/php8.0-ast/template | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/srcpkgs/php8.0-ast/template b/srcpkgs/php8.0-ast/template
index 1b1c437c2e85..1464394b9385 100644
--- a/srcpkgs/php8.0-ast/template
+++ b/srcpkgs/php8.0-ast/template
@@ -17,6 +17,10 @@ distfiles="https://pecl.php.net/get/ast-${version}.tgz"
checksum=ee3d4f67e24d82e4d340806a24052012e4954d223122949377665427443e6d13
make_check_pre="env NO_INTERACTION=1"
+post_extract() {
+ mv ast-$version/* .
+}
+
pre_configure() {
phpize8.0
}
From 8a7bb14071141f1fa4196da48c8392dc0a7180ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 8 Nov 2022 23:14:02 +0700
Subject: [PATCH 06/11] $pkg: move files up 1 level
since php put a package.xml in top-level
---
srcpkgs/php8.0-imagick/template | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/srcpkgs/php8.0-imagick/template b/srcpkgs/php8.0-imagick/template
index f916c8c8ce4d..b4c566f1c0ad 100644
--- a/srcpkgs/php8.0-imagick/template
+++ b/srcpkgs/php8.0-imagick/template
@@ -15,6 +15,10 @@ homepage="https://pecl.php.net/package/imagick"
distfiles="https://pecl.php.net/get/imagick-$version.tgz"
checksum=5a364354109029d224bcbb2e82e15b248be9b641227f45e63425c06531792d3e
+post_extract() {
+ mv imagick-$version/* .
+}
+
pre_configure() {
phpize8.0
}
From 936a0bd685af92580aee3705accf9f1beca56b54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 8 Nov 2022 23:14:02 +0700
Subject: [PATCH 07/11] $pkg: move files up 1 level
since php put a package.xml in top-level
---
srcpkgs/php8.1-apcu/template | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/srcpkgs/php8.1-apcu/template b/srcpkgs/php8.1-apcu/template
index 2bda855ba84b..22eadd38e042 100644
--- a/srcpkgs/php8.1-apcu/template
+++ b/srcpkgs/php8.1-apcu/template
@@ -15,6 +15,10 @@ homepage="https://pecl.php.net/package/APCu"
distfiles="https://pecl.php.net/get/apcu-${version}.tgz"
checksum=1033530448696ee7cadec85050f6df5135fb1330072ef2a74569392acfecfbc1
+post_extract() {
+ mv apcu-$version/* .
+}
+
pre_configure() {
phpize8.1
}
From db01777997e2bb5ea4427db1507923f67bfdbbda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 8 Nov 2022 23:14:03 +0700
Subject: [PATCH 08/11] $pkg: move files up 1 level
since php put a package.xml in top-level
---
srcpkgs/php8.1-ast/template | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/srcpkgs/php8.1-ast/template b/srcpkgs/php8.1-ast/template
index ce81061c6c1f..d7620467e2ee 100644
--- a/srcpkgs/php8.1-ast/template
+++ b/srcpkgs/php8.1-ast/template
@@ -17,6 +17,10 @@ distfiles="https://pecl.php.net/get/ast-${version}.tgz"
checksum=ee3d4f67e24d82e4d340806a24052012e4954d223122949377665427443e6d13
make_check_pre="env NO_INTERACTION=1"
+post_extract() {
+ mv ast-$version/* .
+}
+
pre_configure() {
phpize8.1
}
From e1d8f7924d1a029cf1a4641495139d47b3e037d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 8 Nov 2022 23:14:03 +0700
Subject: [PATCH 09/11] $pkg: move files up 1 level
since php put a package.xml in top-level
---
srcpkgs/php8.1-imagick/template | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/srcpkgs/php8.1-imagick/template b/srcpkgs/php8.1-imagick/template
index 45c7bc8066b1..c0f8456855ca 100644
--- a/srcpkgs/php8.1-imagick/template
+++ b/srcpkgs/php8.1-imagick/template
@@ -15,6 +15,10 @@ homepage="https://pecl.php.net/package/imagick"
distfiles="https://pecl.php.net/get/imagick-$version.tgz"
checksum=5a364354109029d224bcbb2e82e15b248be9b641227f45e63425c06531792d3e
+post_extract() {
+ mv imagick-$version/* .
+}
+
pre_configure() {
phpize8.1
}
From 190f0f7207b6566fd78cec973c023cbc6951573c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 8 Nov 2022 23:14:03 +0700
Subject: [PATCH 10/11] $pkg: move files up 1 level
since php put a package.xml in top-level
---
srcpkgs/xdebug8.0/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/xdebug8.0/template b/srcpkgs/xdebug8.0/template
index 093cf41020ab..e97ac1a41404 100644
--- a/srcpkgs/xdebug8.0/template
+++ b/srcpkgs/xdebug8.0/template
@@ -4,7 +4,7 @@ version=3.1.5
revision=1
build_style=gnu-configure
configure_args="--with-php-config=/usr/bin/php-config8.0"
-hostmakedepends="autoconf"
+hostmakedepends="autoconf php8.0-devel"
makedepends="php8.0-devel"
short_desc="PHP debugging extension"
maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
@@ -14,9 +14,9 @@ changelog="https://xdebug.org/updates"
distfiles="http://xdebug.org/files/xdebug-${version}.tgz"
checksum=55f6ef381245da079b2fc5ce1cfbcb7961197d0c0e04f9d977613cf9aa969a79
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" php8.0-devel"
-fi
+post_extract() {
+ mv xdebug-$version/* .
+}
pre_configure() {
phpize8.0
From 727ca0b2c3e0d60ee77bc48a20637627e878164c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 8 Nov 2022 23:14:03 +0700
Subject: [PATCH 11/11] $pkg: move files up 1 level
since php put a package.xml in top-level
---
srcpkgs/xdebug8.1/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/xdebug8.1/template b/srcpkgs/xdebug8.1/template
index 8ab28dd47e11..626a59f7210c 100644
--- a/srcpkgs/xdebug8.1/template
+++ b/srcpkgs/xdebug8.1/template
@@ -4,7 +4,7 @@ version=3.1.5
revision=1
build_style=gnu-configure
configure_args="--with-php-config=/usr/bin/php-config8.1"
-hostmakedepends="autoconf"
+hostmakedepends="autoconf php8.1-devel"
makedepends="php8.1-devel"
short_desc="PHP debugging extension"
maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
@@ -14,9 +14,9 @@ changelog="https://xdebug.org/updates"
distfiles="http://xdebug.org/files/xdebug-${version}.tgz"
checksum=55f6ef381245da079b2fc5ce1cfbcb7961197d0c0e04f9d977613cf9aa969a79
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" php8.1-devel"
-fi
+post_extract() {
+ mv xdebug-$version/* .
+}
pre_configure() {
phpize8.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Updated] php: brokeness with the new extraction because they have a package.xml on top level
2022-11-08 16:16 [PR PATCH] php: brokeness with the new extraction because they have a package.xml on top level sgn
@ 2022-11-08 16:17 ` sgn
2022-11-08 16:24 ` [PR PATCH] [Merged]: " sgn
1 sibling, 0 replies; 3+ messages in thread
From: sgn @ 2022-11-08 16:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1311 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages php-php
https://github.com/void-linux/void-packages/pull/40383
php: brokeness with the new extraction because they have a package.xml on top level
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### 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/40383.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-php-php-40383.patch --]
[-- Type: text/x-diff, Size: 10284 bytes --]
From 875026d3937f805d6c0d4c4b32f7e264d2bbee45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 8 Nov 2022 23:17:05 +0700
Subject: [PATCH 01/11] php-ast: move files up 1 level
since php put a package.xml in top-level
---
srcpkgs/php-ast/template | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/srcpkgs/php-ast/template b/srcpkgs/php-ast/template
index 11c50fe190b0..615361fe50fe 100644
--- a/srcpkgs/php-ast/template
+++ b/srcpkgs/php-ast/template
@@ -16,6 +16,10 @@ distfiles="https://pecl.php.net/get/ast-${version}.tgz"
checksum=ee3d4f67e24d82e4d340806a24052012e4954d223122949377665427443e6d13
make_check_pre="env NO_INTERACTION=1"
+post_extract() {
+ mv ast-$version/* .
+}
+
pre_configure() {
phpize
}
From eb590f23f9918adf852c7677df0c97b9d92bc8e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 8 Nov 2022 23:17:06 +0700
Subject: [PATCH 02/11] php-imagick: move files up 1 level
since php put a package.xml in top-level
---
srcpkgs/php-imagick/template | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/srcpkgs/php-imagick/template b/srcpkgs/php-imagick/template
index bfd5393ea055..1f3248f28884 100644
--- a/srcpkgs/php-imagick/template
+++ b/srcpkgs/php-imagick/template
@@ -14,6 +14,10 @@ homepage="https://pecl.php.net/package/imagick"
distfiles="https://pecl.php.net/get/imagick-$version.tgz"
checksum=8dd5aa16465c218651fc8993e1faecd982e6a597870fd4b937e9ece02d567077
+post_extract() {
+ mv imagick-$version/* .
+}
+
pre_configure() {
phpize
}
From bc0339d19c2b6fa975e348ab60e90c3147fa5adb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 8 Nov 2022 23:17:06 +0700
Subject: [PATCH 03/11] php8.0-apcu: move files up 1 level
since php put a package.xml in top-level
---
srcpkgs/php8.0-apcu/template | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/srcpkgs/php8.0-apcu/template b/srcpkgs/php8.0-apcu/template
index deadc7678aa2..d022a08f3a30 100644
--- a/srcpkgs/php8.0-apcu/template
+++ b/srcpkgs/php8.0-apcu/template
@@ -15,6 +15,10 @@ homepage="https://pecl.php.net/package/APCu"
distfiles="https://pecl.php.net/get/apcu-${version}.tgz"
checksum=1033530448696ee7cadec85050f6df5135fb1330072ef2a74569392acfecfbc1
+post_extract() {
+ mv apcu-$version/* .
+}
+
pre_configure() {
phpize8.0
}
From 355d95b8dc07c4f5c91f71b360cfa248bda57109 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 8 Nov 2022 23:17:06 +0700
Subject: [PATCH 04/11] php8.0-ast: move files up 1 level
since php put a package.xml in top-level
---
srcpkgs/php8.0-ast/template | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/srcpkgs/php8.0-ast/template b/srcpkgs/php8.0-ast/template
index 1b1c437c2e85..1464394b9385 100644
--- a/srcpkgs/php8.0-ast/template
+++ b/srcpkgs/php8.0-ast/template
@@ -17,6 +17,10 @@ distfiles="https://pecl.php.net/get/ast-${version}.tgz"
checksum=ee3d4f67e24d82e4d340806a24052012e4954d223122949377665427443e6d13
make_check_pre="env NO_INTERACTION=1"
+post_extract() {
+ mv ast-$version/* .
+}
+
pre_configure() {
phpize8.0
}
From 2b2a7b4595a4dcf7604e54e3f32e485e2e0bac22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 8 Nov 2022 23:17:06 +0700
Subject: [PATCH 05/11] php8.0-imagick: move files up 1 level
since php put a package.xml in top-level
---
srcpkgs/php8.0-imagick/template | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/srcpkgs/php8.0-imagick/template b/srcpkgs/php8.0-imagick/template
index f916c8c8ce4d..b4c566f1c0ad 100644
--- a/srcpkgs/php8.0-imagick/template
+++ b/srcpkgs/php8.0-imagick/template
@@ -15,6 +15,10 @@ homepage="https://pecl.php.net/package/imagick"
distfiles="https://pecl.php.net/get/imagick-$version.tgz"
checksum=5a364354109029d224bcbb2e82e15b248be9b641227f45e63425c06531792d3e
+post_extract() {
+ mv imagick-$version/* .
+}
+
pre_configure() {
phpize8.0
}
From e73375572cdd15ee60bb9d22d794e15f8a6af553 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 8 Nov 2022 23:17:06 +0700
Subject: [PATCH 06/11] php8.1-apcu: move files up 1 level
since php put a package.xml in top-level
---
srcpkgs/php8.1-apcu/template | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/srcpkgs/php8.1-apcu/template b/srcpkgs/php8.1-apcu/template
index 2bda855ba84b..22eadd38e042 100644
--- a/srcpkgs/php8.1-apcu/template
+++ b/srcpkgs/php8.1-apcu/template
@@ -15,6 +15,10 @@ homepage="https://pecl.php.net/package/APCu"
distfiles="https://pecl.php.net/get/apcu-${version}.tgz"
checksum=1033530448696ee7cadec85050f6df5135fb1330072ef2a74569392acfecfbc1
+post_extract() {
+ mv apcu-$version/* .
+}
+
pre_configure() {
phpize8.1
}
From 91d37d644ac2603af228af43b7f245dd056de2d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 8 Nov 2022 23:17:06 +0700
Subject: [PATCH 07/11] php8.1-ast: move files up 1 level
since php put a package.xml in top-level
---
srcpkgs/php8.1-ast/template | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/srcpkgs/php8.1-ast/template b/srcpkgs/php8.1-ast/template
index ce81061c6c1f..d7620467e2ee 100644
--- a/srcpkgs/php8.1-ast/template
+++ b/srcpkgs/php8.1-ast/template
@@ -17,6 +17,10 @@ distfiles="https://pecl.php.net/get/ast-${version}.tgz"
checksum=ee3d4f67e24d82e4d340806a24052012e4954d223122949377665427443e6d13
make_check_pre="env NO_INTERACTION=1"
+post_extract() {
+ mv ast-$version/* .
+}
+
pre_configure() {
phpize8.1
}
From 375f0d86bb0bd90b924deeed683f5edff6eea32d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 8 Nov 2022 23:17:06 +0700
Subject: [PATCH 08/11] php8.1-imagick: move files up 1 level
since php put a package.xml in top-level
---
srcpkgs/php8.1-imagick/template | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/srcpkgs/php8.1-imagick/template b/srcpkgs/php8.1-imagick/template
index 45c7bc8066b1..c0f8456855ca 100644
--- a/srcpkgs/php8.1-imagick/template
+++ b/srcpkgs/php8.1-imagick/template
@@ -15,6 +15,10 @@ homepage="https://pecl.php.net/package/imagick"
distfiles="https://pecl.php.net/get/imagick-$version.tgz"
checksum=5a364354109029d224bcbb2e82e15b248be9b641227f45e63425c06531792d3e
+post_extract() {
+ mv imagick-$version/* .
+}
+
pre_configure() {
phpize8.1
}
From 33387380099bb7441ad8059740cc060aff82340e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 8 Nov 2022 23:17:06 +0700
Subject: [PATCH 09/11] xdebug: move files up 1 level
since php put a package.xml in top-level
---
srcpkgs/xdebug/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/xdebug/template b/srcpkgs/xdebug/template
index c9b33a8fb79b..cab8e455139f 100644
--- a/srcpkgs/xdebug/template
+++ b/srcpkgs/xdebug/template
@@ -3,7 +3,7 @@ pkgname=xdebug
version=2.9.3
revision=1
build_style=gnu-configure
-hostmakedepends="autoconf"
+hostmakedepends="autoconf php-devel"
makedepends="php-devel"
short_desc="PHP debugging extension"
maintainer="Alexander Mamay <alexander@mamay.su>"
@@ -12,9 +12,9 @@ homepage="http://xdebug.org"
distfiles="http://xdebug.org/files/${pkgname}-${version,,}.tgz"
checksum=a63f567f2238d75a2244c2a4bd6f5abee817280b3567f9006c99481488dc977c
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" php-devel"
-fi
+post_extract() {
+ mv xdebug-$version/* .
+}
pre_configure() {
phpize
From c95e322fbbb1610720f0dccd0096bdd94383da17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 8 Nov 2022 23:17:07 +0700
Subject: [PATCH 10/11] xdebug8.0: move files up 1 level
since php put a package.xml in top-level
---
srcpkgs/xdebug8.0/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/xdebug8.0/template b/srcpkgs/xdebug8.0/template
index 093cf41020ab..e97ac1a41404 100644
--- a/srcpkgs/xdebug8.0/template
+++ b/srcpkgs/xdebug8.0/template
@@ -4,7 +4,7 @@ version=3.1.5
revision=1
build_style=gnu-configure
configure_args="--with-php-config=/usr/bin/php-config8.0"
-hostmakedepends="autoconf"
+hostmakedepends="autoconf php8.0-devel"
makedepends="php8.0-devel"
short_desc="PHP debugging extension"
maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
@@ -14,9 +14,9 @@ changelog="https://xdebug.org/updates"
distfiles="http://xdebug.org/files/xdebug-${version}.tgz"
checksum=55f6ef381245da079b2fc5ce1cfbcb7961197d0c0e04f9d977613cf9aa969a79
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" php8.0-devel"
-fi
+post_extract() {
+ mv xdebug-$version/* .
+}
pre_configure() {
phpize8.0
From 94def652bc9cec9366cda87b4fc44729d007e93c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 8 Nov 2022 23:17:07 +0700
Subject: [PATCH 11/11] xdebug8.1: move files up 1 level
since php put a package.xml in top-level
---
srcpkgs/xdebug8.1/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/xdebug8.1/template b/srcpkgs/xdebug8.1/template
index 8ab28dd47e11..626a59f7210c 100644
--- a/srcpkgs/xdebug8.1/template
+++ b/srcpkgs/xdebug8.1/template
@@ -4,7 +4,7 @@ version=3.1.5
revision=1
build_style=gnu-configure
configure_args="--with-php-config=/usr/bin/php-config8.1"
-hostmakedepends="autoconf"
+hostmakedepends="autoconf php8.1-devel"
makedepends="php8.1-devel"
short_desc="PHP debugging extension"
maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
@@ -14,9 +14,9 @@ changelog="https://xdebug.org/updates"
distfiles="http://xdebug.org/files/xdebug-${version}.tgz"
checksum=55f6ef381245da079b2fc5ce1cfbcb7961197d0c0e04f9d977613cf9aa969a79
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" php8.1-devel"
-fi
+post_extract() {
+ mv xdebug-$version/* .
+}
pre_configure() {
phpize8.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Merged]: php: brokeness with the new extraction because they have a package.xml on top level
2022-11-08 16:16 [PR PATCH] php: brokeness with the new extraction because they have a package.xml on top level sgn
2022-11-08 16:17 ` [PR PATCH] [Updated] " sgn
@ 2022-11-08 16:24 ` sgn
1 sibling, 0 replies; 3+ messages in thread
From: sgn @ 2022-11-08 16:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1163 bytes --]
There's a merged pull request on the void-packages repository
php: brokeness with the new extraction because they have a package.xml on top level
https://github.com/void-linux/void-packages/pull/40383
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### 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
-->
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-11-08 16:24 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-08 16:16 [PR PATCH] php: brokeness with the new extraction because they have a package.xml on top level sgn
2022-11-08 16:17 ` [PR PATCH] [Updated] " sgn
2022-11-08 16:24 ` [PR PATCH] [Merged]: " sgn
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).