From a316197f846eddec4e8505833fb22afd6072d8e0 Mon Sep 17 00:00:00 2001 From: Jayesh Babu Date: Thu, 21 May 2026 14:15:35 +0000 Subject: [PATCH] Merge pull request 'Moved compiler flags from Workbench UI to respective Makefiles' (#29) from move_compiler_var_from_ui into master Reviewed-on: http://13.234.246.121:3000/Neominds/ossl35vx69/pulls/29 --- vxworks-6.9/target/src/openssl/ipcrypto/Makefile | 5 +++++ vxworks-6.9/target/src/openssl/ipcryptohash/Makefile | 6 ++++-- vxworks-6.9/target/src/os/security/secHash/src/Makefile | 7 +++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/vxworks-6.9/target/src/openssl/ipcrypto/Makefile b/vxworks-6.9/target/src/openssl/ipcrypto/Makefile index 2dd0275e..c77cf9ba 100644 --- a/vxworks-6.9/target/src/openssl/ipcrypto/Makefile +++ b/vxworks-6.9/target/src/openssl/ipcrypto/Makefile @@ -18,6 +18,11 @@ LIB_FORMAT = both include $(WIND_BASE)/target/h/make/defs.library +EXTRA_DEFINE += -D_WRS_CONFIG_OPENSSL +EXTRA_DEFINE += -D_WRS_CONFIG_IPNET_COREIP=1 +EXTRA_DEFINE += -D_WRS_CONFIG_SEC_CRYPTO=1 +EXTRA_DEFINE += -DIP_PORT_VXWORKS + ADDED_CFLAGS += -Wno-implicit-function-declaration EXTRA_INCLUDE += -I$(IPCOM_DIR)/include EXTRA_INCLUDE += -I$(IPCOM_DIR)/config diff --git a/vxworks-6.9/target/src/openssl/ipcryptohash/Makefile b/vxworks-6.9/target/src/openssl/ipcryptohash/Makefile index 7e5c2534..e526e4dc 100644 --- a/vxworks-6.9/target/src/openssl/ipcryptohash/Makefile +++ b/vxworks-6.9/target/src/openssl/ipcryptohash/Makefile @@ -14,12 +14,14 @@ TGT_DIR=$(WIND_BASE)/target LIB_BASE_NAME = ip_crypto LIB_FORMAT = both - - include $(WIND_BASE)/target/h/make/defs.library EXTRA_INCLUDE += -I$(TGT_DIR)/h/security +EXTRA_DEFINE += -D_WRS_CONFIG_OPENSSL +EXTRA_DEFINE += -D_WRS_CONFIG_SEC_HASH=y +EXTRA_DEFINE += -DIP_PORT_VXWORKS + ifeq ($(_WRS_CONFIG_SEC_HASH),y) ifneq ($(SPACE),user) OBJS = secHashMd5Openssl.o diff --git a/vxworks-6.9/target/src/os/security/secHash/src/Makefile b/vxworks-6.9/target/src/os/security/secHash/src/Makefile index e41d3414..96d8cab9 100644 --- a/vxworks-6.9/target/src/os/security/secHash/src/Makefile +++ b/vxworks-6.9/target/src/os/security/secHash/src/Makefile @@ -17,6 +17,13 @@ include $(WIND_BASE)/target/h/make/defs.library EXTRA_INCLUDE += -I$(TGT_DIR)/h/security +EXTRA_DEFINE += -D_WRS_CONFIG_OPENSSL +EXTRA_DEFINE += -D_WRS_CONFIG_CORE__BANNED_H=1 +EXTRA_DEFINE += -D_WRS_CONFIG_IPNET_COREIP=1 +EXTRA_DEFINE += -D_WRS_CONFIG_SEC_CRYPTO=1 +EXTRA_DEFINE += -D_WRS_CONFIG_SEC_HASH=y +EXTRA_DEFINE += -DIP_PORT_VXWORKS + OBJS = secHash.o OBJS += secHmac.o OBJS += secHashMd5.o