mirror of
				https://github.com/bensuperpc/dockcross.git
				synced 2025-11-04 09:56:23 +01:00 
			
		
		
		
	Compare commits
	
		
			1 Commits
		
	
	
		
			add_clang_
			...
			update_lin
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 0a2b4d8ebf | 
							
								
								
									
										2
									
								
								.github/workflows/main.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/main.yml
									
									
									
									
										vendored
									
									
								
							@@ -41,7 +41,7 @@ jobs:
 | 
			
		||||
    strategy:
 | 
			
		||||
      fail-fast: false
 | 
			
		||||
      matrix:
 | 
			
		||||
        arch_name: [android-arm, android-arm64, android-x86, android-x86_64, web-wasm, linux-arm64, linux-arm64-musl, linux-armv5, linux-armv5-musl, linux-armv6, linux-armv6-musl, linux-armv7, linux-armv7a, linux-armv7l-musl, linux-x64-clang, linux-s390x, linux-x64, linux-x86, linux-ppc64le, manylinux1-x64, manylinux1-x86, manylinux2010-x64, manylinux2010-x86, manylinux2014-x64, manylinux2014-x86, manylinux2014-aarch64, windows-static-x64, windows-static-x64-posix, windows-static-x86, windows-shared-x64, windows-shared-x64-posix, windows-shared-x86]
 | 
			
		||||
        arch_name: [android-arm, android-arm64, android-x86, android-x86_64, web-wasm, linux-arm64, linux-arm64-musl, linux-armv5, linux-armv5-musl, linux-armv6, linux-armv6-musl, linux-armv7, linux-armv7a, linux-armv7l-musl, linux-s390x, linux-x64, linux-x86, linux-ppc64le, manylinux1-x64, manylinux1-x86, manylinux2010-x64, manylinux2010-x86, manylinux2014-x64, manylinux2014-x86, manylinux2014-aarch64, windows-static-x64, windows-static-x64-posix, windows-static-x86, windows-shared-x64, windows-shared-x64-posix, windows-shared-x86]
 | 
			
		||||
    steps:
 | 
			
		||||
      - uses: actions/checkout@v2
 | 
			
		||||
      - uses: actions/download-artifact@v2
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										4
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								Makefile
									
									
									
									
									
								
							@@ -13,10 +13,10 @@ ORG = dockcross
 | 
			
		||||
BIN = ./bin
 | 
			
		||||
 | 
			
		||||
# These images are built using the "build implicit rule"
 | 
			
		||||
STANDARD_IMAGES = linux-s390x android-arm android-arm64 android-x86 android-x86_64 linux-x86 linux-x64 linux-x64-clang linux-arm64 linux-arm64-musl linux-armv5 linux-armv5-musl linux-armv6 linux-armv6-musl linux-armv7 linux-armv7a linux-armv7l-musl linux-mips linux-mipsel linux-ppc64le windows-static-x86 windows-static-x64 windows-static-x64-posix windows-shared-x86 windows-shared-x64 windows-shared-x64-posix
 | 
			
		||||
STANDARD_IMAGES = linux-s390x android-arm android-arm64 android-x86 android-x86_64 linux-x86 linux-x64 linux-arm64 linux-arm64-musl linux-armv5 linux-armv5-musl linux-armv6 linux-armv6-musl linux-armv7 linux-armv7a linux-armv7l-musl linux-mips linux-mipsel linux-ppc64le windows-static-x86 windows-static-x64 windows-static-x64-posix windows-shared-x86 windows-shared-x64 windows-shared-x64-posix
 | 
			
		||||
 | 
			
		||||
# Generated Dockerfiles.
 | 
			
		||||
GEN_IMAGES = linux-s390x android-arm android-arm64 linux-x86 linux-x64 linux-x64-clang linux-mips linux-mipsel manylinux1-x64 manylinux1-x86 manylinux2010-x64 manylinux2010-x86 manylinux2014-x64 manylinux2014-x86 manylinux2014-aarch64 web-wasm linux-arm64 linux-arm64-musl windows-static-x86 windows-static-x64 windows-static-x64-posix windows-shared-x86 windows-shared-x64 windows-shared-x64-posix linux-armv7 linux-armv7a linux-armv7l-musl linux-armv6 linux-armv6-musl linux-armv5 linux-armv5-musl linux-ppc64le
 | 
			
		||||
GEN_IMAGES = linux-s390x android-arm android-arm64 linux-x86 linux-x64 linux-mips linux-mipsel manylinux1-x64 manylinux1-x86 manylinux2010-x64 manylinux2010-x86 manylinux2014-x64 manylinux2014-x86 manylinux2014-aarch64 web-wasm linux-arm64 linux-arm64-musl windows-static-x86 windows-static-x64 windows-static-x64-posix windows-shared-x86 windows-shared-x64 windows-shared-x64-posix linux-armv7 linux-armv7a linux-armv7l-musl linux-armv6 linux-armv6-musl linux-armv5 linux-armv5-musl linux-ppc64le
 | 
			
		||||
GEN_IMAGE_DOCKERFILES = $(addsuffix /Dockerfile,$(GEN_IMAGES))
 | 
			
		||||
 | 
			
		||||
# These images are expected to have explicit rules for *both* build and testing
 | 
			
		||||
 
 | 
			
		||||
@@ -223,12 +223,6 @@ dockcross/linux-x64
 | 
			
		||||
  |linux-x64-images| Linux x86_64 / amd64 compiler. Since the Docker image is
 | 
			
		||||
  natively x86_64, this is not actually a cross compiler.
 | 
			
		||||
 | 
			
		||||
.. |linux-x64-clang-images| image:: https://images.microbadger.com/badges/image/dockcross/linux-x64-clang.svg
 | 
			
		||||
  :target: https://microbadger.com/images/dockcross/linux-x64-clang
 | 
			
		||||
 | 
			
		||||
dockcross/linux-x64-clang
 | 
			
		||||
  |linux-x64-clang-images| Linux clang x86_64 / amd64 compiler. Since the Docker image is
 | 
			
		||||
  natively x86_64, this is not actually a cross compiler.
 | 
			
		||||
 | 
			
		||||
.. |linux-x86-images| image:: https://images.microbadger.com/badges/image/dockcross/linux-x86.svg
 | 
			
		||||
  :target: https://microbadger.com/images/dockcross/linux-x86
 | 
			
		||||
 
 | 
			
		||||
@@ -21,6 +21,10 @@ RUN apt-get update --yes && apt-get install --no-install-recommends --yes \
 | 
			
		||||
    help2man \
 | 
			
		||||
    python3-dev \
 | 
			
		||||
    texinfo \
 | 
			
		||||
# Packages needed for crosstool-ng 1.24 or higher 
 | 
			
		||||
    unzip \
 | 
			
		||||
    libtool \
 | 
			
		||||
    libtool-bin \
 | 
			
		||||
    && apt-get clean autoclean --yes \
 | 
			
		||||
    && apt-get autoremove --yes \
 | 
			
		||||
    && rm -rf /var/lib/{apt,dpkg,cache,log}/
 | 
			
		||||
 
 | 
			
		||||
@@ -2,21 +2,24 @@ FROM dockcross/base:latest
 | 
			
		||||
MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 | 
			
		||||
 | 
			
		||||
# Crosstool-ng version
 | 
			
		||||
ENV CT_VERSION crosstool-ng-1.23.0
 | 
			
		||||
# We use a git commit while waiting for 1.25 to release (1.24 is several years old)
 | 
			
		||||
ENV CT_VERSION 9e10cb6fbaab6d83e1305b2d53ab585d14989667
 | 
			
		||||
 | 
			
		||||
ENV QEMU_VERSION 6.0.0
 | 
			
		||||
 | 
			
		||||
#include "common.crosstool"
 | 
			
		||||
 | 
			
		||||
ENV CROSS_TRIPLE powerpc64le-linux-gnu
 | 
			
		||||
ENV CROSS_TRIPLE powerpc64le-unknown-linux-gnu
 | 
			
		||||
 | 
			
		||||
WORKDIR /usr/src
 | 
			
		||||
 | 
			
		||||
RUN apt-get install -y libglib2.0-dev zlib1g-dev libpixman-1-dev && \
 | 
			
		||||
  curl -L http://wiki.qemu-project.org/download/qemu-3.1.0.tar.bz2 | tar xj && \
 | 
			
		||||
  cd qemu-3.1.0 && \
 | 
			
		||||
  curl -L http://wiki.qemu-project.org/download/qemu-${QEMU_VERSION}.tar.bz2 | tar xj && \
 | 
			
		||||
  cd qemu-${QEMU_VERSION} && \
 | 
			
		||||
  ./configure --target-list=ppc64le-linux-user --prefix=/usr && \
 | 
			
		||||
  make -j$(nproc) && \
 | 
			
		||||
  make install && \
 | 
			
		||||
  cd .. && rm -rf qemu-3.1.0
 | 
			
		||||
  cd .. && rm -rf qemu-${QEMU_VERSION}
 | 
			
		||||
 | 
			
		||||
ENV CROSS_ROOT ${XCC_PREFIX}/${CROSS_TRIPLE}
 | 
			
		||||
ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
 | 
			
		||||
@@ -35,7 +38,7 @@ WORKDIR /work
 | 
			
		||||
COPY Toolchain.cmake /usr/lib/${CROSS_TRIPLE}/
 | 
			
		||||
ENV CMAKE_TOOLCHAIN_FILE /usr/lib/${CROSS_TRIPLE}/Toolchain.cmake
 | 
			
		||||
 | 
			
		||||
ENV PKG_CONFIG_PATH /usr/lib/powerpc64le-linux-gnu/pkgconfig
 | 
			
		||||
ENV PKG_CONFIG_PATH /usr/lib/powerpc64le-unknown-linux-gnu/pkgconfig
 | 
			
		||||
 | 
			
		||||
# Linux kernel cross compilation variables
 | 
			
		||||
ENV PATH ${PATH}:${CROSS_ROOT}/bin
 | 
			
		||||
 
 | 
			
		||||
@@ -2,7 +2,7 @@ set(CMAKE_SYSTEM_NAME Linux)
 | 
			
		||||
set(CMAKE_SYSTEM_VERSION 1)
 | 
			
		||||
set(CMAKE_SYSTEM_PROCESSOR ppc64le)
 | 
			
		||||
 | 
			
		||||
set(cross_triple "powerpc64le-linux-gnu")
 | 
			
		||||
set(cross_triple "powerpc64le-unknown-linux-gnu")
 | 
			
		||||
set(cross_root /usr/xcc/${cross_triple})
 | 
			
		||||
 | 
			
		||||
set(CMAKE_C_COMPILER $ENV{CC})
 | 
			
		||||
 
 | 
			
		||||
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							@@ -1,10 +0,0 @@
 | 
			
		||||
#------------------------------------------------------------------------------#
 | 
			
		||||
#                   OFFICIAL DEBIAN REPOS
 | 
			
		||||
#------------------------------------------------------------------------------#
 | 
			
		||||
 | 
			
		||||
###### Debian Main Repos
 | 
			
		||||
deb http://deb.debian.org/debian/ oldstable main contrib non-free
 | 
			
		||||
 | 
			
		||||
deb http://deb.debian.org/debian/ oldstable-updates main contrib non-free
 | 
			
		||||
 | 
			
		||||
deb http://deb.debian.org/debian-security oldstable/updates main
 | 
			
		||||
@@ -1,35 +0,0 @@
 | 
			
		||||
FROM dockcross/base:latest
 | 
			
		||||
MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 | 
			
		||||
 # flang
 | 
			
		||||
RUN echo "deb http://apt.llvm.org/buster/ llvm-toolchain-buster main" >> /etc/apt/sources.list \
 | 
			
		||||
    && echo "deb-src http://apt.llvm.org/buster/ llvm-toolchain-buster main" >> /etc/apt/sources.list \
 | 
			
		||||
    && wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add - \
 | 
			
		||||
    && apt-get update \
 | 
			
		||||
    && apt-get purge --autoremove -y gcc g++ software-properties-common \
 | 
			
		||||
    && apt-get -y install clang libc++-dev libc++abi-dev clang-format clang-tidy lldb \
 | 
			
		||||
    && apt-get clean --yes \
 | 
			
		||||
    && rm -rf /var/lib/apt/lists/* \
 | 
			
		||||
    && update-alternatives --install /usr/bin/cc cc /usr/bin/clang 90 \
 | 
			
		||||
    && update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++ 90 \
 | 
			
		||||
    && update-alternatives --install /usr/bin/cpp cpp /usr/bin/clang++ 90 \
 | 
			
		||||
    && cc --version \
 | 
			
		||||
    && c++ --version \
 | 
			
		||||
    && cpp --version
 | 
			
		||||
 | 
			
		||||
ENV CROSS_TRIPLE x86_64-linux-gnu
 | 
			
		||||
ENV CROSS_ROOT /usr/bin
 | 
			
		||||
ENV CC=/usr/bin/clang \
 | 
			
		||||
    CPP=/usr/bin/cpp \
 | 
			
		||||
    CXX=/usr/bin/clang++ \
 | 
			
		||||
    LD=/usr/bin/lld \
 | 
			
		||||
    FC=/usr/bin/flang
 | 
			
		||||
 | 
			
		||||
#    AS=/usr/bin/${CROSS_TRIPLE}-as
 | 
			
		||||
#    AR=/usr/bin/${CROSS_TRIPLE}-ar
 | 
			
		||||
 | 
			
		||||
COPY ${CROSS_TRIPLE}-noop.sh /usr/bin/${CROSS_TRIPLE}-noop
 | 
			
		||||
 | 
			
		||||
COPY Toolchain.cmake /usr/lib/${CROSS_TRIPLE}/
 | 
			
		||||
ENV CMAKE_TOOLCHAIN_FILE /usr/lib/${CROSS_TRIPLE}/Toolchain.cmake
 | 
			
		||||
 | 
			
		||||
#include "common.label-and-env"
 | 
			
		||||
@@ -1,12 +0,0 @@
 | 
			
		||||
set(CMAKE_SYSTEM_NAME Linux)
 | 
			
		||||
set(CMAKE_SYSTEM_VERSION 1)
 | 
			
		||||
set(CMAKE_SYSTEM_PROCESSOR x86_64)
 | 
			
		||||
 | 
			
		||||
set(cross_triple "x86_64-linux-gnu")
 | 
			
		||||
 | 
			
		||||
set(CMAKE_C_COMPILER $ENV{CC})
 | 
			
		||||
set(CMAKE_CXX_COMPILER $ENV{CXX})
 | 
			
		||||
set(CMAKE_Fortran_COMPILER $ENV{FC})
 | 
			
		||||
set(CMAKE_ASM_COMPILER ${CMAKE_C_COMPILER})
 | 
			
		||||
 | 
			
		||||
set(CMAKE_CROSSCOMPILING_EMULATOR /usr/bin/${cross_triple}-noop)
 | 
			
		||||
@@ -1,2 +0,0 @@
 | 
			
		||||
#!/bin/sh
 | 
			
		||||
exec "$@"
 | 
			
		||||
		Reference in New Issue
	
	Block a user