Fix openssl install for CMake to detect it

SynoCommunity · Oct 4, 2020 · cbda607 · cbda607
1 parent c8e9dda
commit cbda607
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 18 deletions.
diff --git a/cross/openssl/Makefile b/cross/openssl/Makefile
@@ -56,4 +56,4 @@ openssl_configure:
 
 .PHONY: openssl_install
 openssl_install:
-	$(RUN) $(MAKE) install_sw DESTDIR=$(INSTALL_DIR)
+	$(RUN) $(MAKE) install_sw INSTALL_PREFIX=$(INSTALL_DIR)
diff --git a/mk/spksrc.cross-cmake-env.mk b/mk/spksrc.cross-cmake-env.mk
@@ -1,4 +1,4 @@
-# Configuration for cmake build
+# Configuration for CMake build
 #
 CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX=$(INSTALL_PREFIX)
 CMAKE_ARGS += -DCMAKE_CROSSCOMPILING=TRUE
@@ -15,29 +15,29 @@ CMAKE_ARGS += -DBUILD_SHARED_LIBS=ON
 
 # set default ASM build environment
 ifeq ($(strip $(CMAKE_USE_NASM)),1)
-DEPENDS += native/nasm 
-NASM_PATH = $(WORK_DIR)/../../../native/nasm/work-native/install/usr/local/bin
-ENV += PATH=$(NASM_PATH):$$PATH
-ENV += AS=$(NASM_PATH)/nasm
-CMAKE_ARGS += -DENABLE_ASSEMBLY=ON
+  DEPENDS += native/nasm
+  NASM_PATH = $(WORK_DIR)/../../../native/nasm/work-native/install/usr/local/bin
+  ENV += PATH=$(NASM_PATH):$$PATH
+  ENV += AS=$(NASM_PATH)/nasm
+  CMAKE_ARGS += -DENABLE_ASSEMBLY=ON
 else
-CMAKE_USE_NASM = 0
-CMAKE_ARGS += -DENABLE_ASSEMBLY=OFF
+  CMAKE_USE_NASM = 0
+  CMAKE_ARGS += -DENABLE_ASSEMBLY=OFF
 endif
 
 # set default build directory
 ifeq ($(strip $(CMAKE_USE_DESTDIR)),)
-CMAKE_USE_DESTDIR = 1
+  CMAKE_USE_DESTDIR = 1
 endif
 
 # set default build directory
 ifeq ($(strip $(CMAKE_DESTDIR)),)
-CMAKE_DESTDIR = $(INSTALL_DIR)
+  CMAKE_DESTDIR = $(INSTALL_DIR)
 endif
 
 # set default build directory
 ifeq ($(strip $(CMAKE_BUILD_DIR)),)
-CMAKE_BUILD_DIR = $(WORK_DIR)/$(PKG_DIR)/build
+  CMAKE_BUILD_DIR = $(WORK_DIR)/$(PKG_DIR)/build
 endif
 
 # Define per arch specific common options

diff --git a/mk/spksrc.cross-cmake.mk b/mk/spksrc.cross-cmake.mk
@@ -1,11 +1,8 @@
-# Build go programs
-# 
+# Build CMake programs
+#
 # prerequisites:
 # - cross/module depends on cmake
-# 
-# remarks:
-# - improvised from spksrc.cross-go.mk
-# 
+#
 
 # Common makefiles
 include ../../mk/spksrc.common.mk