Module Name: pkgsrc
Committed By: jperkin
Date: Tue Jun 11 13:14:01 UTC 2024
Modified Files:
pkgsrc/lang/php81: Makefile
pkgsrc/lang/php82: Makefile
pkgsrc/lang/php83: Makefile
Log Message:
php8*: Run autoconf under CONFIGURE_ENV.
Without this, depending on the user's LANG, the configure stage can break due
to the --disable-pdo option being parsed after the checks for individual PDO
modules, which then fail. Something in the maze of m4 includes is dependent on
the locale for correct ordering when generating configure.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/lang/php81/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/lang/php82/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/php83/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/lang/php81/Makefile
diff -u pkgsrc/lang/php81/Makefile:1.23 pkgsrc/lang/php81/Makefile:1.24
--- pkgsrc/lang/php81/Makefile:1.23 Fri Jun 7 23:11:40 2024
+++ pkgsrc/lang/php81/Makefile Tue Jun 11 13:14:01 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2024/06/07 23:11:40 taca Exp $
+# $NetBSD: Makefile,v 1.24 2024/06/11 13:14:01 jperkin Exp $
#
# We can't omit PKGNAME here to handle PKG_OPTIONS.
@@ -56,7 +56,7 @@ CFLAGS+= -DSQLITE_ENABLE_LOCKING_STYLE=0
.endif
pre-configure:
- cd ${WRKSRC} && autoconf -f
+ cd ${WRKSRC} && ${PKGSRC_SETENV} ${CONFIGURE_ENV} autoconf -f
post-install:
cd ${WRKSRC}; ${INSTALL_DATA} php.ini-development php.ini-production \
Index: pkgsrc/lang/php82/Makefile
diff -u pkgsrc/lang/php82/Makefile:1.10 pkgsrc/lang/php82/Makefile:1.11
--- pkgsrc/lang/php82/Makefile:1.10 Fri Jun 7 23:11:41 2024
+++ pkgsrc/lang/php82/Makefile Tue Jun 11 13:14:01 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2024/06/07 23:11:41 taca Exp $
+# $NetBSD: Makefile,v 1.11 2024/06/11 13:14:01 jperkin Exp $
#
# We can't omit PKGNAME here to handle PKG_OPTIONS.
@@ -56,7 +56,7 @@ CFLAGS+= -DSQLITE_ENABLE_LOCKING_STYLE=0
.endif
pre-configure:
- cd ${WRKSRC} && autoconf -f
+ cd ${WRKSRC} && ${PKGSRC_SETENV} ${CONFIGURE_ENV} autoconf -f
post-install:
cd ${WRKSRC}; ${INSTALL_DATA} php.ini-development php.ini-production \
Index: pkgsrc/lang/php83/Makefile
diff -u pkgsrc/lang/php83/Makefile:1.4 pkgsrc/lang/php83/Makefile:1.5
--- pkgsrc/lang/php83/Makefile:1.4 Fri Jun 7 23:11:41 2024
+++ pkgsrc/lang/php83/Makefile Tue Jun 11 13:14:01 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2024/06/07 23:11:41 taca Exp $
+# $NetBSD: Makefile,v 1.5 2024/06/11 13:14:01 jperkin Exp $
#
# We can't omit PKGNAME here to handle PKG_OPTIONS.
@@ -56,7 +56,7 @@ CFLAGS+= -DSQLITE_ENABLE_LOCKING_STYLE=0
.endif
pre-configure:
- cd ${WRKSRC} && autoconf -f
+ cd ${WRKSRC} && ${PKGSRC_SETENV} ${CONFIGURE_ENV} autoconf -f
post-install:
cd ${WRKSRC}; ${INSTALL_DATA} php.ini-development php.ini-production \