From 26f546256d5f9c981224b30f6b9988941d76d018 Mon Sep 17 00:00:00 2001 From: Xiaolong Jiang Date: Wed, 23 Sep 2020 09:29:24 +0800 Subject: modify vcl patch and remove ldp-lock patch Signed-off-by: Xiaolong Jiang Change-Id: I4fe5f4dc2121d952bd0a4394afe0b18ce6f93516 --- Makefile | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index b11cc4d..16daa3f 100644 --- a/Makefile +++ b/Makefile @@ -29,10 +29,13 @@ vpp ?= master MAKE ?= make MAKE_ARGS ?= -j openssl3_enable ?= 0 +openssl3_lib_ready ?= 0 debug ?= 0 BUILD_DIR ?= $(CURDIR)/_build INSTALL_DIR ?= $(CURDIR)/_install +MAIN_BRANCH := master + B := $(BUILD_DIR) I := $(INSTALL_DIR) @@ -87,16 +90,40 @@ $(BR)/.deps.ok: @touch $@ .PHONY: build-vcl +ifeq ($(openssl3_enable)_$(openssl3_lib_ready), 1_1) +build-vcl: $(BR)/.deps.ok nginx-dl vpp_vcl-build nginx_vcl-build +else ifeq ($(openssl3_enable),1) build-vcl: $(BR)/.deps.ok openssl-dl nginx-dl openssl-build vpp_vcl-build nginx_vcl-build +else +build-vcl: $(BR)/.deps.ok nginx-dl vpp_vcl-build nginx_vcl-build +endif .PHONY: build-ldp +ifeq ($(openssl3_enable)_$(openssl3_lib_ready), 1_1) +build-ldp: $(BR)/.deps.ok nginx-dl vpp_ldp-build nginx_ldp-build +else ifeq ($(openssl3_enable),1) build-ldp: $(BR)/.deps.ok openssl-dl nginx-dl openssl-build vpp_ldp-build nginx_ldp-build +else +build-ldp: $(BR)/.deps.ok nginx-dl vpp_ldp-build nginx_ldp-build +endif .PHONY: deb-vcl +ifeq ($(openssl3_enable)_$(openssl3_lib_ready), 1_1) +deb-vcl: build-vcl vpp_vcl-deb nginx_vcl-deb +else ifeq ($(openssl3_enable),1) deb-vcl: build-vcl openssl-deb vpp_vcl-deb nginx_vcl-deb +else +deb-vcl: build-vcl vpp_vcl-deb nginx_vcl-deb +endif .PHONY: deb-ldp +ifeq ($(openssl3_enable)_$(openssl3_lib_ready), 1_1) +deb-ldp: build-ldp vpp_ldp-deb nginx_ldp-deb +else ifeq ($(openssl3_enable),1) deb-ldp: build-ldp openssl-deb vpp_ldp-deb nginx_ldp-deb +else +deb-ldp: build-ldp vpp_ldp-deb nginx_ldp-deb +endif .PHONY: verify-vcl verify-vcl: build-vcl -- cgit 1.2.3-korg