From owner-svn-ports-all@FreeBSD.ORG Thu Jul 19 18:05:13 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5F9DB106564A; Thu, 19 Jul 2012 18:05:13 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2F8398FC12; Thu, 19 Jul 2012 18:05:13 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6JI5DCM006697; Thu, 19 Jul 2012 18:05:13 GMT (envelope-from mm@svn.freebsd.org) Received: (from mm@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6JI5C82006694; Thu, 19 Jul 2012 18:05:12 GMT (envelope-from mm@svn.freebsd.org) Message-Id: <201207191805.q6JI5C82006694@svn.freebsd.org> From: Martin Matuska Date: Thu, 19 Jul 2012 18:05:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r301181 - in head/lang/hiphop-php: . files X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Jul 2012 18:05:13 -0000 Author: mm Date: Thu Jul 19 18:05:12 2012 New Revision: 301181 URL: http://svn.freebsd.org/changeset/ports/301181 Log: Fix build if binutils are linked to gettext [1] Depend on libexecinfo PR: ports/169996 Reported by: Volodymyr Kostyrko Added: head/lang/hiphop-php/files/extra-patch-gettext (contents, props changed) Modified: head/lang/hiphop-php/Makefile Modified: head/lang/hiphop-php/Makefile ============================================================================== --- head/lang/hiphop-php/Makefile Thu Jul 19 17:43:22 2012 (r301180) +++ head/lang/hiphop-php/Makefile Thu Jul 19 18:05:12 2012 (r301181) @@ -7,7 +7,7 @@ PORTNAME= hiphop-php PORTVERSION= 0.0.20120716 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang devel www MASTER_SITES= https://github.com/facebook/hiphop-php/tarball/${GITVERSION}/:main \ http://unicode.org/Public/UNIDATA/:unidata \ @@ -38,6 +38,7 @@ LICENSE_DISTFILES_ZEND200= ${PORTNAME}-$ LIB_DEPENDS= icudata.48:${PORTSDIR}/devel/icu \ boost_thread:${PORTSDIR}/devel/boost-libs \ + execinfo:${PORTSDIR}/devel/libexecinfo \ tbb.4:${PORTSDIR}/devel/tbb \ gd.4:${PORTSDIR}/graphics/gd \ mcrypt.8:${PORTSDIR}/security/libmcrypt \ @@ -47,6 +48,10 @@ LIB_DEPENDS= icudata.48:${PORTSDIR}/deve memcached.10:${PORTSDIR}/databases/libmemcached \ c-client4.9:${PORTSDIR}/mail/cclient +OPTIONS_DEFINE= NLS +OPTIONS_DEFAULT= NLS +NLS_DESC= Depend on gettext (required if binutils have NLS) + _EXTDIR= share/hiphop-php/ext BUILD_DEPENDS+= bison:${PORTSDIR}/devel/bison \ @@ -67,6 +72,7 @@ USE_MYSQL= yes USE_GNOME= libxml2 USE_OPENSSL= yes USE_OPENLDAP= yes +USE_GETTEXT= yes USE_GCC= 4.4+ GITVERSION= 96532ec @@ -105,6 +111,12 @@ SUB_LIST+= CC="${CC}" \ SUB_FILES+= hphp +.include + +.if ${PORT_OPTIONS:MNLS} +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gettext +.endif + .include _CFLAGS= -rpath=${LOCALBASE}/lib/${_GCC_BUILD_DEPENDS} \ Added: head/lang/hiphop-php/files/extra-patch-gettext ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/hiphop-php/files/extra-patch-gettext Thu Jul 19 18:05:12 2012 (r301181) @@ -0,0 +1,25 @@ +--- CMake/HPHPFindLibs.cmake.orig 2012-07-15 01:13:18.000000000 +0200 ++++ CMake/HPHPFindLibs.cmake 2012-07-19 16:20:37.949508810 +0200 +@@ -304,6 +284,14 @@ + + if (FREEBSD) + FIND_LIBRARY (EXECINFO_LIB execinfo) ++ FIND_LIBRARY (GETTEXT_LIB intl) ++ ++ if (NOT EXECINFO_LIB) ++ message(FATAL_ERROR "You need to install libexecinfo") ++ endif() ++ if (NOT GETTEXT_LIB) ++ message(FATAL_ERROR "You need to install gettext (libintl)") ++ endif() + endif() + + #find_package(BISON REQUIRED) +@@ -349,6 +337,7 @@ + + if (FREEBSD) + target_link_libraries(${target} ${EXECINFO_LIB}) ++ target_link_libraries(${target} ${GETTEXT_LIB}) + endif() + + target_link_libraries(${target} ${BFD_LIB})