cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

php: don't pick up php if present at build time, should fix a failure

Browse Source 
reported by naddy. factor some common parts while there.
This commit is contained in:
sthen 2021-12-20 10:44:01 +00:00
parent fba26301a1
commit 16f2ea8e4f
4 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lang/php/7.4/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.41 2021/12/18 22:27:45 sthen Exp $
# $OpenBSD: Makefile,v 1.42 2021/12/20 10:44:01 sthen Exp $
PORTROACH= limit:^7\.4
PHP_VERSION= 7.4.27
@ -10,11 +10,7 @@ REVISION= 0
DEBUG_PACKAGES= ${BUILD_PACKAGES}
BUILD_DEPENDS+= devel/bison
YACC= bison
CONFIGURE_ARGS+= --without-valgrind \
--enable-inline-optimization
CONFIGURE_ARGS+= --enable-inline-optimization
PHP_EXTENSIONS+= -xmlrpc

7
lang/php/8.0/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.18 2021/12/18 22:28:16 sthen Exp $
# $OpenBSD: Makefile,v 1.19 2021/12/20 10:44:01 sthen Exp $
PORTROACH= limit:^8\.0
PHP_VERSION= 8.0.14
@ -6,9 +6,4 @@ PHP_PKGSPEC= >=8.0,<8.1
DEBUG_PACKAGES= ${BUILD_PACKAGES}
BUILD_DEPENDS+= devel/bison
YACC= bison
CONFIGURE_ARGS+= --without-valgrind
.include <bsd.port.mk>

7
lang/php/8.1/Makefile
View File

@ -1,13 +1,10 @@
# $OpenBSD: Makefile,v 1.1 2021/12/18 22:28:55 sthen Exp $
# $OpenBSD: Makefile,v 1.2 2021/12/20 10:44:01 sthen Exp $
PHP_VERSION= 8.1.1
PHP_PKGSPEC= >=8.1,<8.2
DEBUG_PACKAGES= ${BUILD_PACKAGES}
BUILD_DEPENDS+= devel/bison
YACC= bison
CONFIGURE_ARGS+= --without-valgrind
AUTOCONF_VERSION= 2.71
.include <bsd.port.mk>

9
lang/php/Makefile.inc
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.169 2021/11/21 00:41:13 sthen Exp $
# $OpenBSD: Makefile.inc,v 1.170 2021/12/20 10:44:01 sthen Exp $
BROKEN-hppa= no __sync_bool_compare_and_swap support nor asm fallback
@ -47,6 +47,7 @@ CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include -pthread" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -pthread" \
EXTENSION_DIR=${MODULES_DIR} \
COMPILER_LIBCXX="${LIBCXX}" \
PHP=false \
lt_cv_path_SED=/usr/bin/sed
# configure detects us as having decimal fp support but it's not built in
@ -69,7 +70,8 @@ CONFIGURE_ARGS+= --disable-rpath \
--with-pcre-jit=no \
--with-pear=${LOCALBASE}/share/php-${PV} \
--with-pic \
--with-readline
--with-readline \
--without-valgrind
# override mysqlnd default of /tmp/mysql.sock (if using libmysql this
# is fetched from mysql_config instead)
@ -479,6 +481,9 @@ RUN_DEPENDS-${i}+= php-${PHP_VERSION}:lang/php/${PV}
DESCR-main= ${.CURDIR}/../files/DESCR-main
BUILD_DEPENDS+= devel/bison
YACC= bison
# shouldn't normally be needed, but sometimes file timestamps in the .tar.gz
# have the generated file older than the source file for re2c, resulting in a
# build failure if re2c was installed during autoconf but later junked.