Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix libelf autoconf for unsupported architectures #107

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Fix libelf autoconf for unsupported architectures #107

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
57c03e8
Attempt to fix libelf autoconf
SonicMastr Jan 8, 2022
8953a9f
Merge branch 'vitasdk:master' into master
SonicMastr Mar 4, 2022
c3c65fd
Support 32bit in libzip
SonicMastr Mar 7, 2022
338755a
Update zlib to 1.2.12
SonicMastr Mar 29, 2022
46441a5
Update zlib.patch
SonicMastr Mar 29, 2022
4f8e435
Update zlib.patch
SonicMastr Mar 29, 2022
a8bc02e
Merge branch 'vitasdk:master' into master
SonicMastr May 17, 2022
5bd5afd
Bypass "patch detected" warning
SonicMastr May 28, 2022
2978ca9
Merge branch 'vitasdk:master' into master
SonicMastr Jan 4, 2023
faec515
Fix MacOS builds
SonicMastr Jan 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 43 additions & 23 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ function(toolchain_deps toolchain_deps_dir toolchain_install_dir toolchain_suffi
URL https://zlib.net/zlib-${ZLIB_VERSION}.tar.xz
URL_HASH ${ZLIB_HASH}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
PATCH_COMMAND patch -d <SOURCE_DIR> -p1 -t -N < ${PROJECT_SOURCE_DIR}/patches/zlib.patch
PATCH_COMMAND patch -d <SOURCE_DIR> -p1 -t -N < ${PROJECT_SOURCE_DIR}/patches/zlib.patch || true
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${toolchain_deps_dir}
${toolchain_cmake_args}
)
Expand Down Expand Up @@ -173,26 +173,46 @@ function(toolchain_deps toolchain_deps_dir toolchain_install_dir toolchain_suffi
GIT_REPOSITORY https://github.com/vitasdk/libzip
GIT_TAG ${LIBZIP_TAG}
${GIT_SHALLOW_SUPPORT}
PATCH_COMMAND patch -d <SOURCE_DIR> -p3 -t -N < ${PROJECT_SOURCE_DIR}/patches/libzip.patch
PATCH_COMMAND patch -d <SOURCE_DIR> -p3 -t -N < ${PROJECT_SOURCE_DIR}/patches/libzip.patch || true
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${toolchain_deps_dir}
${toolchain_cmake_args} ${libzip_configure}
-D_LARGEFILE_SOURCE=1
-D_FILE_OFFSET_BITS=64
-DZLIB_INCLUDE_DIR=${toolchain_deps_dir}/include
-DZLIB_LIBRARY=${toolchain_deps_dir}/lib/libz.a
)

ExternalProject_add(libelf${suffix}
URL https://github.com/vitasdk/artifacts/releases/download/libelf-${LIBELF_VERSION}/libelf-${LIBELF_VERSION}.tar.gz
URL_HASH ${LIBELF_HASH}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
PATCH_COMMAND patch -d <SOURCE_DIR> -p3 -t -N < ${PROJECT_SOURCE_DIR}/patches/libelf.patch
CONFIGURE_COMMAND autoreconf -i <SOURCE_DIR> COMMAND CC=${cc_compiler} RANLIB=${ranlib} ${compiler_flags} ${wrapper_command} <SOURCE_DIR>/configure
--build=${build_native}
--host=${toolchain_host}
--prefix=${toolchain_deps_dir}
--libdir=${toolchain_deps_dir}/lib
--disable-shared
--disable-nls
)

if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
ExternalProject_add(libelf${suffix}
URL https://github.com/vitasdk/artifacts/releases/download/libelf-${LIBELF_VERSION}/libelf-${LIBELF_VERSION}.tar.gz
URL_HASH ${LIBELF_HASH}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
PATCH_COMMAND patch -d <SOURCE_DIR> -p3 -t -N < ${PROJECT_SOURCE_DIR}/patches/libelf.patch || true
CONFIGURE_COMMAND autoreconf -i <SOURCE_DIR> COMMAND CC=${cc_compiler} RANLIB=${ranlib} ${compiler_flags} ${wrapper_command} <SOURCE_DIR>/configure
--build=${build_native}
--host=${toolchain_host}
--prefix=${toolchain_deps_dir}
--libdir=${toolchain_deps_dir}/lib
--disable-shared
--disable-nls
)
else()
ExternalProject_add(libelf${suffix}
URL https://github.com/vitasdk/artifacts/releases/download/libelf-${LIBELF_VERSION}/libelf-${LIBELF_VERSION}.tar.gz
URL_HASH ${LIBELF_HASH}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
PATCH_COMMAND patch -d <SOURCE_DIR> -p3 -t -N < ${PROJECT_SOURCE_DIR}/patches/libelf.patch || true
COMMAND ${CMAKE_COMMAND} -E copy /usr/share/misc/config.sub <SOURCE_DIR>
COMMAND ${CMAKE_COMMAND} -E copy /usr/share/misc/config.guess <SOURCE_DIR>
CONFIGURE_COMMAND autoreconf -i <SOURCE_DIR> COMMAND CC=${cc_compiler} RANLIB=${ranlib} ${compiler_flags} ${wrapper_command} <SOURCE_DIR>/configure
--build=${build_native}
--host=${toolchain_host}
--prefix=${toolchain_deps_dir}
--libdir=${toolchain_deps_dir}/lib
--disable-shared
--disable-nls
)
endif()

ExternalProject_add(libyaml${suffix}
URL http://pyyaml.org/download/libyaml/yaml-${LIBYAML_VERSION}.tar.gz
Expand Down Expand Up @@ -298,9 +318,9 @@ function(toolchain_deps toolchain_deps_dir toolchain_install_dir toolchain_suffi
URL_HASH ${BINUTILS_HASH}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
PATCH_COMMAND
patch -d <SOURCE_DIR> -p3 -t -N < ${PROJECT_SOURCE_DIR}/patches/binutils/0001-vita.patch
&& patch -d <SOURCE_DIR> -p1 -t -N < ${PROJECT_SOURCE_DIR}/patches/binutils/0002-fix-broken-reloc.patch
&& patch -d <SOURCE_DIR> -p3 -t -N < ${PROJECT_SOURCE_DIR}/patches/binutils/0003-fix-elf-vaddr.patch
patch -d <SOURCE_DIR> -p3 -t -N < ${PROJECT_SOURCE_DIR}/patches/binutils/0001-vita.patch || true
&& patch -d <SOURCE_DIR> -p1 -t -N < ${PROJECT_SOURCE_DIR}/patches/binutils/0002-fix-broken-reloc.patch || true
&& patch -d <SOURCE_DIR> -p3 -t -N < ${PROJECT_SOURCE_DIR}/patches/binutils/0003-fix-elf-vaddr.patch || true
CONFIGURE_COMMAND ${compiler_flags} ${wrapper_command} <SOURCE_DIR>/configure
--build=${build_native}
--host=${toolchain_host}
Expand All @@ -322,7 +342,7 @@ function(toolchain_deps toolchain_deps_dir toolchain_install_dir toolchain_suffi
URL https://ftp.gnu.org/gnu/gdb/gdb-${GDB_VERSION}.tar.xz
URL_HASH ${GDB_HASH}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
PATCH_COMMAND patch -d <SOURCE_DIR> -p1 -t -N < ${PROJECT_SOURCE_DIR}/patches/gdb.patch
PATCH_COMMAND patch -d <SOURCE_DIR> -p1 -t -N < ${PROJECT_SOURCE_DIR}/patches/gdb.patch || true
CONFIGURE_COMMAND ${compiler_flags} ${wrapper_command} <SOURCE_DIR>/configure
--build=${build_native}
--host=${toolchain_host}
Expand Down Expand Up @@ -462,7 +482,7 @@ ExternalProject_add(gcc-base
URL http://ftp.gnu.org/gnu/gcc/gcc-${GCC_VERSION}/gcc-${GCC_VERSION}.tar.xz
URL_HASH ${GCC_HASH}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
PATCH_COMMAND patch -d <SOURCE_DIR> -p1 -t -N < ${PROJECT_SOURCE_DIR}/patches/gcc/0001-gcc-8.patch
PATCH_COMMAND patch -d <SOURCE_DIR> -p1 -t -N < ${PROJECT_SOURCE_DIR}/patches/gcc/0001-gcc-8.patch || true
CONFIGURE_COMMAND ${compiler_flags} ${wrapper_command} <SOURCE_DIR>/configure
--build=${build_native}
# compile a native compiler so keep host == build
Expand Down Expand Up @@ -554,7 +574,7 @@ if(CMAKE_TOOLCHAIN_FILE)
URL http://ftp.gnu.org/gnu/gcc/gcc-${GCC_VERSION}/gcc-${GCC_VERSION}.tar.xz
URL_HASH ${GCC_HASH}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
PATCH_COMMAND patch -d <SOURCE_DIR> -p1 -t -N < ${PROJECT_SOURCE_DIR}/patches/gcc/0001-gcc-8.patch
PATCH_COMMAND patch -d <SOURCE_DIR> -p1 -t -N < ${PROJECT_SOURCE_DIR}/patches/gcc/0001-gcc-8.patch || true
CONFIGURE_COMMAND ${compiler_flags} ${toolchain_tools}
${wrapper_command} <SOURCE_DIR>/configure
--build=${build_native}
Expand Down Expand Up @@ -610,7 +630,7 @@ ExternalProject_add(gcc-final
URL http://ftp.gnu.org/gnu/gcc/gcc-${GCC_VERSION}/gcc-${GCC_VERSION}.tar.xz
URL_HASH ${GCC_HASH}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
PATCH_COMMAND patch -d <SOURCE_DIR> -p1 -t -N < ${PROJECT_SOURCE_DIR}/patches/gcc/0001-gcc-8.patch
PATCH_COMMAND patch -d <SOURCE_DIR> -p1 -t -N < ${PROJECT_SOURCE_DIR}/patches/gcc/0001-gcc-8.patch || true
CONFIGURE_COMMAND ${compiler_flags} ${toolchain_tools} ${compiler_target_tools}
${wrapper_command} <SOURCE_DIR>/configure
--build=${build_native}
Expand Down