From 84c6fbc79bb49d61ca740cb8dd77c5b4b5377bad Mon Sep 17 00:00:00 2001 From: Jayesh Babu Date: Sat, 23 May 2026 12:09:30 +0000 Subject: [PATCH] Merge pull request 'added make build flags in the ipcrypto, ipcryptohash, secHash, secCrypto makefiles' (#46) from add_MAKE_build_flags_to_makefile into master Reviewed-on: http://13.234.246.121:3000/Neominds/ossl35vx69/pulls/46 --- vxworks-6.9/target/src/openssl/ipcrypto/Makefile | 5 +++-- vxworks-6.9/target/src/openssl/ipcryptohash/Makefile | 3 ++- vxworks-6.9/target/src/os/security/secCrypto/src/Makefile | 6 ++++++ vxworks-6.9/target/src/os/security/secHash/src/Makefile | 4 ---- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/vxworks-6.9/target/src/openssl/ipcrypto/Makefile b/vxworks-6.9/target/src/openssl/ipcrypto/Makefile index c77cf9ba..76de2fe5 100644 --- a/vxworks-6.9/target/src/openssl/ipcrypto/Makefile +++ b/vxworks-6.9/target/src/openssl/ipcrypto/Makefile @@ -19,10 +19,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 +_WRS_CONFIG_IPNET_COREIP ?= 1 +_WRS_CONFIG_SEC_CRYPTO ?= 1 + 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 e526e4dc..56bfbd58 100644 --- a/vxworks-6.9/target/src/openssl/ipcryptohash/Makefile +++ b/vxworks-6.9/target/src/openssl/ipcryptohash/Makefile @@ -19,9 +19,10 @@ 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 +_WRS_CONFIG_SEC_HASH ?= y + ifeq ($(_WRS_CONFIG_SEC_HASH),y) ifneq ($(SPACE),user) OBJS = secHashMd5Openssl.o diff --git a/vxworks-6.9/target/src/os/security/secCrypto/src/Makefile b/vxworks-6.9/target/src/os/security/secCrypto/src/Makefile index 2e450d70..25f640f2 100644 --- a/vxworks-6.9/target/src/os/security/secCrypto/src/Makefile +++ b/vxworks-6.9/target/src/os/security/secCrypto/src/Makefile @@ -16,6 +16,12 @@ LIB_BASE_NAME = SECCRYPTO include $(WIND_BASE)/target/h/make/defs.library +EXTRA_DEFINE += -D_WRS_CONFIG_OPENSSL +EXTRA_DEFINE += -DIP_PORT_VXWORKS + +_WRS_CONFIG_IPNET_COREIP ?= 1 +_WRS_CONFIG_SEC_HASH ?= 1 + EXTRA_INCLUDE += -I$(TGT_DIR)/h/security EXTRA_INCLUDE += -I$(IPCOM_DIR)/include EXTRA_INCLUDE += -I$(IPCOM_DIR)/config 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 96d8cab9..93ad226b 100644 --- a/vxworks-6.9/target/src/os/security/secHash/src/Makefile +++ b/vxworks-6.9/target/src/os/security/secHash/src/Makefile @@ -18,10 +18,6 @@ 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