Add OpenSSL lib, add snes lib

This commit is contained in:
Bensuperpc 2021-05-14 22:36:43 +02:00
parent 9159152331
commit 3dc4ff36fc
12 changed files with 49 additions and 20 deletions

View File

@ -12,7 +12,7 @@ on:
branches:
- '*'
schedule:
- cron: '0 0 * * 2' # every tuesday at 00:00 https://crontab.guru/#0_7_*_*_1
- cron: '0 0 * * 2' # Every tuesday at 00:00 https://crontab.guru/#0_7_*_*_1
jobs:
base:
name: base
@ -45,7 +45,7 @@ jobs:
runs-on: ubuntu-20.04
strategy:
fail-fast: false
max-parallel: 4
max-parallel: 3
# manylinux2014-aarch64
matrix:
arch_name: [android-arm, android-arm64, android-x86, android-x86_64, web-wasm, linux-armv8, linux-armv8-musl, linux-armv8-rpi3, linux-armv8-rpi4, linux-armv5, linux-armv5-musl, linux-armv6-rpi1, linux-armv7-rpi2, linux-armv6-musl, linux-armv6-rpi-old, linux-armv7, linux-armv7a, linux-armv7l-musl, linux-mips, linux-mips64, linux-mipsel, linux-m68k, linux-ppc32, linux-ppc64, linux-s390x, linux-x64, linux-x64-clang, linux-x86, linux-riscv64, manylinux2014-x64, manylinux2014-x86, windows-static-x64, windows-static-x64-posix, windows-static-x86, windows-shared-x64, windows-shared-x64-posix, windows-shared-x86]

3
.gitmodules vendored Normal file
View File

@ -0,0 +1,3 @@
[submodule "pvsneslib"]
path = pvsneslib
url = https://github.com/Bensuperpc/pvsneslib-docker.git

View File

@ -4,7 +4,8 @@
RUN cd /tmp/ && git clone https://github.com/boostorg/boost.git && cd boost && git checkout boost-1.76.0 && git submodule update --init && \
cd /tmp/boost/ && ./bootstrap.sh --without-libraries=mpi,python,regex,iostreams && \
cd /tmp/boost/ && echo "using gcc : 8.4 : ${CXX} ; " >> tools/build/src/user-config.jam && \
cd /tmp/boost/ && ./b2 install --toolset=gcc-8.4 --prefix=/usr/local/boost threading=multi link=static && \
cd /tmp/boost/ && ./b2 install --toolset=gcc-8.4 --prefix=/usr/${CROSS_TRIPLE}/boost/ threading=multi link=static && \
export PATH="/usr/${CROSS_TRIPLE}/boost/bin:$PATH" && \
rm -rf /tmp/boost/
# OpenCV lib
@ -27,11 +28,24 @@ RUN cd /tmp/ && git clone https://github.com/opencv/opencv.git && git clone http
-D BUILD_NEW_PYTHON_SUPPORT=OFF \
-D BUILD_opencv_python3=OFF \
-D HAVE_opencv_python3=OFF \
-D PYTHON_DEFAULT_EXECUTABLE="" && \
-D PYTHON_DEFAULT_EXECUTABLE="" \
-D CMAKE_PREFIX_PATH="/usr/${CROSS_TRIPLE}/opencv" &&\
cd /tmp/opencv && ninja -Cbuild && \
cd /tmp/opencv/build && \
ninja install && \
export PATH="/usr/${CROSS_TRIPLE}/opencv/bin:$PATH" && \
rm -rf /tmp/opencv/ && rm -rf /tmp/opencv_contrib
# OpenSSL lib
ENV OPENSSL_VERSION="1.1.1k"
RUN set -x \
&& wget --no-check-certificate -O /tmp/openssl-${OPENSSL_VERSION}.tar.gz "https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz" \
&& tar -xvf /tmp/openssl-${OPENSSL_VERSION}.tar.gz -C /tmp/ \
&& rm -rf /tmp/openssl-${OPENSSL_VERSION}.tar.gz \
&& cd /tmp/openssl-${OPENSSL_VERSION} \
&& ./Configure -static -fPIC ${OPENSSL_ARCH} -march=${OPENSSL_TARGET} no-asm --cross-compile-prefix="" --prefix=/usr/${CROSS_TRIPLE}/ssl --openssldir=/usr/${CROSS_TRIPLE}/ssl \
&& make -j$(nproc) \
&& make install \
&& export PATH="/usr/${CROSS_TRIPLE}/ssl/bin:$PATH" \
&& cd .. \
&& rm -rf openssl-${OPENSSL_VERSION}

View File

@ -26,16 +26,4 @@ ENV PATH ${PATH}:${CROSS_ROOT}/bin
ENV CROSS_COMPILE ${CROSS_TRIPLE}-
ENV ARCH arm
# Build-time metadata as defined at http://label-schema.org
ARG BUILD_DATE
ARG IMAGE=dockcross/linux-armv6-musl
ARG VERSION=latest
ARG VCS_REF
ARG VCS_URL
LABEL org.label-schema.build-date=$BUILD_DATE \
org.label-schema.name=$IMAGE \
org.label-schema.version=$VERSION \
org.label-schema.vcs-ref=$VCS_REF \
org.label-schema.vcs-url=$VCS_URL \
org.label-schema.schema-version="1.0"
ENV DEFAULT_DOCKCROSS_IMAGE ${IMAGE}:${VERSION}
#include "common.label-and-env"

View File

@ -37,6 +37,9 @@ ENV PATH ${PATH}:${CROSS_ROOT}/bin
ENV CROSS_COMPILE ${CROSS_TRIPLE}-
ENV ARCH arm
ENV OPENSSL_ARCH linux-armv4
ENV OPENSSL_TARGET armv6
#include "common.lib"
#include "common.label-and-env"

View File

@ -37,6 +37,9 @@ ENV PATH ${PATH}:${CROSS_ROOT}/bin
ENV CROSS_COMPILE ${CROSS_TRIPLE}-
ENV ARCH arm
ENV OPENSSL_ARCH linux-armv4
ENV OPENSSL_TARGET armv7-a
#include "common.lib"
#include "common.label-and-env"

View File

@ -37,6 +37,9 @@ ENV PATH ${PATH}:${CROSS_ROOT}/bin
ENV CROSS_COMPILE ${CROSS_TRIPLE}-
ENV ARCH arm
ENV OPENSSL_ARCH linux-armv4
ENV OPENSSL_TARGET armv7-a
#include "common.lib"
#include "common.label-and-env"

View File

@ -37,4 +37,9 @@ ENV PATH ${PATH}:${CROSS_ROOT}/bin
ENV CROSS_COMPILE ${CROSS_TRIPLE}-
ENV ARCH arm
ENV OPENSSL_ARCH linux-armv4
ENV OPENSSL_TARGET armv7-a
#include "common.lib"
#include "common.label-and-env"

View File

@ -38,6 +38,9 @@ ENV PATH ${PATH}:${CROSS_ROOT}/bin
ENV CROSS_COMPILE ${CROSS_TRIPLE}-
ENV ARCH arm64
ENV OPENSSL_ARCH linux-aarch64
ENV OPENSSL_TARGET armv8-a
#include "common.lib"
#include "common.label-and-env"

View File

@ -38,6 +38,9 @@ ENV PATH ${PATH}:${CROSS_ROOT}/bin
ENV CROSS_COMPILE ${CROSS_TRIPLE}-
ENV ARCH arm64
ENV OPENSSL_ARCH linux-aarch64
ENV OPENSSL_TARGET armv8-a
#include "common.lib"
#include "common.label-and-env"

View File

@ -38,6 +38,9 @@ ENV PATH ${PATH}:${CROSS_ROOT}/bin
ENV CROSS_COMPILE ${CROSS_TRIPLE}-
ENV ARCH arm64
ENV OPENSSL_ARCH linux-aarch64
ENV OPENSSL_TARGET armv8-a
#include "common.lib"
#include "common.label-and-env"

1
pvsneslib Submodule

@ -0,0 +1 @@
Subproject commit 3be0a8e58351833a801082acea83108dc5121989