diff mbox series

[2/4] php: cleanup autoconf fettling

Message ID 20250124143401.1635224-2-ross.burton@arm.com
State New
Headers show
Series [1/4] ncftp: update for autoconf changes in core | expand

Commit Message

Ross Burton Jan. 24, 2025, 2:33 p.m. UTC
This autoconf manipulation is very old and appears to be obsolete now.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta-oe/recipes-devtools/php/php_8.2.26.bb | 8 --------
 1 file changed, 8 deletions(-)

Comments

Khem Raj Jan. 25, 2025, 5:32 p.m. UTC | #1
this fails to buld php-native

https://autobuilder.yoctoproject.org/valkyrie/api/v2/logs/1287806/raw

On Fri, Jan 24, 2025 at 6:34 AM Ross Burton via lists.openembedded.org
<ross.burton=arm.com@lists.openembedded.org> wrote:
>
> This autoconf manipulation is very old and appears to be obsolete now.
>
> Signed-off-by: Ross Burton <ross.burton@arm.com>
> ---
>  meta-oe/recipes-devtools/php/php_8.2.26.bb | 8 --------
>  1 file changed, 8 deletions(-)
>
> diff --git a/meta-oe/recipes-devtools/php/php_8.2.26.bb b/meta-oe/recipes-devtools/php/php_8.2.26.bb
> index f5e57ab36a..f2363c8e54 100644
> --- a/meta-oe/recipes-devtools/php/php_8.2.26.bb
> +++ b/meta-oe/recipes-devtools/php/php_8.2.26.bb
> @@ -136,10 +136,7 @@ LDFLAGS:append:riscv64 = " -latomic"
>
>  EXTRA_OEMAKE = "INSTALL_ROOT=${D}"
>
> -acpaths = ""
> -
>  do_configure:prepend () {
> -    rm -f ${S}/build/libtool.m4 ${S}/ltmain.sh ${S}/aclocal.m4
>      find ${S} -name config.m4 | xargs -n1 sed -i 's!APXS_HTTPD=.*!APXS_HTTPD=${STAGING_SBINDIR_NATIVE}/httpd!'
>  }
>
> @@ -162,11 +159,6 @@ do_install:append:class-native() {
>      rm -rf ${D}/${PHP_LIBDIR}/php/.[a-z]*
>  }
>
> -do_install:prepend() {
> -    cat ${ACLOCALDIR}/libtool.m4 ${ACLOCALDIR}/lt~obsolete.m4 ${ACLOCALDIR}/ltoptions.m4 \
> -        ${ACLOCALDIR}/ltsugar.m4 ${ACLOCALDIR}/ltversion.m4 > ${S}/build/libtool.m4
> -}
> -
>  do_install:prepend:class-target() {
>      if ${@bb.utils.contains('PACKAGECONFIG', 'apache2', 'true', 'false', d)}; then
>          # Install dummy config file so apxs doesn't fail
> --
> 2.43.0
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#115063): https://lists.openembedded.org/g/openembedded-devel/message/115063
> Mute This Topic: https://lists.openembedded.org/mt/110790897/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
diff mbox series

Patch

diff --git a/meta-oe/recipes-devtools/php/php_8.2.26.bb b/meta-oe/recipes-devtools/php/php_8.2.26.bb
index f5e57ab36a..f2363c8e54 100644
--- a/meta-oe/recipes-devtools/php/php_8.2.26.bb
+++ b/meta-oe/recipes-devtools/php/php_8.2.26.bb
@@ -136,10 +136,7 @@  LDFLAGS:append:riscv64 = " -latomic"
 
 EXTRA_OEMAKE = "INSTALL_ROOT=${D}"
 
-acpaths = ""
-
 do_configure:prepend () {
-    rm -f ${S}/build/libtool.m4 ${S}/ltmain.sh ${S}/aclocal.m4
     find ${S} -name config.m4 | xargs -n1 sed -i 's!APXS_HTTPD=.*!APXS_HTTPD=${STAGING_SBINDIR_NATIVE}/httpd!'
 }
 
@@ -162,11 +159,6 @@  do_install:append:class-native() {
     rm -rf ${D}/${PHP_LIBDIR}/php/.[a-z]*
 }
 
-do_install:prepend() {
-    cat ${ACLOCALDIR}/libtool.m4 ${ACLOCALDIR}/lt~obsolete.m4 ${ACLOCALDIR}/ltoptions.m4 \
-        ${ACLOCALDIR}/ltsugar.m4 ${ACLOCALDIR}/ltversion.m4 > ${S}/build/libtool.m4
-}
-
 do_install:prepend:class-target() {
     if ${@bb.utils.contains('PACKAGECONFIG', 'apache2', 'true', 'false', d)}; then
         # Install dummy config file so apxs doesn't fail