From 6fe1f5b12eae013b27db158fd27190aa8660c365 Mon Sep 17 00:00:00 2001 From: Ørjan Malde Date: Jan 14 2021 00:48:12 +0000 Subject: groups/231.native_packages_etc.group: adds php v8.0.1 Signed-off-by: Lucio Andrés Illanes Albornoz --- diff --git a/groups/231.native_packages_etc.group b/groups/231.native_packages_etc.group index 5833d68..9e11134 100644 --- a/groups/231.native_packages_etc.group +++ b/groups/231.native_packages_etc.group @@ -7,7 +7,7 @@ alsa_lib apr apr_util bdwgc bmake bochs bzip2 cherokee clzip cmake cron dante db dosbox doomgeneric emacs enscript expat ffmpeg file gdbm geoip gettext_tiny ghostpdl giflib gnuchess graphicsmagick gzip hastyhex hexcurse hexer htop icoutils imagemagick infounzip infozip john lbreakout2 lcms2 less libmetalink lolcode ltris minizip mintty mlogin musl_compat musl_fts ncdu -ncurses ncursestw ncursesw npth openjazz openjpeg p7zip pcre pcre2 popt potrace procps_ng qemu +ncurses ncursestw ncursesw npth openjazz openjpeg p7zip pcre pcre2 php popt potrace procps_ng qemu qpdf qrencode rpm rw shared_mime_info slang sqlite3 tcl tdnf texinfo tiff tmux tzdb utf8proc util_linux vim vorbis_tools w32api w32lib xorriso xpdf xz yabasic zstd")"; @@ -298,6 +298,12 @@ zstd")"; : ${PKG_PCRE2_VERSION:=10.36}; : ${PKG_PCRE2_URL:=https://ftp.pcre.org/pub/pcre/pcre2-${PKG_PCRE2_VERSION}.tar.bz2}; : ${PKG_PCRE2_CONFIGURE_ARGS_EXTRA:="--enable-pcre2grep-libz --enable-pcre2grep-libbz2 --enable-pcre2-16 --enable-pcre2-32 --enable-jit"}; +: ${PKG_PHP_DEPENDS:="bzip2 libz libxml2 sqlite3 pcre2"}; +: ${PKG_PHP_SHA256SUM:=208b3330af881b44a6a8c6858d569c72db78dab97810332978cc65206b0ec2dc}; +: ${PKG_PHP_VERSION:=8.0.1}; +: ${PKG_PHP_URL:=https://www.php.net/distributions/php-${PKG_PHP_VERSION}.tar.xz}; +: ${PKG_PHP_CONFIGURE_ARGS_EXTRA:="--with-layout=GNU --with-zlib --with-external-pcre --with-bz2=${PREFIX_NATIVE} --disable-opcache --disable-phar"}; +: ${PKG_PHP_LIBTOOL:=rdlibtool}; : ${PKG_POPT_SHA256SUM:=5159bc03a20b28ce363aa96765f37df99ea4d8850b1ece17d1e6ad5c24fdc5d1}; : ${PKG_POPT_VERSION:=1.18}; : ${PKG_POPT_URL:=https://ftp.osuosl.org/pub/blfs/conglomeration/popt/popt-${PKG_POPT_VERSION}.tar.gz}; diff --git a/patches/php-8.0.1_pre.local.patch b/patches/php-8.0.1_pre.local.patch new file mode 100644 index 0000000..37b041b --- /dev/null +++ b/patches/php-8.0.1_pre.local.patch @@ -0,0 +1,70 @@ +diff -ru php-8.0.1.orig/configure php-8.0.1/configure +--- php-8.0.1.orig/configure 2021-01-05 14:54:54.000000000 +0100 ++++ php-8.0.1/configure 2021-01-13 23:01:56.427279925 +0100 +@@ -52030,8 +52030,11 @@ + $as_echo_n "checking for mmap() using shm_open() shared memory support... " >&6; } + if test "$cross_compiling" = yes; then : + +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } ++$as_echo "#define HAVE_SHM_MMAP_POSIX 1" >>confdefs.h ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: cross-compiling, assuming yes" >&5 ++$as_echo "cross-compiling, assuming yes" >&6; } ++ have_shm_mmap_posix=yes + + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -87098,6 +87101,16 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + ++midipix*) ++ version_type=linux # correct to gnu/linux during the next big refactor ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ ;; ++ + netbsd*) + version_type=sunos + need_lib_prefix=no +diff -ru php-8.0.1.orig/sapi/cgi/Makefile.frag php-8.0.1/sapi/cgi/Makefile.frag +--- php-8.0.1.orig/sapi/cgi/Makefile.frag 2021-01-05 14:54:54.000000000 +0100 ++++ php-8.0.1/sapi/cgi/Makefile.frag 2021-01-14 00:20:44.769574312 +0100 +@@ -6,7 +6,7 @@ + install-cgi: $(SAPI_CGI_PATH) + @echo "Installing PHP CGI binary: $(INSTALL_ROOT)$(bindir)/" + @$(mkinstalldirs) $(INSTALL_ROOT)$(bindir) +- @$(INSTALL) -m 0755 $(SAPI_CGI_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)php-cgi$(program_suffix)$(EXEEXT) ++ @$(LIBTOOL) --mode=install cp $(SAPI_CGI_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)php-cgi$(program_suffix)$(EXEEXT) + @echo "Installing PHP CGI man page: $(INSTALL_ROOT)$(mandir)/man1/" + @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1 + @$(INSTALL_DATA) sapi/cgi/php-cgi.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)php-cgi$(program_suffix).1 +diff -ru php-8.0.1.orig/sapi/cli/Makefile.frag php-8.0.1/sapi/cli/Makefile.frag +--- php-8.0.1.orig/sapi/cli/Makefile.frag 2021-01-05 14:54:54.000000000 +0100 ++++ php-8.0.1/sapi/cli/Makefile.frag 2021-01-14 00:48:00.415700667 +0100 +@@ -6,7 +6,7 @@ + install-cli: $(SAPI_CLI_PATH) + @echo "Installing PHP CLI binary: $(INSTALL_ROOT)$(bindir)/" + @$(mkinstalldirs) $(INSTALL_ROOT)$(bindir) +- @$(INSTALL) -m 0755 $(SAPI_CLI_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT) ++ @$(LIBTOOL) --mode=install cp $(SAPI_CLI_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT) + @echo "Installing PHP CLI man page: $(INSTALL_ROOT)$(mandir)/man1/" + @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1 + @$(INSTALL_DATA) sapi/cli/php.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)php$(program_suffix).1 +diff -ru php-8.0.1.orig/sapi/phpdbg/Makefile.frag php-8.0.1/sapi/phpdbg/Makefile.frag +--- php-8.0.1.orig/sapi/phpdbg/Makefile.frag 2021-01-05 14:54:54.000000000 +0100 ++++ php-8.0.1/sapi/phpdbg/Makefile.frag 2021-01-14 00:35:57.023625462 +0100 +@@ -25,7 +25,7 @@ + @$(mkinstalldirs) $(INSTALL_ROOT)$(bindir) + @$(mkinstalldirs) $(INSTALL_ROOT)$(localstatedir)/log + @$(mkinstalldirs) $(INSTALL_ROOT)$(localstatedir)/run +- @$(INSTALL) -m 0755 $(BUILD_BINARY) $(INSTALL_ROOT)$(bindir)/$(program_prefix)phpdbg$(program_suffix)$(EXEEXT) ++ @$(LIBTOOL) --mode=install cp $(BUILD_BINARY) $(INSTALL_ROOT)$(bindir)/$(program_prefix)phpdbg$(program_suffix)$(EXEEXT) + @echo "Installing phpdbg man page: $(INSTALL_ROOT)$(mandir)/man1/" + @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1 + @$(INSTALL_DATA) sapi/phpdbg/phpdbg.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)phpdbg$(program_suffix).1 diff --git a/vars/php.vars b/vars/php.vars new file mode 100644 index 0000000..7b7ee4b --- /dev/null +++ b/vars/php.vars @@ -0,0 +1,13 @@ +# +# set +o errexit -o noglob -o nounset is assumed. +# + +: ${PKG_PHP_CONFIG_CACHE_EXTRA:=" +ac_cv_c_bigendian_php=no +ac_cv_write_stdout=yes"}; + +pkg_php_configure_pre() { + export INSTALL_ROOT=${PKG_DESTDIR}; +}; + +# vim:filetype=sh textwidth=0