ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-04-13 22:23:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

libcrypto: use platform specific mk files

Browse Source 
Instead of checking the target platform in the mk file use the common
pattern of providing a mk file for each platform.

Fixes #1236.
This commit is contained in:
Josef Söntgen 2014-08-21 12:47:43 +02:00 committed by Norman Feske
parent 5322714183
commit 1f1b7f7158
4 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
repos/libports/lib/mk/arm/libcrypto.mk Normal file
View File

@ -0,0 +1,6 @@
# has to be the first path because it includes openssl/opensslconf.h
INC_DIR += $(REP_DIR)/src/lib/openssl/arm
CC_OPTS += -DL_ENDIAN
include $(REP_DIR)/lib/mk/libcrypto.inc

17
repos/libports/lib/mk/libcrypto.mk → repos/libports/lib/mk/libcrypto.inc
View File

@ -188,22 +188,6 @@ INC_DIR += $(LIBCRYPTO_DIR)/evp
INC_DIR += $(LIBCRYPTO_DIR)/modes
INC_DIR += $(LIBCRYPTO_DIR)
INC_DIR += $(LIBCRYPTO_DIR)/../
CC_OPTS += -DL_ENDIAN
ifeq ($(filter-out $(SPECS),x86_32),)
TARGET_CPUARCH=x86_32
else ifeq ($(filter-out $(SPECS),x86_64),)
TARGET_CPUARCH=x86_64
SRC_S += modexp512.s
SRC_S += rc4_md5.s
else ifeq ($(filter-out $(SPECS),arm),)
TARGET_CPUARCH=arm
endif
INC_DIR += $(REP_DIR)/src/lib/openssl/$(TARGET_CPUARCH)/
INC_DIR += $(OPENSSL_PORT_DIR)/src/lib/openssl/$(TARGET_CPUARCH)/
INC_DIR += $(OPENSSL_PORT_DIR)/include
@ -220,5 +204,4 @@ buildinf.h:
echo " #define PLATFORM \"FreeBSD-$(TARGET_CPUARCH)\""; \
echo "#endif" ) > $@
vpath %.s $(call select_from_ports,openssl)/src/lib/openssl/$(TARGET_CPUARCH)
vpath %.c $(LIBCRYPTO_DIR)

6
repos/libports/lib/mk/x86_32/libcrypto.mk Normal file
View File

@ -0,0 +1,6 @@
# has to be the first path because it includes openssl/opensslconf.h
INC_DIR += $(REP_DIR)/src/lib/openssl/x86_32
CC_OPTS += -DL_ENDIAN
include $(REP_DIR)/lib/mk/libcrypto.inc

11
repos/libports/lib/mk/x86_64/libcrypto.mk Normal file
View File

@ -0,0 +1,11 @@
# has to be the first path because it includes openssl/opensslconf.h
INC_DIR += $(REP_DIR)/src/lib/openssl/x86_64
CC_OPTS += -DL_ENDIAN
SRC_S += modexp512.s
SRC_S += rc4_md5.s
vpath %.s $(call select_from_ports,openssl)/src/lib/openssl/x86_64
include $(REP_DIR)/lib/mk/libcrypto.inc