- Try to fix OpenSSL for Beaglebone

Author: hbirchtree

.build.yml

@@ -60,7 +60,7 @@ platforms:
 script_location: toolchain/ci
 template_location: toolchain/cmake/Templates
 version:
-  hotfix: 28
+  hotfix: 29
   major: 0
   minor: 3
   patch: 0

CMakeLists.txt

@@ -490,6 +490,12 @@ if(OPENSSL_BUILD)
                 )
         endif()
 
+        if(BEAGLE)
+            list ( APPEND EXTRA_OPTS
+                /usr/local/gcc-arm/arm-none-linux-gnueabihf/libc/usr/lib/libc.a
+                )
+        endif()
+
         ExternalProject_Add ( OpenSSL
 
             PREFIX ${CMAKE_BINARY_DIR}/openssl
@@ -514,6 +520,7 @@ if(OPENSSL_BUILD)
                     no-hw
                     no-engine
                     no-async
+                    no-tests
 
                     --prefix=${CMAKE_BINARY_DIR}/install/openssl
                     --openssldir=${CMAKE_BINARY_DIR}/install/openssl/data

toolchain/cmake/Modules/GitDependencies.cmake

@@ -22,7 +22,7 @@ function ( DEPENDENCY_GET )
     endif()
 
     if("${DEP_EXTENSION}" STREQUAL "")
-        set ( DEP_EXTENSION "tar.gz" )
+        set ( DEP_EXTENSION "tar.bz2" )
         if(WIN32 AND NOT MINGW)
             set ( DEP_EXTENSION "zip" )
         endif()

toolchain/cmake/Toolchains/linux-beagle-armv7hf_linux.toolchain.cmake

@@ -27,26 +27,41 @@ if(NOT SGX_SYSROOT)
     # Contains EGL, GLESv2 etc.
     set ( SGX_SYSROOT /sysroots/sgx-root )
 endif()
+if(NOT DEB_SYSROOT)
+    # Contains sys libs for Wayland and DRM
+    set ( DEB_SYSROOT /sysroots/${TOOLCHAIN_ARCH} )
+endif()
 
 set ( CMAKE_FIND_ROOT_PATH
     ${CMAKE_SYSROOT}
     ${CMAKE_SYSROOT}/usr
+    ${SGX_SYSROOT}
+    ${DEB_SYSROOT}/usr
+    ${DEB_SYSROOT}
     )
 
 set ( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER )
-set ( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY )
-set ( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY )
+#set ( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY )
+#set ( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY )
 
 set ( CMAKE_LIBRARY_ARCHITECTURE "${TOOLCHAIN_ARCH}" CACHE STRING "" )
 
 include_directories (
     ${LIBC_SYSROOT}/usr/include
     ${SGX_SYSROOT}/include
+    ${DEB_SYSROOT}/usr/include
     )
 link_directories (
     ${LIBC_SYSROOT}/lib
     ${LIBC_SYSROOT}/usr/lib
     ${SGX_SYSROOT}/lib
     )
 
+set ( CMAKE_LIBRARY_PATH
+    ${LIBC_SYSROOT}/lib
+    ${LIBC_SYSROOT}/usr/lib
+    ${SGX_SYSROOT}/lib
+    ${DEB_SYSROOT}/usr/lib/${TOOLCHAIN_ARCH}
+    )
+
 add_definitions(-D__BEAGLEBONE__ -D__BEAGLEBONEBLACK__)

toolchain/makers/Makefile.linux

@@ -1284,6 +1284,7 @@ beaglebone.black: FORCE
 	$(CMAKE_SOURCE_DIR) \
 	-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/nothing.cmake \
 	-DBUILD_BINARIES=$(GENERATE_PROGRAMS) \
+	-DBUILD_EGL=ON \
 	-DBUILD_GLES=ON \
 	-DBUILD_GLES_20=ON \
 	-DBUILD_OPENAL=OFF \
@@ -1316,6 +1317,7 @@ beaglebone.black.shell: FORCE
 	$(CMAKE_SOURCE_DIR) \
 	-C$(CMAKE_SOURCE_DIR)/toolchain/cmake/Preload/nothing.cmake \
 	-DBUILD_BINARIES=$(GENERATE_PROGRAMS) \
+	-DBUILD_EGL=ON \
 	-DBUILD_GLES=ON \
 	-DBUILD_GLES_20=ON \
 	-DBUILD_OPENAL=OFF \

toolchain/makers/coffee-config.yml

@@ -97,4 +97,5 @@ gamecube.*:
     - -DBUILD_OPENAL=OFF
     - -DBUILD_OPENSSL=OFF
     - -DBUILD_SDL2=OFF
+    - -DBUILD_EGL=ON