diff options
| author | Tony Theodore <tonyt@logyst.com> | 2017-02-03 09:49:24 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2017-02-04 08:11:48 (GMT) |
| commit | df1c3b4a8fcb3dc814c9690b13681a7d8ebd1dab (patch) | |
| tree | d2f68761522aa8619502d08f4dfe1fcd6dc20911 | |
| parent | ec66310194ac1cda6a7493e60ca15c1527356b5a (diff) | |
| download | mxe-df1c3b4a8fcb3dc814c9690b13681a7d8ebd1dab.zip mxe-df1c3b4a8fcb3dc814c9690b13681a7d8ebd1dab.tar.gz mxe-df1c3b4a8fcb3dc814c9690b13681a7d8ebd1dab.tar.bz2 | |
Revert "hyperscan: fix build with gcc54 on darwin"
This reverts commit 2a92ee34324326b4988fb7899a02b59553c25329.
| -rw-r--r-- | src/hyperscan-1-fixes.patch | 47 | ||||
| -rw-r--r-- | src/hyperscan.mk | 2 |
2 files changed, 1 insertions, 48 deletions
diff --git a/src/hyperscan-1-fixes.patch b/src/hyperscan-1-fixes.patch index 8df4378..025c71d 100644 --- a/src/hyperscan-1-fixes.patch +++ b/src/hyperscan-1-fixes.patch @@ -422,50 +422,3 @@ index 1111111..2222222 100644 Libs.private: @PRIVATE_LIBS@ -Cflags: -I${includedir}/hs +Cflags: -I${includedir}/hs -posix - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Tony Theodore <tonyt@logyst.com> -Date: Sat, 21 Jan 2017 14:41:17 +1100 -Subject: [PATCH] add libatomic linking for gcc54 on macos - - -diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt -index 1111111..2222222 100644 ---- a/examples/CMakeLists.txt -+++ b/examples/CMakeLists.txt -@@ -7,7 +7,7 @@ endif() - add_executable(simplegrep simplegrep.c) - set_source_files_properties(simplegrep.c PROPERTIES COMPILE_FLAGS - "-Wall -Wno-unused-parameter") --target_link_libraries(simplegrep hs) -+target_link_libraries(simplegrep hs atomic) - - if (PCAP_LIBRARY) - add_executable(pcapscan pcapscan.cc) -diff --git a/libhs.pc.in b/libhs.pc.in -index 1111111..2222222 100644 ---- a/libhs.pc.in -+++ b/libhs.pc.in -@@ -7,5 +7,5 @@ Name: libhs - Description: Intel(R) Hyperscan Library - Version: @HS_VERSION@ - Libs: -L${libdir} -lhs --Libs.private: @PRIVATE_LIBS@ -+Libs.private: @PRIVATE_LIBS@ -latomic - Cflags: -I${includedir}/hs -posix -diff --git a/unit/CMakeLists.txt b/unit/CMakeLists.txt -index 1111111..2222222 100644 ---- a/unit/CMakeLists.txt -+++ b/unit/CMakeLists.txt -@@ -113,9 +113,9 @@ set(unit_hyperscan_SOURCES - ) - add_executable(unit-hyperscan ${unit_hyperscan_SOURCES}) - if (BUILD_STATIC_AND_SHARED OR BUILD_SHARED_LIBS) --target_link_libraries(unit-hyperscan hs_shared gtest expressionutil) -+target_link_libraries(unit-hyperscan hs_shared gtest expressionutil atomic) - else() --target_link_libraries(unit-hyperscan hs gtest expressionutil) -+target_link_libraries(unit-hyperscan hs gtest expressionutil atomic) - endif() - - # diff --git a/src/hyperscan.mk b/src/hyperscan.mk index ec55aef..694bdb9 100644 --- a/src/hyperscan.mk +++ b/src/hyperscan.mk @@ -21,7 +21,7 @@ define $(PKG)_BUILD # Add the following options to run on (virtual) machine without AVX2 # -DCMAKE_C_FLAGS="-march=core2" -DCMAKE_CXX_FLAGS="-march=core2" cd '$(1).build' && '$(TARGET)-cmake' \ - -DCMAKE_C_FLAGS="-msse4" -DCMAKE_CXX_FLAGS="-msse4" \ + -DCMAKE_C_FLAGS="-mssse4" -DCMAKE_CXX_FLAGS="-mssse4" \ -DRAGEL='$(PREFIX)/$(BUILD)/bin/ragel' \ '$(1)' $(MAKE) -C '$(1).build' -j '$(JOBS)' |