Skip to content

Commit cbda607

Browse files
committed
Fix openssl install for CMake to detect it
1 parent c8e9dda commit cbda607

File tree

3 files changed

+15
-18
lines changed

3 files changed

+15
-18
lines changed

cross/openssl/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,4 @@ openssl_configure:
5656

5757
.PHONY: openssl_install
5858
openssl_install:
59-
$(RUN) $(MAKE) install_sw DESTDIR=$(INSTALL_DIR)
59+
$(RUN) $(MAKE) install_sw INSTALL_PREFIX=$(INSTALL_DIR)

mk/spksrc.cross-cmake-env.mk

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Configuration for cmake build
1+
# Configuration for CMake build
22
#
33
CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX=$(INSTALL_PREFIX)
44
CMAKE_ARGS += -DCMAKE_CROSSCOMPILING=TRUE
@@ -15,29 +15,29 @@ CMAKE_ARGS += -DBUILD_SHARED_LIBS=ON
1515

1616
# set default ASM build environment
1717
ifeq ($(strip $(CMAKE_USE_NASM)),1)
18-
DEPENDS += native/nasm
19-
NASM_PATH = $(WORK_DIR)/../../../native/nasm/work-native/install/usr/local/bin
20-
ENV += PATH=$(NASM_PATH):$$PATH
21-
ENV += AS=$(NASM_PATH)/nasm
22-
CMAKE_ARGS += -DENABLE_ASSEMBLY=ON
18+
DEPENDS += native/nasm
19+
NASM_PATH = $(WORK_DIR)/../../../native/nasm/work-native/install/usr/local/bin
20+
ENV += PATH=$(NASM_PATH):$$PATH
21+
ENV += AS=$(NASM_PATH)/nasm
22+
CMAKE_ARGS += -DENABLE_ASSEMBLY=ON
2323
else
24-
CMAKE_USE_NASM = 0
25-
CMAKE_ARGS += -DENABLE_ASSEMBLY=OFF
24+
CMAKE_USE_NASM = 0
25+
CMAKE_ARGS += -DENABLE_ASSEMBLY=OFF
2626
endif
2727

2828
# set default build directory
2929
ifeq ($(strip $(CMAKE_USE_DESTDIR)),)
30-
CMAKE_USE_DESTDIR = 1
30+
CMAKE_USE_DESTDIR = 1
3131
endif
3232

3333
# set default build directory
3434
ifeq ($(strip $(CMAKE_DESTDIR)),)
35-
CMAKE_DESTDIR = $(INSTALL_DIR)
35+
CMAKE_DESTDIR = $(INSTALL_DIR)
3636
endif
3737

3838
# set default build directory
3939
ifeq ($(strip $(CMAKE_BUILD_DIR)),)
40-
CMAKE_BUILD_DIR = $(WORK_DIR)/$(PKG_DIR)/build
40+
CMAKE_BUILD_DIR = $(WORK_DIR)/$(PKG_DIR)/build
4141
endif
4242

4343
# Define per arch specific common options

mk/spksrc.cross-cmake.mk

+3-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
# Build go programs
2-
#
1+
# Build CMake programs
2+
#
33
# prerequisites:
44
# - cross/module depends on cmake
5-
#
6-
# remarks:
7-
# - improvised from spksrc.cross-go.mk
8-
#
5+
#
96

107
# Common makefiles
118
include ../../mk/spksrc.common.mk

0 commit comments

Comments
 (0)