Browse Source

updated 4 packages

binutils-2.42-2

gcc-14.1.1-2

glibc-2.39-3

vine-rpm-macros-9-1
Tomohiro "Tomo-p" KATO 4 months ago
parent
commit
a5baf71bfa
4 changed files with 56 additions and 26 deletions
  1. 23 16
      b/binutils/binutils-vl.spec
  2. 16 7
      g/gcc/gcc-vl.spec
  3. 8 2
      g/glibc/glibc-vl.spec
  4. 9 1
      v/vine-rpm-macros/vine-rpm-macros-vl.spec

+ 23 - 16
b/binutils/binutils-vl.spec

@@ -68,7 +68,7 @@ Summary:        A GNU collection of binary utilities.
 Summary(ja):    GNU 版バイナリユーティリティ集
 Name:           binutils
 Version:        2.42
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 Group:          programming
 Vendor:         Project Vine
 Distribution:   Vine Linux
@@ -84,7 +84,7 @@ Source2:        binutils-2.19.50.0.1-output-format.sed
 
 #----------------------------------------------------------------------------
 
-Patch00: binutils-%{version}-20240605.patch
+Patch00: binutils-%{version}-20240708.patch
 
 # Purpose:  Use /lib64 and /usr/lib64 instead of /lib and /usr/lib in the
 #           default library search path of 64-bit targets.
@@ -352,10 +352,6 @@ CARGS=
 CARGS="$CARGS --with-debuginfod"
 %endif
 
-%ifarch %{ix86} x86_64 ppc %{power64} s390 s390x sh3 sh4 sparc sparc64 arm aarch64 riscv64
-CARGS="$CARGS --enable-64-bit-bfd"
-%endif
-
 # Extra targets to build along with the default one.
 #
 # BZ 1920373: Enable PEP support for all targets as the PERF package's
@@ -378,6 +374,7 @@ CARGS="$CARGS --enable-warn-rwx-segments=yes"
 # We could optimize the cross builds size by --enable-shared but the produced
 # binaries may be less convenient in the embedded environment.
 %configure \
+  --quiet \
   --build=%{_target_platform} --host=%{_target_platform} \
   --target=%{binutils_target} \
 %ifarch %gold_arches
@@ -390,6 +387,7 @@ CARGS="$CARGS --enable-warn-rwx-segments=yes"
   --with-sysroot=/ \
 %else
   --enable-targets=%{_host} \
+  --enable-64-bit-bfd \
   --with-sysroot=%{_prefix}/%{binutils_target}/sys-root \
   --program-prefix=%{cross} \
 %endif
@@ -452,18 +450,23 @@ make %{_smp_mflags} tooldir=%{_prefix} info
 %if %{without testsuite}
 echo ====================TESTSUITE DISABLED=========================
 %else
-# The GOLD testsuite has lots of problems...
-make -k check < /dev/null || :
+rm -f check_error
+make -k check-gas check-binutils check-ld < /dev/null || echo "failed" > check_error
+# The GOLD testsuite always returns an error code, even if no tests fail.
+make -k check-gold < /dev/null || :
 echo ====================TESTING=========================
-cat {gas/testsuite/gas,ld/ld,binutils/binutils}.sum
-%if %{with gold}
+for f in {gas/testsuite/gas,ld/ld,binutils/binutils}.sum
+do
+if [ -f $f ]; then
+    cat $f
+fi
+done
 if [ -f gold/test-suite.log ]; then
     cat gold/test-suite.log
 fi
 if [ -f gold/testsuite/test-suite.log ]; then
     cat gold/testsuite/*.log
 fi
-%endif
 echo ====================TESTING END=====================
 for file in {gas/testsuite/gas,ld/ld,binutils/binutils}.{sum,log}
 do
@@ -472,14 +475,15 @@ done
 tar cjf binutils-%{_target_platform}.tar.xz  binutils-%{_target_platform}-*.{sum,log}
 uuencode binutils-%{_target_platform}.tar.xz binutils-%{_target_platform}.tar.xz
 rm -f binutils-%{_target_platform}.tar.xz    binutils-%{_target_platform}-*.{sum,log}
-%if %{with gold}
 if [ -f gold/testsuite/test-suite.log ]; then
   tar cjf  binutils-%{_target_platform}-gold.log.tar.xz gold/testsuite/*.log
   uuencode binutils-%{_target_platform}-gold.log.tar.xz binutils-%{_target_platform}-gold.log.tar.xz
   rm -f    binutils-%{_target_platform}-gold.log.tar.xz
 fi
 %endif
-%endif
+if [ -f check_error ]; then
+  exit 1
+fi
 
 
 %install
@@ -549,10 +553,10 @@ rm -f %{buildroot}%{_libdir}/lib{bfd,opcodes}.so
 # Remove libtool files, which reference the .so libs
 rm -f %{buildroot}%{_libdir}/*.la
 
-# Fix multilib conflicts of generated values by __WORDSIZE-based expressions.
-%ifarch %{ix86} x86_64 ppc %{power64} s390 s390x sh3 sh4 sparc sparc64 arm aarch64 riscv64
 # Sanity check --enable-64-bit-bfd really works.
 grep '^#define BFD_ARCH_SIZE 64$' %{buildroot}%{_prefix}/include/bfd.h
+# Fix multilib conflicts of generated values by __WORDSIZE-based expressions.
+%ifarch %{ix86} x86_64 ppc %{power64} s390 s390x sh3 sh4 sparc sparc64 arm aarch64 riscv64
 sed -i -e '/^#include "ansidecl.h"/{p;s~^.*$~#include <bits/wordsize.h>~;}' \
     -e 's/^#define BFD_DEFAULT_TARGET_SIZE \(32\|64\) *$/#define BFD_DEFAULT_TARGET_SIZE __WORDSIZE/' \
     -e 's/^#define BFD_HOST_64BIT_LONG [01] *$/#define BFD_HOST_64BIT_LONG (__WORDSIZE == 64)/' \
@@ -582,7 +586,7 @@ $OUTPUT_FORMAT
 
 /* The libz dependency is unexpected by legacy build scripts.  */
 /* The libdl dependency is for plugin support.  (BZ 889134)  */
-INPUT ( %{_libdir}/libbfd.a -liberty -lz -ldl )
+INPUT ( %{_libdir}/libbfd.a %{_libdir}/libsframe.a -liberty -lz -ldl )
 EOH
 
 tee %{buildroot}%{_libdir}/libopcodes.so <<EOH
@@ -717,6 +721,9 @@ exit 0
 
 
 %changelog
+* Mon Jul 08 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.42-2
+- updated Patch00.
+
 * Sat Jun 08 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.42-1
 - updated to 2.42.
 - updated Patch00.

+ 16 - 7
g/gcc/gcc-vl.spec

@@ -5,7 +5,7 @@
 %global gcc_major 14
 # Note, gcc_release must be integer, if you want to add suffixes to
 # %{release}, append them after %{gcc_release} on Release: line.
-%global gcc_release 1
+%global gcc_release 2
 
 Summary:        GNU Compiler Collection (C, C++, Objective-C, ...)
 Summary(ja):    GNU コンパイラコレクション (C, C++, Objective-C, ...)
@@ -230,7 +230,7 @@ Patch50: isl-rh2155127.patch
 
 Patch100: gcc14-fortran-fdec-duplicates.patch
 
-Patch10000: gcc-14.1-20240607.patch
+Patch10000: gcc-14.1-20240708.patch
 
 # On ARM EABI systems, we do want -gnueabi to be part of the
 # target triple.
@@ -707,6 +707,7 @@ Summary: The C Preprocessor
 Summary(ja): C プリプロセッサ
 Group: programming
 Provides: cpp = %{version}-%{release}
+Provides: /lib/cpp
 Autoreq: true
 
 %description cpp
@@ -1867,10 +1868,6 @@ rm -f %{buildroot}%{mandir}/man3/ffi*
 # Help plugins find out nvra.
 echo gcc-%{version}-%{release}.%{_arch} > $FULLPATH/rpmver
 
-# for compatibility
-mkdir -p %{buildroot}/lib
-ln -sf ../usr/bin/cpp %{buildroot}/lib/cpp
-
 # remove unnecessary files.
 rm -rf %{buildroot}%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include-fixed
 rm -rf %{buildroot}%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/ssp
@@ -1960,6 +1957,16 @@ if [ $1 = 0 ]; then
   %{_sbindir}/update-alternatives --remove go %{_prefix}/bin/go.gcc
 fi
 
+%post cpp
+if [ ! -L /lib -a ! -e /lib/cpp ]; then
+  ln -sf /usr/bin/cpp /lib/cpp
+fi
+
+%triggerpostun cpp -- gcc-cpp < %{version}-%{release}
+if [ ! -L /lib -a ! -e /lib/cpp ]; then
+  ln -sf /usr/bin/cpp /lib/cpp
+fi
+
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
@@ -2314,7 +2321,6 @@ fi
 
 %files cpp -f cpplib.lang
 %defattr(-,root,root,-)
-/lib/cpp
 %{_prefix}/lib/cpp
 %{_prefix}/bin/cpp
 %{_mandir}/man1/cpp.1*
@@ -3023,6 +3029,9 @@ fi
 
 
 %changelog
+* Mon Jul 08 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 14.1.1-2
+- updated Patch10000.
+
 * Sat Jun 08 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 14.1.1-1
 - updated tarball to 14.1.0.
 - re-imported patches from rawhide.

+ 8 - 2
g/glibc/glibc-vl.spec

@@ -16,7 +16,7 @@ Summary: The GNU libc libraries
 Summary(ja): GNU libc ライブラリ
 Name: glibc
 Version: %{glibcversion}
-Release: 1%{?_dist_release}%{?with_systemd:.systemd}
+Release: 3%{?_dist_release}%{?with_systemd:.systemd}
 Group: system
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -63,7 +63,7 @@ rpm.define("__debug_install_post bash " .. wrapper
 %undefine _unique_build_ids
 
 # patch from upstream
-Patch0: glibc-%{version}-20240605.patch
+Patch0: glibc-%{version}-20240710.patch
 
 # patches from Fedora
 Patch4: glibc-fedora-linux-tcsetattr.patch
@@ -1855,6 +1855,12 @@ rm -f *.filelist*
 
 
 %changelog
+* Wed Jul 10 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.39-3
+- updated Patch0.
+
+* Mon Jul 08 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.39-2
+- updated Patch0.
+
 * Sat Jun 08 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.39-1
 - updated to 2.39.
 

+ 9 - 1
v/vine-rpm-macros/vine-rpm-macros-vl.spec

@@ -1,7 +1,7 @@
 Summary:        rpm macros for Vine Linux
 Summary(ja):    Vine Linux用rpmマクロ
 Name:           vine-rpm-macros
-Version:        8
+Version:        9
 Release:        1%{?_dist_release}
 Group:          system
 Vendor:         Project Vine
@@ -11,6 +11,8 @@ License:        GPL2
 Source0:        rpmrc
 Source1:        macros.vine
 Source2:        macros.dwz
+Source3:        macros.ldconfig
+Source4:        macros.vpath
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildArch:      noarch
@@ -54,6 +56,8 @@ This package contains rpm macros to build packages for Vine Linux.
 install -Dpm644 %{SOURCE0} %{buildroot}/usr/lib/rpm/vine/rpmrc
 install -Dpm644 %{SOURCE1} %{buildroot}/usr/lib/rpm/macros.d/macros.vine
 install -Dpm644 %{SOURCE2} %{buildroot}/usr/lib/rpm/macros.d/macros.dwz
+install -Dpm644 %{SOURCE3} %{buildroot}/usr/lib/rpm/macros.d/macros.ldconfig
+install -Dpm644 %{SOURCE4} %{buildroot}/usr/lib/rpm/macros.d/macros.vpath
 
 
 %clean
@@ -72,6 +76,10 @@ install -Dpm644 %{SOURCE2} %{buildroot}/usr/lib/rpm/macros.d/macros.dwz
 
 
 %changelog
+* Tue Jul 09 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 9-1
+- enabled LTO.
+- added macros.{ldconfig,vpath}.
+
 * Fri Jun 07 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8-1
 - added "-march=x86-64-v2" to %%optflags on x86_64.