kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

php71: Don't automatically add libgcc on SunOS.

Browse source
This commit is contained in:
jperkin 2018-01-16 11:04:54 +00:00
parent 7143b825c9
commit 9c1e4416db
3 changed files with 28 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lang/php71/distinfo
View file

@ -1,11 +1,11 @@
$NetBSD: distinfo,v 1.31 2018/01/05 03:11:13 taca Exp $
$NetBSD: distinfo,v 1.32 2018/01/16 11:04:54 jperkin Exp $
SHA1 (php-7.1.13.tar.bz2) = 117306b9e66db0e651c3f7a77c60c3b9cfe3b111
RMD160 (php-7.1.13.tar.bz2) = a8851a06c7e86bd4ad3f2c39de7337b271c429fe
SHA512 (php-7.1.13.tar.bz2) = dbab037b5e7c60877f46a201e1712000ba14ae2a984d4f4d4e752c6e1b2797b0f67fbb0b10c69fea77e27cc64c27222459a26772c9a51e8c760ceab1433dc60a
Size (php-7.1.13.tar.bz2) = 14960544 bytes
SHA1 (patch-acinclude.m4) = b682280fd89950c082c2226bdb7364b0dc475bad
SHA1 (patch-configure) = a129e19ef87338f6e53ccc967c40ddcde7c7357c
SHA1 (patch-configure) = 862707ff3fd8b8d7312104bb44a48fe8379951bd
SHA1 (patch-ext_gd_config.m4) = 93b62daad93b9ee6dc28e06016f739bc26b0dc9f
SHA1 (patch-ext_imap_config.m4) = f4e10ab81697b72019313f63bc630627a08efd92
SHA1 (patch-ext_intl_config.m4) = 1ea3d3e6f05d5fed0bd4ca4518440199aec0954d
@ -17,7 +17,7 @@ SHA1 (patch-ext_phar_phar_phar.php) = f630e3946b21b76d4fe857a43e00e25c9445f2c8
SHA1 (patch-ext_recode_recode.c) = a97a1815d6a41410f68c289debbb9396128a2159
SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = 8a529a1b3f7c97731f2e719d006f67c3a7259bb5
SHA1 (patch-ext_standard_basic__functions.c) = f97a2748c7b15fbd9a2d3c21e56079088cc05d56
SHA1 (patch-ext_standard_uniqid.c) = 154ed6e6d4796a52c6664b52994d6cad4ed22f30
SHA1 (patch-ext_standard_uniqid.c) = a13b951cef823172bc61a1d1f964fc8725188a2c
SHA1 (patch-ext_xsl_php__xsl.h) = a9877bff7bacc77926a4541a0ac171c00ad1a627
SHA1 (patch-makedist) = 2ac0e0391c031c4fcf4993e2269cde4c6bfddfd5
SHA1 (patch-php.ini-development) = dd65962000ec06439fae3c9bf252fa46be4e33fd

30
lang/php71/patches/patch-configure
View file

@ -1,8 +1,20 @@
$NetBSD: patch-configure,v 1.3 2017/05/03 11:45:25 maya Exp $
$NetBSD: patch-configure,v 1.4 2018/01/16 11:04:54 jperkin Exp $
--- configure.orig 2016-04-28 18:12:26.000000000 +0000
Don't automatically add libgcc on SunOS.
--- configure.orig 2018-01-03 02:32:21.000000000 +0000
+++ configure
@@ -6930,27 +6930,6 @@ EOF
@@ -5436,9 +5436,6 @@ fi
case $host_alias in
*solaris*)
CPPFLAGS="$CPPFLAGS -D_POSIX_PTHREAD_SEMANTICS"
- if test "${enable_libgcc+set}" != "set" && test "$GCC" = "yes"; then
- enable_libgcc=yes
- fi
;;
*dgux*)
CPPFLAGS="$CPPFLAGS -D_BSD_TIMEOFDAY_FLAVOR"
@@ -6909,27 +6906,6 @@ EOF
;;
esac
@ -30,7 +42,7 @@ $NetBSD: patch-configure,v 1.3 2017/05/03 11:45:25 maya Exp $
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -18408,7 +18387,7 @@ fi
@@ -18391,7 +18367,7 @@ fi
if test "$found_openssl" = "no"; then
if test "$PHP_OPENSSL_DIR" = "yes"; then
@ -39,7 +51,7 @@ $NetBSD: patch-configure,v 1.3 2017/05/03 11:45:25 maya Exp $
fi
for i in $PHP_OPENSSL_DIR; do
@@ -20572,7 +20551,7 @@ $as_echo "yes" >&6; }
@@ -20745,7 +20721,7 @@ $as_echo "#define HAVE_SQLITE3_ERRSTR 1"
PHP_SQLITE3_CFLAGS="-I@ext_srcdir@/libsqlite $other_flags $threadsafe_flags $debug_flags"
@ -48,7 +60,7 @@ $NetBSD: patch-configure,v 1.3 2017/05/03 11:45:25 maya Exp $
unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
@@ -31742,7 +31721,7 @@ fi
@@ -31966,7 +31942,7 @@ fi
if test "$found_openssl" = "no"; then
if test "$PHP_OPENSSL_DIR" = "yes"; then
@ -57,7 +69,7 @@ $NetBSD: patch-configure,v 1.3 2017/05/03 11:45:25 maya Exp $
fi
for i in $PHP_OPENSSL_DIR; do
@@ -42631,7 +42610,7 @@ fi
@@ -42858,7 +42834,7 @@ fi
if test "$found_openssl" = "no"; then
if test "$PHP_OPENSSL_DIR" = "yes"; then
@ -66,7 +78,7 @@ $NetBSD: patch-configure,v 1.3 2017/05/03 11:45:25 maya Exp $
fi
for i in $PHP_OPENSSL_DIR; do
@@ -92806,7 +92785,7 @@ fi
@@ -93979,7 +93955,7 @@ fi
if test "$found_openssl" = "no"; then
if test "$PHP_OPENSSL_DIR" = "yes"; then
@ -75,7 +87,7 @@ $NetBSD: patch-configure,v 1.3 2017/05/03 11:45:25 maya Exp $
fi
for i in $PHP_OPENSSL_DIR; do
@@ -96439,12 +96418,7 @@ old_CC=$CC
@@ -97605,12 +97581,7 @@ old_CC=$CC
if test "$PHP_THREAD_SAFETY" = "yes" && test -n "$ac_cv_pthreads_cflags"; then
CXXFLAGS="$CXXFLAGS $ac_cv_pthreads_cflags"
INLINE_CFLAGS="$INLINE_CFLAGS $ac_cv_pthreads_cflags"

10
lang/php71/patches/patch-ext_standard_uniqid.c
View file

@ -1,4 +1,4 @@
$NetBSD: patch-ext_standard_uniqid.c,v 1.2 2017/07/19 02:44:45 manu Exp $
$NetBSD: patch-ext_standard_uniqid.c,v 1.3 2018/01/16 11:04:54 jperkin Exp $
PHP uniqid() relies on microsecond-precise system clock to produce an
unique identifier. In order to avoid using the same value, it first
@ -17,10 +17,9 @@ in increased 10000 fold without changing its behavior.
Submitted upstream as https://bugs.php.net/bug.php?id=74851
--- ext/standard/uniqid.c.orig 2017-06-07 10:09:31.000000000 +0200
+++ ext/standard/uniqid.c 2017-07-08 08:24:24.000000000 +0200
@@ -52,25 +52,31 @@
zend_string *uniqid;
--- ext/standard/uniqid.c.orig 2018-01-03 02:32:25.000000000 +0000
+++ ext/standard/uniqid.c
@@ -53,23 +53,29 @@ PHP_FUNCTION(uniqid)
int sec, usec;
size_t prefix_len = 0;
struct timeval tv;
@ -59,4 +58,3 @@ Submitted upstream as https://bugs.php.net/bug.php?id=74851
sec = (int) tv.tv_sec;
usec = (int) (tv.tv_usec % 0x100000);
/* The max value usec can have is 0xF423F, so we use only five hex