From fdd4f167d6f8e048522c91e0b6bd0492311235f4 Mon Sep 17 00:00:00 2001 From: EnumDev Date: Mon, 14 Apr 2025 18:51:06 +0300 Subject: [PATCH] Update package version to 14.2.0, simplify source.sh, fix dependencies and add package license --- pkg.info | 7 +++---- source.sh | 39 ++++++++++++++++++++++++++++----------- 2 files changed, 31 insertions(+), 15 deletions(-) diff --git a/pkg.info b/pkg.info index 32c77f2..01e949d 100644 --- a/pkg.info +++ b/pkg.info @@ -1,10 +1,9 @@ name: gcc description: The GNU C Compiler -version: 13.2.0 -revision: 2 +version: 14.2.0 url: https://gcc.gnu.org/ license: GPL3-with-GCC-exception architecture: any -depends: ["bash","binutils","glibc","mpc","python3"] -make_depends: ["bash","binutils","coreutils","diffutils","findutils","gawk","gcc","gettext","glibc","gmp","grep","libxcrypt","m4","make","mpc","mpfr","patch","perl","sed","tar","texinfo","zstd"] +depends: ["binutils","gcc","mpc","zstd"] +make_depends: ["python3","dejagnu","expect","inetutils","tcl"] type: source diff --git a/source.sh b/source.sh index 7d1ad52..ab38fb2 100644 --- a/source.sh +++ b/source.sh @@ -15,17 +15,19 @@ prepare() { # The build function is executed in the source directory # This function is used to compile the source code build() { - sed -e '/m64=/s/lib64/lib/' \ - -i.orig gcc/config/i386/t-linux64 + # Install libraries to /usr/lib instead of /usr/lib64 + sed -e '/m64=/s/lib64/lib/' -i.orig gcc/config/i386/t-linux64 + mkdir build cd build - export PATH + ../configure --prefix=/usr \ --libdir=/usr/lib \ --libexecdir=/usr/libexec \ --enable-languages=c,c++ \ --enable-default-pie \ --enable-default-ssp \ + --enable-host-pie \ --disable-multilib \ --disable-bootstrap \ --disable-fixincludes \ @@ -37,21 +39,36 @@ build() { # This function is used to run tests to verify the package has been compiled correctly check() { cd build + + # Some tests are expected to fail. '|| true' will prevent the script from exiting if those fail make -k check || true + + # Get test results + "$BPM_SOURCE"/contrib/test_summary } # The package function is executed in the source directory # This function is used to move the compiled files into the output directory package() { cd build + make DESTDIR="$BPM_OUTPUT" install - ln -svr /usr/bin/cpp "$BPM_OUTPUT"/usr/lib - ln -sv gcc "$BPM_OUTPUT"/usr/bin/cc - ln -sv gcc.1 "$BPM_OUTPUT"/usr/share/man/man1/cc.1 + + # Symlink required by FHS + ln -sr /usr/bin/cpp "$BPM_OUTPUT"/usr/lib + + # Create 'cc' symlinks which is required by some packages + ln -s gcc "$BPM_OUTPUT"/usr/bin/cc + ln -s gcc.1 "$BPM_OUTPUT"/usr/share/man/man1/cc.1 + + # Compatibility symlink to enable building programs with Link Time Optimizations (LTO) mkdir -p "$BPM_OUTPUT"/usr/lib/bfd-plugins/ - ln -sfv ../../libexec/gcc/$(gcc -dumpmachine)/13.2.0/liblto_plugin.so "$BPM_OUTPUT"/usr/lib/bfd-plugins/ - mkdir -pv "$BPM_OUTPUT"/usr/share/gdb/auto-load/usr/lib - mv -v "$BPM_OUTPUT"/usr/lib/*gdb.py "$BPM_OUTPUT"/usr/share/gdb/auto-load/usr/lib - mkdir -p "$BPM_OUTPUT"/usr/share/licenses/gcc/ - cp "$BPM_SOURCE"/gcc/COPYING "$BPM_OUTPUT"/usr/share/licenses/gcc/COPYING + ln -sf ../../libexec/gcc/$(gcc -dumpmachine)/${BPM_PKG_VERSION}/liblto_plugin.so "$BPM_OUTPUT"/usr/lib/bfd-plugins/ + + # Move misplaced files + install -dm755 "$BPM_OUTPUT"/usr/share/gdb/auto-load/usr/lib + mv "$BPM_OUTPUT"/usr/lib/*gdb.py "$BPM_OUTPUT"/usr/share/gdb/auto-load/usr/lib + + # Install package license + install -Dm644 "$BPM_SOURCE"/gcc/COPYING "$BPM_OUTPUT"/usr/share/licenses/gcc/COPYING }