mirror of
				https://github.com/bensuperpc/dockcross.git
				synced 2025-10-30 23:56:23 +01:00 
			
		
		
		
	Compare commits
	
		
			9 Commits
		
	
	
		
			update_tes
			...
			update_lab
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| e8a4d76049 | |||
| c994e33650 | |||
| b44144d865 | |||
|  | 17a2266499 | ||
|  | 122a1586ef | ||
| ec96e82d03 | |||
| a3727bcaa9 | |||
|  | a036aca087 | ||
|  | 1c2475d42d | 
| @@ -54,6 +54,7 @@ RUN \ | |||||||
|     libc6-dev-i386 \ |     libc6-dev-i386 \ | ||||||
|     lzip \ |     lzip \ | ||||||
|     make \ |     make \ | ||||||
|  |     nsis \ | ||||||
|     openssl \ |     openssl \ | ||||||
|     p7zip-full \ |     p7zip-full \ | ||||||
|     patch \ |     patch \ | ||||||
| @@ -107,12 +108,20 @@ RUN \ | |||||||
|   # |   # | ||||||
|   echo 'set(CMAKE_CROSSCOMPILING_EMULATOR "/usr/bin/wine")' >> ${CMAKE_TOOLCHAIN_FILE} && \ |   echo 'set(CMAKE_CROSSCOMPILING_EMULATOR "/usr/bin/wine")' >> ${CMAKE_TOOLCHAIN_FILE} && \ | ||||||
|   # |   # | ||||||
|  |   # Add a sysmbolic link for makensis | ||||||
|  |   # | ||||||
|  |   ln -s /usr/bin/makensis /usr/bin/${MXE_TARGET_ARCH}-w64-mingw32.${MXE_TARGET_LINK}${MXE_TARGET_THREAD}-makensis && \ | ||||||
|  |   # | ||||||
|   # Replace cmake and cpack binaries |   # Replace cmake and cpack binaries | ||||||
|   # |   # | ||||||
|   cd /usr/bin && \ |   cd /usr/bin && \ | ||||||
|   rm cmake cpack && \ |   rm cmake cpack && \ | ||||||
|   ln -s /usr/src/mxe/usr/bin/${MXE_TARGET_ARCH}-w64-mingw32.${MXE_TARGET_LINK}${MXE_TARGET_THREAD}-cmake cmake && \ |   ln -s /usr/src/mxe/usr/bin/${MXE_TARGET_ARCH}-w64-mingw32.${MXE_TARGET_LINK}${MXE_TARGET_THREAD}-cmake cmake && \ | ||||||
|   ln -s /usr/src/mxe/usr/bin/${MXE_TARGET_ARCH}-w64-mingw32.${MXE_TARGET_LINK}${MXE_TARGET_THREAD}-cpack cpack |   ln -s /usr/src/mxe/usr/bin/${MXE_TARGET_ARCH}-w64-mingw32.${MXE_TARGET_LINK}${MXE_TARGET_THREAD}-cpack cpack && \ | ||||||
|  |   # | ||||||
|  |   # clean up temporary wine files | ||||||
|  |   # | ||||||
|  |   rm -rf /tmp/wine-* | ||||||
|  |  | ||||||
| ENV PATH ${PATH}:/usr/src/mxe/usr/bin | ENV PATH ${PATH}:/usr/src/mxe/usr/bin | ||||||
| ENV CROSS_TRIPLE ${MXE_TARGET_ARCH}-w64-mingw32.${MXE_TARGET_LINK}${MXE_TARGET_THREAD} | ENV CROSS_TRIPLE ${MXE_TARGET_ARCH}-w64-mingw32.${MXE_TARGET_LINK}${MXE_TARGET_THREAD} | ||||||
|   | |||||||
| @@ -759,7 +759,7 @@ CT_ISL_V_0_24=y | |||||||
| # CT_ISL_V_0_16 is not set | # CT_ISL_V_0_16 is not set | ||||||
| # CT_ISL_V_0_15 is not set | # CT_ISL_V_0_15 is not set | ||||||
| CT_ISL_VERSION="0.24" | CT_ISL_VERSION="0.24" | ||||||
| CT_ISL_MIRRORS="http://ftp.slackware.com/pub/slackware/slackware64-current/source/l/isl" | CT_ISL_MIRRORS="https://libisl.sourceforge.io" | ||||||
| CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}" | CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}" | ||||||
| CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" | CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" | ||||||
| CT_ISL_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz" | CT_ISL_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz" | ||||||
|   | |||||||
| @@ -757,7 +757,7 @@ CT_ISL_V_0_24=y | |||||||
| # CT_ISL_V_0_16 is not set | # CT_ISL_V_0_16 is not set | ||||||
| # CT_ISL_V_0_15 is not set | # CT_ISL_V_0_15 is not set | ||||||
| CT_ISL_VERSION="0.24" | CT_ISL_VERSION="0.24" | ||||||
| CT_ISL_MIRRORS="http://ftp.slackware.com/pub/slackware/slackware64-current/source/l/isl" | CT_ISL_MIRRORS="https://libisl.sourceforge.io" | ||||||
| CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}" | CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}" | ||||||
| CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" | CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" | ||||||
| CT_ISL_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz" | CT_ISL_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz" | ||||||
|   | |||||||
| @@ -766,7 +766,7 @@ CT_ISL_V_0_24=y | |||||||
| # CT_ISL_V_0_16 is not set | # CT_ISL_V_0_16 is not set | ||||||
| # CT_ISL_V_0_15 is not set | # CT_ISL_V_0_15 is not set | ||||||
| CT_ISL_VERSION="0.24" | CT_ISL_VERSION="0.24" | ||||||
| CT_ISL_MIRRORS="http://ftp.slackware.com/pub/slackware/slackware64-current/source/l/isl" | CT_ISL_MIRRORS="https://libisl.sourceforge.io" | ||||||
| CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}" | CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}" | ||||||
| CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" | CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" | ||||||
| CT_ISL_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz" | CT_ISL_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz" | ||||||
|   | |||||||
| @@ -771,7 +771,7 @@ CT_ISL_V_0_24=y | |||||||
| # CT_ISL_V_0_16 is not set | # CT_ISL_V_0_16 is not set | ||||||
| # CT_ISL_V_0_15 is not set | # CT_ISL_V_0_15 is not set | ||||||
| CT_ISL_VERSION="0.24" | CT_ISL_VERSION="0.24" | ||||||
| CT_ISL_MIRRORS="http://ftp.slackware.com/pub/slackware/slackware64-current/source/l/isl" | CT_ISL_MIRRORS="https://libisl.sourceforge.io" | ||||||
| CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}" | CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}" | ||||||
| CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" | CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" | ||||||
| CT_ISL_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz" | CT_ISL_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz" | ||||||
|   | |||||||
| @@ -772,7 +772,7 @@ CT_ISL_V_0_24=y | |||||||
| # CT_ISL_V_0_16 is not set | # CT_ISL_V_0_16 is not set | ||||||
| # CT_ISL_V_0_15 is not set | # CT_ISL_V_0_15 is not set | ||||||
| CT_ISL_VERSION="0.24" | CT_ISL_VERSION="0.24" | ||||||
| CT_ISL_MIRRORS="http://ftp.slackware.com/pub/slackware/slackware64-current/source/l/isl" | CT_ISL_MIRRORS="https://libisl.sourceforge.io" | ||||||
| CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}" | CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}" | ||||||
| CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" | CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" | ||||||
| CT_ISL_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz" | CT_ISL_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz" | ||||||
|   | |||||||
| @@ -773,7 +773,7 @@ CT_ISL_V_0_24=y | |||||||
| # CT_ISL_V_0_16 is not set | # CT_ISL_V_0_16 is not set | ||||||
| # CT_ISL_V_0_15 is not set | # CT_ISL_V_0_15 is not set | ||||||
| CT_ISL_VERSION="0.24" | CT_ISL_VERSION="0.24" | ||||||
| CT_ISL_MIRRORS="http://ftp.slackware.com/pub/slackware/slackware64-current/source/l/isl" | CT_ISL_MIRRORS="https://libisl.sourceforge.io" | ||||||
| CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}" | CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}" | ||||||
| CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" | CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" | ||||||
| CT_ISL_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz" | CT_ISL_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz" | ||||||
|   | |||||||
| @@ -773,7 +773,7 @@ CT_ISL_V_0_24=y | |||||||
| # CT_ISL_V_0_16 is not set | # CT_ISL_V_0_16 is not set | ||||||
| # CT_ISL_V_0_15 is not set | # CT_ISL_V_0_15 is not set | ||||||
| CT_ISL_VERSION="0.24" | CT_ISL_VERSION="0.24" | ||||||
| CT_ISL_MIRRORS="http://ftp.slackware.com/pub/slackware/slackware64-current/source/l/isl" | CT_ISL_MIRRORS="https://libisl.sourceforge.io" | ||||||
| CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}" | CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}" | ||||||
| CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" | CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" | ||||||
| CT_ISL_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz" | CT_ISL_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz" | ||||||
|   | |||||||
| @@ -773,7 +773,7 @@ CT_ISL_V_0_24=y | |||||||
| # CT_ISL_V_0_16 is not set | # CT_ISL_V_0_16 is not set | ||||||
| # CT_ISL_V_0_15 is not set | # CT_ISL_V_0_15 is not set | ||||||
| CT_ISL_VERSION="0.24" | CT_ISL_VERSION="0.24" | ||||||
| CT_ISL_MIRRORS="http://ftp.slackware.com/pub/slackware/slackware64-current/source/l/isl" | CT_ISL_MIRRORS="https://libisl.sourceforge.io" | ||||||
| CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}" | CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}" | ||||||
| CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" | CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" | ||||||
| CT_ISL_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz" | CT_ISL_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz" | ||||||
|   | |||||||
| @@ -682,7 +682,7 @@ CT_ISL_V_0_24=y | |||||||
| # CT_ISL_V_0_16 is not set | # CT_ISL_V_0_16 is not set | ||||||
| # CT_ISL_V_0_15 is not set | # CT_ISL_V_0_15 is not set | ||||||
| CT_ISL_VERSION="0.24" | CT_ISL_VERSION="0.24" | ||||||
| CT_ISL_MIRRORS="http://ftp.slackware.com/pub/slackware/slackware64-current/source/l/isl" | CT_ISL_MIRRORS="https://libisl.sourceforge.io" | ||||||
| CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}" | CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}" | ||||||
| CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" | CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" | ||||||
| CT_ISL_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz" | CT_ISL_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz" | ||||||
|   | |||||||
| @@ -758,7 +758,7 @@ CT_ISL_V_0_24=y | |||||||
| # CT_ISL_V_0_16 is not set | # CT_ISL_V_0_16 is not set | ||||||
| # CT_ISL_V_0_15 is not set | # CT_ISL_V_0_15 is not set | ||||||
| CT_ISL_VERSION="0.24" | CT_ISL_VERSION="0.24" | ||||||
| CT_ISL_MIRRORS="http://ftp.slackware.com/pub/slackware/slackware64-current/source/l/isl" | CT_ISL_MIRRORS="https://libisl.sourceforge.io" | ||||||
| CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}" | CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}" | ||||||
| CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" | CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" | ||||||
| CT_ISL_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz" | CT_ISL_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz" | ||||||
|   | |||||||
| @@ -754,7 +754,7 @@ CT_ISL_V_0_24=y | |||||||
| # CT_ISL_V_0_16 is not set | # CT_ISL_V_0_16 is not set | ||||||
| # CT_ISL_V_0_15 is not set | # CT_ISL_V_0_15 is not set | ||||||
| CT_ISL_VERSION="0.24" | CT_ISL_VERSION="0.24" | ||||||
| CT_ISL_MIRRORS="http://ftp.slackware.com/pub/slackware/slackware64-current/source/l/isl" | CT_ISL_MIRRORS="https://libisl.sourceforge.io" | ||||||
| CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}" | CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}" | ||||||
| CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" | CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" | ||||||
| CT_ISL_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz" | CT_ISL_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz" | ||||||
|   | |||||||
| @@ -798,7 +798,7 @@ CT_ISL_V_0_24=y | |||||||
| # CT_ISL_V_0_16 is not set | # CT_ISL_V_0_16 is not set | ||||||
| # CT_ISL_V_0_15 is not set | # CT_ISL_V_0_15 is not set | ||||||
| CT_ISL_VERSION="0.24" | CT_ISL_VERSION="0.24" | ||||||
| CT_ISL_MIRRORS="http://ftp.slackware.com/pub/slackware/slackware64-current/source/l/isl" | CT_ISL_MIRRORS="https://libisl.sourceforge.io" | ||||||
| CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}" | CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}" | ||||||
| CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" | CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" | ||||||
| CT_ISL_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz" | CT_ISL_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz" | ||||||
|   | |||||||
| @@ -798,7 +798,7 @@ CT_ISL_V_0_24=y | |||||||
| # CT_ISL_V_0_16 is not set | # CT_ISL_V_0_16 is not set | ||||||
| # CT_ISL_V_0_15 is not set | # CT_ISL_V_0_15 is not set | ||||||
| CT_ISL_VERSION="0.24" | CT_ISL_VERSION="0.24" | ||||||
| CT_ISL_MIRRORS="http://ftp.slackware.com/pub/slackware/slackware64-current/source/l/isl" | CT_ISL_MIRRORS="https://libisl.sourceforge.io" | ||||||
| CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}" | CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}" | ||||||
| CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" | CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" | ||||||
| CT_ISL_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz" | CT_ISL_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz" | ||||||
|   | |||||||
| @@ -721,7 +721,7 @@ CT_ISL_V_0_24=y | |||||||
| # CT_ISL_V_0_16 is not set | # CT_ISL_V_0_16 is not set | ||||||
| # CT_ISL_V_0_15 is not set | # CT_ISL_V_0_15 is not set | ||||||
| CT_ISL_VERSION="0.24" | CT_ISL_VERSION="0.24" | ||||||
| CT_ISL_MIRRORS="http://ftp.slackware.com/pub/slackware/slackware64-current/source/l/isl" | CT_ISL_MIRRORS="https://libisl.sourceforge.io" | ||||||
| CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}" | CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}" | ||||||
| CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" | CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" | ||||||
| CT_ISL_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz" | CT_ISL_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz" | ||||||
|   | |||||||
| @@ -686,7 +686,7 @@ CT_ISL_V_0_24=y | |||||||
| # CT_ISL_V_0_16 is not set | # CT_ISL_V_0_16 is not set | ||||||
| # CT_ISL_V_0_15 is not set | # CT_ISL_V_0_15 is not set | ||||||
| CT_ISL_VERSION="0.24" | CT_ISL_VERSION="0.24" | ||||||
| CT_ISL_MIRRORS="http://ftp.slackware.com/pub/slackware/slackware64-current/source/l/isl" | CT_ISL_MIRRORS="https://libisl.sourceforge.io" | ||||||
| CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}" | CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}" | ||||||
| CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" | CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" | ||||||
| CT_ISL_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz" | CT_ISL_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz" | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user