summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build/external/packages/ipsec-mb.mk8
-rw-r--r--build/external/patches/ipsec-mb_0.55/0001-nasm-ver-check-fix.patch13
2 files changed, 18 insertions, 3 deletions
diff --git a/build/external/packages/ipsec-mb.mk b/build/external/packages/ipsec-mb.mk
index 0155a04b577..9e1e14289e3 100644
--- a/build/external/packages/ipsec-mb.mk
+++ b/build/external/packages/ipsec-mb.mk
@@ -11,12 +11,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-ipsec-mb_version := 0.54
+ipsec-mb_version := 0.55
ipsec-mb_tarball := v$(ipsec-mb_version).tar.gz
ipsec-mb_tarball_md5sum_0.49 := 3a2bee86f25f6c8ed720da5b4b8d4297
ipsec-mb_tarball_md5sum_0.52 := 11ecfa6db4dc0c4ca6e5c616c141ac46
ipsec-mb_tarball_md5sum_0.53 := e9b3507590efd1c23321518612b644cd
ipsec-mb_tarball_md5sum_0.54 := 258941f7ba90c275fcf9d19c622d2d21
+ipsec-mb_tarball_md5sum_0.55 := deca674bca7ae2282890e1fa7f953609
+
ipsec-mb_tarball_md5sum := $(ipsec-mb_tarball_md5sum_$(ipsec-mb_version))
ipsec-mb_tarball_strip_dirs := 1
ipsec-mb_url := http://github.com/01org/intel-ipsec-mb/archive/$(ipsec-mb_tarball)
@@ -36,8 +38,8 @@ endef
define ipsec-mb_install_cmds
@mkdir -p $(ipsec-mb_install_dir)/include
@mkdir -p $(ipsec-mb_install_dir)/lib
- @cp $(ipsec-mb_src_dir)/intel-ipsec-mb.h $(ipsec-mb_install_dir)/include
- @cp $(ipsec-mb_src_dir)/libIPSec_MB.a $(ipsec-mb_install_dir)/lib
+ @cp $(ipsec-mb_src_dir)/lib/intel-ipsec-mb.h $(ipsec-mb_install_dir)/include
+ @cp $(ipsec-mb_src_dir)/lib/libIPSec_MB.a $(ipsec-mb_install_dir)/lib
endef
$(eval $(call package,ipsec-mb))
diff --git a/build/external/patches/ipsec-mb_0.55/0001-nasm-ver-check-fix.patch b/build/external/patches/ipsec-mb_0.55/0001-nasm-ver-check-fix.patch
new file mode 100644
index 00000000000..7c2e9477ada
--- /dev/null
+++ b/build/external/patches/ipsec-mb_0.55/0001-nasm-ver-check-fix.patch
@@ -0,0 +1,13 @@
+diff --git a/lib/Makefile b/lib/Makefile
+index 3831172..9ce6f4c 100644
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -51,7 +51,7 @@ YASM ?= yasm
+ NASM ?= nasm
+
+ # Detect NASM version (minimum version required: 2.14)
+-NASM_VERSION = $(shell nasm -v | cut -d " " -f 3)
++NASM_VERSION = $(shell $(NASM) -v | cut -d " " -f 3)
+
+ NASM_MAJOR_REQ = 2
+ NASM_MINOR_REQ = 14