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.

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

Upgrade ARM gcc to v13 #57

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions packages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,7 @@ staging_to_target() {

# cleanup unused data
cd ${STAGING_TO_TARGET_DIR}
for name in libexec/gcc lib/gcc lib/cmake include man arm-linux-gnueabihf; do
for name in libexec/gcc lib/gcc lib/cmake include man arm-linux-gnueabihf arm-none-linux-gnueabihf; do
echo "rm usr/${name}"
rm -rf usr/${name}
done
Expand All @@ -497,7 +497,7 @@ staging_to_target() {

# delete unused compilers in target dir
cd ${STAGING_TO_TARGET_DIR}/usr/bin
rm gcov* gcc* g++ cpp c++ arm-linux-gnueabihf-*
rm gcov* gcc* g++ cpp c++ arm-linux-gnueabihf-* arm-none-linux-gnueabihf-* lto-dump

# remove .la and .pc files
echo "cd ${STAGING_TO_TARGET_DIR}/${INSTALL_PREFIX}"
Expand Down
2 changes: 1 addition & 1 deletion packages/alsa-firmware/package.mk
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PACKAGE_NAME="Advanced Linux Sound Architecture - firmware"
PACKAGE_VERSION="1.2.4"
PACKAGE_VERSION="1.2.10"
PACKAGE_SRC="https://www.alsa-project.org/files/pub/firmware/alsa-firmware-${PACKAGE_VERSION}.tar.bz2"

configure_package() {
Expand Down
16 changes: 14 additions & 2 deletions packages/alsa-lib/package.mk
Original file line number Diff line number Diff line change
@@ -1,15 +1,27 @@
PACKAGE_NAME="Advanced Linux Sound Architecture"
PACKAGE_VERSION="1.2.4"
PACKAGE_VERSION="1.2.10"
PACKAGE_SRC="https://www.alsa-project.org/files/pub/lib/alsa-lib-${PACKAGE_VERSION}.tar.bz2"

configure_package() {
CC="${BUILD_CC}" CXX="${BUILD_CXX}" CFLAGS="${BUILD_CFLAGS}" CXXFLAGS="${BUILD_CFLAGS}" CPPFLAGS="${BUILD_CFLAGS}" LDFLAGS="${BUILD_LDFLAGS}" PKG_CONFIG_LIBDIR="${BUILD_PKG_CONFIG_LIBDIR}" PKG_CONFIG_SYSROOT_DIR="${BUILD_PKG_CONFIG_SYSROOT_DIR}" ./configure --prefix=${INSTALL_PREFIX} --build=${MACHTYPE} --host=${BUILD_TARGET}
CC="${BUILD_CC}" CFLAGS="${BUILD_CFLAGS}" LDFLAGS="${BUILD_LDFLAGS}" \
CXX="${BUILD_CXX}" CXXFLAGS="${BUILD_CFLAGS}" CPPFLAGS="${BUILD_CFLAGS}" \
PKG_CONFIG_LIBDIR="${BUILD_PKG_CONFIG_LIBDIR}" \
PKG_CONFIG_SYSROOT_DIR="${BUILD_PKG_CONFIG_SYSROOT_DIR}" \
./configure \
--prefix=${INSTALL_PREFIX} --build=${MACHTYPE} --host=${BUILD_TARGET} \
--with-sysroot=${STAGING_DIR} \
--enable-shared=yes --enable-static=no --with-pic
}

make_package() {
make -j${MAKE_JOBS}
}

preinstall_package() {
echo_warning "dirty patching libatopology.la to fix build"
sed -i 's! =/usr/lib/libasound.la!!' ${PACKAGE_SRC_DIR}/src/topology/.libs/libatopology.lai
}

install_package() {
make DESTDIR=${STAGING_DIR} install
}
2 changes: 1 addition & 1 deletion packages/alsa-plugins/package.mk
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PACKAGE_NAME="Advanced Linux Sound Architecture - Plugins"
PACKAGE_VERSION="1.2.2"
PACKAGE_VERSION="1.2.7.1"
PACKAGE_SRC="https://www.alsa-project.org/files/pub/plugins/alsa-plugins-${PACKAGE_VERSION}.tar.bz2"
PACKAGE_DEPENDS="alsa-lib"

Expand Down
9 changes: 7 additions & 2 deletions packages/alsa-utils/package.mk
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
PACKAGE_NAME="Advanced Linux Sound Architecture - Utils"
PACKAGE_VERSION="1.2.4"
PACKAGE_VERSION="1.2.10"
PACKAGE_SRC="https://www.alsa-project.org/files/pub/utils/alsa-utils-${PACKAGE_VERSION}.tar.bz2"
PACKAGE_DEPENDS="ncurses"

configure_package() {
CC="${BUILD_CC}" CXX="${BUILD_CXX}" CFLAGS="${BUILD_CFLAGS}" CXXFLAGS="${BUILD_CFLAGS}" CPPFLAGS="${BUILD_CFLAGS}" LDFLAGS="${BUILD_LDFLAGS}" PKG_CONFIG_LIBDIR="${BUILD_PKG_CONFIG_LIBDIR}" PKG_CONFIG_SYSROOT_DIR="${BUILD_PKG_CONFIG_SYSROOT_DIR}" ./configure --prefix=${INSTALL_PREFIX} --build=${MACHTYPE} --host=${BUILD_TARGET}
CC="${BUILD_CC} -fPIC" CFLAGS="${BUILD_CFLAGS}" LDFLAGS="${BUILD_LDFLAGS}" \
CXX="${BUILD_CXX}" CXXFLAGS="${BUILD_CFLAGS}" CPPFLAGS="${BUILD_CFLAGS}" \
PKG_CONFIG_LIBDIR="${BUILD_PKG_CONFIG_LIBDIR}" \
PKG_CONFIG_SYSROOT_DIR="${BUILD_PKG_CONFIG_SYSROOT_DIR}" \
./configure --prefix=${INSTALL_PREFIX} --build=${MACHTYPE} --host=${BUILD_TARGET} \
--with-sysroot=${STAGING_DIR}
}

make_package() {
Expand Down
2 changes: 1 addition & 1 deletion packages/alsa/package.mk
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
PACKAGE_NAME="Advanced Linux Sound Architecture"
PACKAGE_VERSION="1.2.4"
PACKAGE_VERSION="1.2.10"
PACKAGE_DEPENDS="glibc gcc alsa-lib alsa-utils alsa-plugins"
4 changes: 2 additions & 2 deletions packages/espeak-ng/package.mk
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
PACKAGE_NAME="espeak-ng"
PACKAGE_VERSION="1.50"
PACKAGE_SRC="https://github.com/espeak-ng/espeak-ng/releases/download/${PACKAGE_VERSION}/espeak-ng-${PACKAGE_VERSION}.tgz"
PACKAGE_VERSION="1.51"
PACKAGE_SRC="https://github.com/espeak-ng/espeak-ng/archive/refs/tags/${PACKAGE_VERSION}.tar.gz"
PACKAGE_DEPENDS="base glibc"
LANGUAGES_TO_INSTALL="es en ca"

Expand Down
2 changes: 1 addition & 1 deletion packages/gcc/package.mk
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PACKAGE_NAME="GCC"
PACKAGE_VERSION="7.4.0"
PACKAGE_VERSION="13.2.0"
PACKAGE_SRC="https://ftp.gnu.org/gnu/gcc/gcc-${PACKAGE_VERSION}/gcc-${PACKAGE_VERSION}.tar.xz"
PACKAGE_USE_SEPARATE_BUILD_DIR="true"

Expand Down
2 changes: 1 addition & 1 deletion packages/gdbm/package.mk
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PACKAGE_NAME="GNU dbm"
PACKAGE_VERSION="1.18.1"
PACKAGE_VERSION="1.23"
PACKAGE_SRC="https://ftp.gnu.org/gnu/gdbm/gdbm-${PACKAGE_VERSION}.tar.gz"

configure_package() {
Expand Down
4 changes: 2 additions & 2 deletions packages/glib/package.mk
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
PACKAGE_NAME="GLib"
PACKAGE_VERSION="2.68.2"
PACKAGE_VERSION="2.73.0"
PACKAGE_SRC="https://github.com/GNOME/glib/archive/refs/tags/${PACKAGE_VERSION}.tar.gz"
PACKAGE_DEPENDS="libffi zlib"
PACKAGE_USE_SEPARATE_BUILD_DIR="true"

configure_package() {
PKG_CONFIG_LIBDIR="${BUILD_PKG_CONFIG_LIBDIR}" PKG_CONFIG_SYSROOT_DIR="${BUILD_PKG_CONFIG_SYSROOT_DIR}" \
meson --cross-file ${TOOLCHAIN_MESON} ${PACKAGE_SRC_DIR} \
meson setup --cross-file ${TOOLCHAIN_MESON} ${PACKAGE_SRC_DIR} \
_build \
--prefix=${INSTALL_PREFIX} -Dlibmount=disabled -Dinstalled_tests=false
}
Expand Down
2 changes: 1 addition & 1 deletion packages/glibc/package.mk
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PACKAGE_NAME="GNU C Library"
PACKAGE_VERSION="2.27"
PACKAGE_VERSION="2.38"

[ "${BUILD_MODEL}" = "S12" ] && PACKAGE_VERSION="2.19"

Expand Down
2 changes: 1 addition & 1 deletion packages/mpd/package.mk
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PACKAGE_NAME="MPD"
PACKAGE_VERSION="0.22.10"
PACKAGE_VERSION="0.23.15"
PACKAGE_DEPENDS="curl alsa-lib flac opus libvorbis libogg faad2 libsndfile lame libid3tag soxr libao libshout chromaprint boost avahi libnfs yajl pcre sqlite3 sndio libupnp ffmpeg zziplib bzip2 libmpdclient"
PACKAGE_SRC="https://github.com/MusicPlayerDaemon/MPD/archive/refs/tags/v${PACKAGE_VERSION}.tar.gz"
PACKAGE_USE_SEPARATE_BUILD_DIR="true"
Expand Down
2 changes: 1 addition & 1 deletion packages/pycopy/package.mk
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ make_package() {
install_package() {
make DESTDIR=${STAGING_DIR} PREFIX=${STAGING_DIR}/usr install V=1 \
CROSS_COMPILE=${BUILD_TARGET}- CC="${BUILD_CC}" \
CFLAGS_EXTRA="${BUILD_CFLAGS}" LDFLAGS_EXTRA="${BUILD_LDFLAGS}"
CFLAGS_EXTRA="${BUILD_CFLAGS} -Wno-error=enum-int-mismatch" LDFLAGS_EXTRA="${BUILD_LDFLAGS}"
}

postinstall_package() {
Expand Down
4 changes: 2 additions & 2 deletions packages/snapcast/package.mk
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
PACKAGE_NAME="Snapcast"
PACKAGE_VERSION="0.25.0"
PACKAGE_VERSION="0.27.0"
PACKAGE_SRC="https://github.com/badaix/snapcast/archive/v${PACKAGE_VERSION}.tar.gz"
PACKAGE_DEPENDS="alsa libvorbis opus flac soxr avahi expat"
BOOST_VERSION="1.76.0"
BOOST_VERSION="1.84.0"
BOOST="boost_${BOOST_VERSION//./_}"
BUILD_TARGETS="server client"

Expand Down
10 changes: 10 additions & 0 deletions packages/snapcast/patches/cstdint.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
--- a/common/sample_format.hpp 2024-01-12 14:11:35.041836115 +0100
+++ b/common/sample_format.hpp 2024-01-12 14:11:50.401846387 +0100
@@ -20,6 +20,7 @@
#define SAMPLE_FORMAT_H

#include <string>
+#include <cstdint>


/**
23 changes: 14 additions & 9 deletions packages/toolchain/package.mk
Original file line number Diff line number Diff line change
@@ -1,25 +1,30 @@
PACKAGE_NAME="GNU Toolchain for the A-profile Architecture"
PACKAGE_VERSION="7.4.1-2019.02"
PACKAGE_SUBVERSION="7.4-2019.02"
BUILD_TARGET="arm-linux-gnueabihf"
PACKAGE_VERSION="13.2.rel1" # 2023.11
#PACKAGE_SUBVERSION="7.4-2019.02"
BUILD_TARGET="arm-none-linux-gnueabihf"

if [ "${BUILD_ARCH}" = "aarch64" ] || [ "${MODEL}" = "S12" ]; then
BUILD_TARGET="aarch64-linux-gnu"
fi

PACKAGE_SRC="https://releases.linaro.org/components/toolchain/binaries/${PACKAGE_SUBVERSION}/${BUILD_TARGET}/gcc-linaro-${PACKAGE_VERSION}-x86_64_${BUILD_TARGET}.tar.xz"

if [ "${HOST_ARCH}" = "aarch64" ]; then
PACKAGE_VERSION="10.2-2020.11"
PACKAGE_SRC="https://developer.arm.com/-/media/Files/downloads/gnu-a/${PACKAGE_VERSION}/binrel/gcc-arm-${PACKAGE_VERSION}-aarch64-arm-none-linux-gnueabihf.tar.xz"
fi

#PACKAGE_SRC="https://releases.linaro.org/components/toolchain/binaries/7.4-2019.02/arm-linux-gnueabihf/gcc-linaro-7.4.1-2019.02-x86_64_arm-linux-gnueabihf.tar.xz"
#PACKAGE_SRC="https://releases.linaro.org/components/toolchain/binaries/${PACKAGE_SUBVERSION}/${BUILD_TARGET}/gcc-linaro-${PACKAGE_VERSION}-x86_64_${BUILD_TARGET}.tar.xz"
PACKAGE_SRC="https://developer.arm.com/-/media/Files/downloads/gnu/${PACKAGE_VERSION}/binrel/arm-gnu-toolchain-${PACKAGE_VERSION}-x86_64-${BUILD_TARGET}.tar.xz"
# ?rev=adb0c0238c934aeeaa12c09609c5e6fc&hash=68DA67DE12CBAD82A0FA4B75247E866155C93053

on_exit_build() {
TOOLCHAIN_DIR=$(pwd)
case ${BUILD_ARCH} in
"armv7")
"arm")
BUILD_TARGET="arm-none-linux-gnueabihf"
BUILD_LDFLAGS="-L${STAGING_DIR}/${INSTALL_PREFIX}/lib -Wl,--rpath-link=${STAGING_DIR}/${INSTALL_PREFIX}/lib -Wl,--rpath-link=${STAGING_DIR}/${INSTALL_PREFIX}/lib/pulseaudio -Wl,--rpath-link=${STAGING_DIR}/${INSTALL_PREFIX}/lib/private -Wl,--rpath-link=${TOOLCHAIN_DIR}/${BUILD_TARGET}/libc/lib -Wl,--rpath=${INSTALL_PREFIX}/${BUILD_TARGET}/lib -Wl,--rpath=${INSTALL_PREFIX}/lib -Wl,--dynamic-linker=${INSTALL_PREFIX}/${BUILD_TARGET}/lib/ld-linux-armhf.so.3"
;;
"armv7")
LIBPATH="lib"
BUILD_TARGET="arm-none-linux-gnueabihf"

# using GCC-10
[[ "${HOST_ARCH}" = "aarch64" ]] && BUILD_TARGET="arm-none-linux-gnueabihf"

Expand Down
11 changes: 11 additions & 0 deletions packages/upmpdcli/patches/remove-statx.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- a/src/pathut.cpp 2023-09-11 14:58:07.000000000 +0200
+++ b/src/pathut.cpp 2024-01-11 18:29:45.347142294 +0100
@@ -1103,7 +1103,7 @@
#endif
}

-#if defined(STATX_TYPE)
+#if !defined(STATX_TYPE)

#include <sys/syscall.h>

Loading