diff options
author | Tobias Brunner <tobias@strongswan.org> | 2015-11-20 17:51:54 +0100 |
---|---|---|
committer | Tobias Brunner <tobias@strongswan.org> | 2016-06-15 16:24:43 +0200 |
commit | cac9051eed7aa57f9f3d11f6f17fb4c23fc6dc8c (patch) | |
tree | 5ac17e64d96535c4ba94000bb0f8b39c48a23605 | |
parent | c857621e70b16c58e2072bbde059a5f062dd3a5c (diff) | |
download | strongswan-cac9051eed7aa57f9f3d11f6f17fb4c23fc6dc8c.tar.bz2 strongswan-cac9051eed7aa57f9f3d11f6f17fb4c23fc6dc8c.tar.xz |
testing: Add a patch to tnc-fhh that avoids building the tncsim package
This sub-package does not build on Debian jessie.
-rw-r--r-- | testing/scripts/recipes/002_tnc-fhh.mk | 9 | ||||
-rw-r--r-- | testing/scripts/recipes/patches/tnc-fhh-tncsim | 12 |
2 files changed, 20 insertions, 1 deletions
diff --git a/testing/scripts/recipes/002_tnc-fhh.mk b/testing/scripts/recipes/002_tnc-fhh.mk index 397cef950..d4ed4f99c 100644 --- a/testing/scripts/recipes/002_tnc-fhh.mk +++ b/testing/scripts/recipes/002_tnc-fhh.mk @@ -9,6 +9,9 @@ CONFIG_OPTS = \ -DCOMPONENT=all \ -DNAL=8021x +PATCHES = \ + tnc-fhh-tncsim + all: install .$(PKG)-cloned: @@ -16,7 +19,11 @@ all: install mkdir $(PKG)/build @touch $@ -.$(PKG)-configured: .$(PKG)-cloned +.$(PKG)-patches-applied: .$(PKG)-cloned + cd $(PKG) && cat $(addprefix ../patches/, $(PATCHES)) | patch -p1 + @touch $@ + +.$(PKG)-configured: .$(PKG)-patches-applied cd $(PKG)/build && cmake $(CONFIG_OPTS) ../ @touch $@ diff --git a/testing/scripts/recipes/patches/tnc-fhh-tncsim b/testing/scripts/recipes/patches/tnc-fhh-tncsim new file mode 100644 index 000000000..42c714480 --- /dev/null +++ b/testing/scripts/recipes/patches/tnc-fhh-tncsim @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fe65134512ea..3c5255f21ea6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -101,7 +101,6 @@ IF(${COMPONENT} STREQUAL "ALL") + add_subdirectory(tncxacml) + add_subdirectory(imcv) + add_subdirectory(tncs) +- add_subdirectory(tncsim) + + IF(${NAL} STREQUAL "8021X" OR ${NAL} STREQUAL "ALL") + add_subdirectory(naaeap) |