From owner-svn-ports-head@freebsd.org Thu Feb 4 11:16:05 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 25C7BA9B063; Thu, 4 Feb 2016 11:16:05 +0000 (UTC) (envelope-from vsevolod@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 02A7D1BD4; Thu, 4 Feb 2016 11:16:04 +0000 (UTC) (envelope-from vsevolod@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u14BG4hW045213; Thu, 4 Feb 2016 11:16:04 GMT (envelope-from vsevolod@FreeBSD.org) Received: (from vsevolod@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u14BG3qC045208; Thu, 4 Feb 2016 11:16:03 GMT (envelope-from vsevolod@FreeBSD.org) Message-Id: <201602041116.u14BG3qC045208@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vsevolod set sender to vsevolod@FreeBSD.org using -f From: Vsevolod Stakhov Date: Thu, 4 Feb 2016 11:16:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r408025 - in head/devel/hyperscan: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Feb 2016 11:16:05 -0000 Author: vsevolod Date: Thu Feb 4 11:16:03 2016 New Revision: 408025 URL: https://svnweb.freebsd.org/changeset/ports/408025 Log: - Update to 4.1.0 - Add option to build shared libraries - Add option to compile for the native CPU Modified: head/devel/hyperscan/Makefile head/devel/hyperscan/distinfo head/devel/hyperscan/files/patch-CMakeLists.txt head/devel/hyperscan/pkg-plist Modified: head/devel/hyperscan/Makefile ============================================================================== --- head/devel/hyperscan/Makefile Thu Feb 4 11:09:49 2016 (r408024) +++ head/devel/hyperscan/Makefile Thu Feb 4 11:16:03 2016 (r408025) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= hyperscan -PORTVERSION= 4.0.1 +PORTVERSION= 4.1.0 DISTVERSIONPREFIX= v CATEGORIES= devel textproc MASTER_SITES= GH:hs SF/boost/boost/1.59.0:boost @@ -20,10 +20,36 @@ USES= compiler:c++11-lib cmake:outsource ONLY_FOR_ARCHS= amd64 ONLY_FOR_ARCHS_REASON= SSSE3 is required for work +OPTIONS_DEFINE= SHARED NATIVE +SHARED_DESC= Build shared library +NATIVE_DESC= Build with native CPU tunes + +.ifndef DEBUG_FLAGS CMAKE_BUILD_TYPE= MinSizeRel +.else +CMAKE_BUILD_TYPE= Debug +.endif + +CMAKE_ARGS+= -DBOOST_ROOT=${WRKDIR}/boost_1_59_0 + +.include + +.if ${PORT_OPTIONS:MNATIVE} +CXXFLAGS+= -march=native -mtune=native +CFLAGS+= -march=native -mtune=native +.else CXXFLAGS+= -march=core2 CFLAGS+= -march=core2 -CMAKE_ARGS+= -DBOOST_ROOT=${WRKDIR}/boost_1_59_0 +.endif + +.if ${PORT_OPTIONS:MSHARED} +CMAKE_ARGS+= -DBUILD_STATIC_AND_SHARED=ON +PLIST_SUB+= SHARED="" \ + SOVERSION=${PORTVERSION} \ + SOSHORTVERSION=${PORTVERSION:C/\.[0-9]$//} +.else +PLIST_SUB+= SHARED="@comment " +.endif post-stage: ${MV} ${STAGEDIR}/${PREFIX}/lib/pkgconfig/libhs.pc \ Modified: head/devel/hyperscan/distinfo ============================================================================== --- head/devel/hyperscan/distinfo Thu Feb 4 11:09:49 2016 (r408024) +++ head/devel/hyperscan/distinfo Thu Feb 4 11:16:03 2016 (r408025) @@ -1,4 +1,4 @@ -SHA256 (01org-hyperscan-v4.0.1_GH0.tar.gz) = ae6619baa3da78361b09d22c155b1406b17890009d93ed60445381eb03016b76 -SIZE (01org-hyperscan-v4.0.1_GH0.tar.gz) = 1346621 +SHA256 (01org-hyperscan-v4.1.0_GH0.tar.gz) = b8de3f59c2bd1a8765a5aca5dfdd062766cef67218aedf63df2c92766524b3c1 +SIZE (01org-hyperscan-v4.1.0_GH0.tar.gz) = 1347222 SHA256 (boost_1_59_0.tar.gz) = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac SIZE (boost_1_59_0.tar.gz) = 83709983 Modified: head/devel/hyperscan/files/patch-CMakeLists.txt ============================================================================== --- head/devel/hyperscan/files/patch-CMakeLists.txt Thu Feb 4 11:09:49 2016 (r408024) +++ head/devel/hyperscan/files/patch-CMakeLists.txt Thu Feb 4 11:16:03 2016 (r408025) @@ -1,13 +1,13 @@ ---- CMakeLists.txt.orig 2016-02-03 13:53:36 UTC +--- CMakeLists.txt.orig 2016-02-04 09:53:47 UTC +++ CMakeLists.txt -@@ -170,8 +170,8 @@ else() +@@ -171,8 +171,8 @@ else() endif() # set compiler flags - more are tested and added later - set(EXTRA_C_FLAGS "-std=c99 -Wall -Wextra -Wshadow -Wcast-qual -Werror") - set(EXTRA_CXX_FLAGS "-std=c++11 -Wall -Wextra -Werror -Wno-shadow -Wswitch -Wreturn-type -Wcast-qual -Wno-deprecated -Wnon-virtual-dtor") -+ set(EXTRA_C_FLAGS "-std=c99 -Wall -Wextra -Wshadow -Wcast-qual") -+ set(EXTRA_CXX_FLAGS "-std=c++11 -Wall -Wextra -Wno-shadow -Wswitch -Wreturn-type -Wcast-qual -Wno-deprecated -Wnon-virtual-dtor") ++ set(EXTRA_C_FLAGS "-std=c99 -Wall -Wextra -Wshadow -Wcast-qual ") ++ set(EXTRA_CXX_FLAGS "-std=c++11 -Wall -Wextra -Wno-shadow -Wswitch -Wreturn-type -Wcast-qual -Wno-deprecated -Wnon-virtual-dtor") if (NOT CMAKE_C_FLAGS MATCHES .*march.*) message(STATUS "Building for current host CPU") Modified: head/devel/hyperscan/pkg-plist ============================================================================== --- head/devel/hyperscan/pkg-plist Thu Feb 4 11:09:49 2016 (r408024) +++ head/devel/hyperscan/pkg-plist Thu Feb 4 11:16:03 2016 (r408025) @@ -5,3 +5,9 @@ include/hs/hs_runtime.h lib/libhs.a lib/libhs_runtime.a libdata/pkgconfig/libhs.pc +%%SHARED%%lib/libhs.so.%%SOVERSION%% +%%SHARED%%lib/libhs.so.%%SOSHORTVERSION%% +%%SHARED%%lib/libhs.so +%%SHARED%%lib/libhs_runtime.so.%%SOVERSION%% +%%SHARED%%lib/libhs_runtime.so.%%SOSHORTVERSION%% +%%SHARED%%lib/libhs_runtime.so