diff options
| -rw-r--r-- | devel/hyperscan/Makefile | 30 | ||||
| -rw-r--r-- | devel/hyperscan/distinfo | 4 | ||||
| -rw-r--r-- | devel/hyperscan/files/patch-CMakeLists.txt | 8 | ||||
| -rw-r--r-- | devel/hyperscan/pkg-plist | 6 |
4 files changed, 40 insertions, 8 deletions
diff --git a/devel/hyperscan/Makefile b/devel/hyperscan/Makefile index 050e64f0df6e..326ce6fd374d 100644 --- a/devel/hyperscan/Makefile +++ b/devel/hyperscan/Makefile @@ -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 python:build pkgconfig 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 <bsd.port.options.mk> + +.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 \ diff --git a/devel/hyperscan/distinfo b/devel/hyperscan/distinfo index a651489021e5..14b8223a0ad2 100644 --- a/devel/hyperscan/distinfo +++ b/devel/hyperscan/distinfo @@ -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 diff --git a/devel/hyperscan/files/patch-CMakeLists.txt b/devel/hyperscan/files/patch-CMakeLists.txt index 59d90b14dcc8..9c68b162936d 100644 --- a/devel/hyperscan/files/patch-CMakeLists.txt +++ b/devel/hyperscan/files/patch-CMakeLists.txt @@ -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") diff --git a/devel/hyperscan/pkg-plist b/devel/hyperscan/pkg-plist index e976e6a1f0a0..b7aea37d73d7 100644 --- a/devel/hyperscan/pkg-plist +++ b/devel/hyperscan/pkg-plist @@ -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 |