From mboxrd@z Thu Jan 1 00:00:00 1970 From: Pablo de Lara Subject: [PATCH 1/8] snow3g: rename libsso reference due to library update Date: Fri, 6 May 2016 15:03:42 +0100 Message-ID: <1462543429-26741-2-git-send-email-pablo.de.lara.guarch@intel.com> References: <1462543429-26741-1-git-send-email-pablo.de.lara.guarch@intel.com> Cc: declan.doherty@intel.com, Pablo de Lara To: dev@dpdk.org Return-path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id EDD3B5A38 for ; Fri, 6 May 2016 15:59:15 +0200 (CEST) In-Reply-To: <1462543429-26741-1-git-send-email-pablo.de.lara.guarch@intel.com> List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The underlying libsso library that SNOW3G PMD uses has been updated, so now it is called libsso_snow3g. Also, the path to the library has been renamed to reflect this changes (now called LIBSSO_SNOW3G_PATH). Signed-off-by: Pablo de Lara --- doc/guides/cryptodevs/snow3g.rst | 6 +++--- drivers/crypto/snow3g/Makefile | 10 +++++----- mk/rte.app.mk | 4 ++-- scripts/test-build.sh | 6 +++--- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/doc/guides/cryptodevs/snow3g.rst b/doc/guides/cryptodevs/snow3g.rst index c1098b1..8564c9f 100644 --- a/doc/guides/cryptodevs/snow3g.rst +++ b/doc/guides/cryptodevs/snow3g.rst @@ -58,7 +58,7 @@ Installation ------------ To build DPDK with the SNOW3G_PMD the user is required to download -the export controlled ``libsso`` library, by requesting it from +the export controlled ``libsso_snow3g`` library, by requesting it from ``_, and compiling it on their system before building DPDK:: @@ -96,10 +96,10 @@ Initialization In order to enable this virtual crypto PMD, user must: -* Export the environmental variable LIBSSO_PATH with the path where +* Export the environmental variable LIBSSO_SNOW3G_PATH with the path where the library was extracted. -* Build the LIBSSO library (explained in Installation section). +* Build the LIBSSO_SNOW3G library (explained in Installation section). * Set CONFIG_RTE_LIBRTE_PMD_SNOW3G=y in config/common_base. diff --git a/drivers/crypto/snow3g/Makefile b/drivers/crypto/snow3g/Makefile index ee58270..b86e608 100644 --- a/drivers/crypto/snow3g/Makefile +++ b/drivers/crypto/snow3g/Makefile @@ -30,8 +30,8 @@ include $(RTE_SDK)/mk/rte.vars.mk -ifeq ($(LIBSSO_PATH),) -$(error "Please define LIBSSO_PATH environment variable") +ifeq ($(LIBSSO_SNOW3G_PATH),) +$(error "Please define LIBSSO_SNOW3G_PATH environment variable") endif # library name @@ -48,9 +48,9 @@ LIBABIVER := 1 EXPORT_MAP := rte_pmd_snow3g_version.map # external library include paths -CFLAGS += -I$(LIBSSO_PATH) -CFLAGS += -I$(LIBSSO_PATH)/include -CFLAGS += -I$(LIBSSO_PATH)/build +CFLAGS += -I$(LIBSSO_SNOW3G_PATH) +CFLAGS += -I$(LIBSSO_SNOW3G_PATH)/include +CFLAGS += -I$(LIBSSO_SNOW3G_PATH)/build # library source files SRCS-$(CONFIG_RTE_LIBRTE_PMD_SNOW3G) += rte_snow3g_pmd.c diff --git a/mk/rte.app.mk b/mk/rte.app.mk index 65352a7..afa251c 100644 --- a/mk/rte.app.mk +++ b/mk/rte.app.mk @@ -162,9 +162,9 @@ else ifeq ($(CONFIG_RTE_LIBRTE_PMD_AESNI_GCM),y) _LDLIBS-y += -L$(AESNI_MULTI_BUFFER_LIB_PATH) -lIPSec_MB endif -# SNOW3G PMD is dependent on the LIBSSO library +# SNOW3G PMD is dependent on the LIBSSO-SNOW3G library _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SNOW3G) += -lrte_pmd_snow3g -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SNOW3G) += -L$(LIBSSO_PATH)/build -lsso +_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SNOW3G) += -L$(LIBSSO_SNOW3G_PATH)/build -lsso_snow3g # KASUMI PMD is dependent on the LIBSSO-KASUMI library _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_KASUMI) += -lrte_pmd_kasumi diff --git a/scripts/test-build.sh b/scripts/test-build.sh index 55e3e58..53d0ca0 100755 --- a/scripts/test-build.sh +++ b/scripts/test-build.sh @@ -44,7 +44,7 @@ default_path=$PATH # - DPDK_DEP_ZLIB (y/[n]) # - DPDK_MAKE_JOBS (int) # - DPDK_NOTIFY (notify-send) -# - LIBSSO_PATH +# - LIBSSO_SNOW3G_PATH # - LIBSSO_KASUMI_PATH . $(dirname $(readlink -e $0))/load-devel-config.sh @@ -120,7 +120,7 @@ reset_env () unset DPDK_DEP_SZE unset DPDK_DEP_ZLIB unset AESNI_MULTI_BUFFER_LIB_PATH - unset LIBSSO_PATH + unset LIBSSO_SNOW3G_PATH unset LIBSSO_KASUMI_PATH unset PQOS_INSTALL_PATH } @@ -164,7 +164,7 @@ config () # sed -ri 's,(PMD_AESNI_MB=)n,\1y,' $1/.config test -z "$AESNI_MULTI_BUFFER_LIB_PATH" || \ sed -ri 's,(PMD_AESNI_GCM=)n,\1y,' $1/.config - test -z "$LIBSSO_PATH" || \ + test -z "$LIBSSO_SNOW3G_PATH" || \ sed -ri 's,(PMD_SNOW3G=)n,\1y,' $1/.config test -z "$LIBSSO_KASUMI_PATH" || \ sed -ri 's,(PMD_KASUMI=)n,\1y,' $1/.config -- 2.5.0