Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 31 Dec 2014 00:35:23 +0000 (UTC)
From:      Sean Bruno <sbruno@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r375867 - in head/lang/php53: . files
Message-ID:  <201412310035.sBV0ZNQ3064816@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sbruno
Date: Wed Dec 31 00:35:22 2014
New Revision: 375867
URL: https://svnweb.freebsd.org/changeset/ports/375867
QAT: https://qat.redports.org/buildarchive/r375867/

Log:
  Fix build for armv6 with an upstream commit:
  http://git.php.net/?p=php-src.git;a=commitdiff;h=050aae2860e1c202e2e9db715beaa97d0a4c9c33;hp=e67a2b9e471a7bc0b774b9056bb38745b7187969#patch1
  
  PR:		196067
  Submitted by:	mikael.urankar@gmail.com
  Reviewed by:	flo@
  Approved by:	mentor (implicit)

Added:
  head/lang/php53/files/patch-Zend_zend__ini.h   (contents, props changed)
Modified:
  head/lang/php53/Makefile

Modified: head/lang/php53/Makefile
==============================================================================
--- head/lang/php53/Makefile	Wed Dec 31 00:31:55 2014	(r375866)
+++ head/lang/php53/Makefile	Wed Dec 31 00:35:22 2014	(r375867)
@@ -3,7 +3,7 @@
 
 PORTNAME=	php53
 PORTVERSION=	5.3.29
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES?=	lang devel www
 MASTER_SITES=	${MASTER_SITE_PHP}
 MASTER_SITE_SUBDIR=	distributions

Added: head/lang/php53/files/patch-Zend_zend__ini.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/php53/files/patch-Zend_zend__ini.h	Wed Dec 31 00:35:22 2014	(r375867)
@@ -0,0 +1,11 @@
+--- Zend/zend_ini.h.orig	2014-12-17 16:24:10 UTC
++++ Zend/zend_ini.h
+@@ -28,7 +28,7 @@
+ #define ZEND_INI_ALL (ZEND_INI_USER|ZEND_INI_PERDIR|ZEND_INI_SYSTEM)
+ 
+ #ifndef XtOffsetOf
+-# if defined(CRAY) || (defined(__arm) && !defined(LINUX))
++# if defined(CRAY) || (defined(__ARMCC_VERSION) && !defined(LINUX))
+ # ifdef __STDC__
+ # define XtOffset(p_type, field) _Offsetof(p_type, field)
+ # else



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412310035.sBV0ZNQ3064816>