pkgsrc-Users archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: gcc12 not building on macOS 15 aarch64 (gfortran woes)



On Sat, Feb 22, 2025 at 08:46:23PM -0500, Greg Troxel wrote:
> It would be useful for you to update to current and try 13 again; it
> seems ok patch-wise in cvs.


lang/gcc13 with current pkgsrc still does not patch for me:

===> Patching for gcc13-13.3.0nb1
=> Applying distribution patches for gcc13-13.3.0nb1
=> Applying pkgsrc patches for gcc13-13.3.0nb1
1 out of 3 hunks failed--saving rejects to libgcc/config.host.rej
Patch /Users/chuck/excluded/pkg/clean/pkgsrc/lang/gcc13/../../lang/gcc13/patches/patch-libgcc_config.host failed
ERROR: Patching failed due to modified or broken patch file(s):
ERROR:  /Users/chuck/excluded/pkg/clean/pkgsrc/lang/gcc13/../../lang/gcc13/patches/patch-libgcc_config.host




the problem is that there is a conflict between the patches in
gcc-13.3.0.diff which comes from:

https://raw.githubusercontent.com/Homebrew/formula-patches/bda0fad/gcc/gcc-13.3.0.diff

and lang/gcc13/patches/patch-libgcc_config.host.  

the lang/gcc13/patches/patch-libgcc_config.host will apply
to a clean gcc13 tree, but it fails if you try and apply
it after applying gcc-13.3.0.diff.


see below for details...


chuck


sh-3.2# pwd
/Users/chuck/excluded/pkg/clean/pkgsrc/lang/gcc13
sh-3.2# ls
CVS             Makefile        buildlink3.mk   options.mk      version.mk
DESCR           Makefile.common distinfo        patches
sh-3.2# mkdir try
sh-3.2# cd try
sh-3.2# tar xzf ../../../distfiles/gcc-13.3.0.tar.xz 
sh-3.2# cd gcc-13.3.0/
sh-3.2# patch < ../../../../distfiles/gcc-13.3.0.diff 
patching file Makefile.def
patching file Makefile.in
patching file 'c++tools/Makefile.in'
patching file 'c++tools/configure'
patching file 'c++tools/configure.ac'
patching file configure
patching file configure.ac
patching file 'fixincludes/Makefile.in'
patching file 'fixincludes/configure'
patching file 'fixincludes/configure.ac'
patching file 'gcc/Makefile.in'
patching file 'gcc/aclocal.m4'
patching file 'gcc/ada/gcc-interface/Make-lang.in'
patching file 'gcc/ada/gcc-interface/Makefile.in'
patching file 'gcc/analyzer/kf.cc'
patching file 'gcc/builtins.cc'
patching file 'gcc/builtins.def'
patching file 'gcc/c-family/c-attribs.cc'
patching file 'gcc/c-family/c-common.cc'
patching file 'gcc/c-family/c-common.h'
patching file 'gcc/c-family/c-lex.cc'
patching file 'gcc/c-family/c-opts.cc'
patching file 'gcc/c-family/c-ppoutput.cc'
patching file 'gcc/c-family/c-pragma.h'
patching file 'gcc/c-family/c.opt'
patching file 'gcc/c/c-lang.cc'
patching file 'gcc/c/c-objc-common.cc'
patching file 'gcc/c/c-objc-common.h'
patching file 'gcc/c/c-parser.cc'
patching file 'gcc/calls.cc'
patching file 'gcc/calls.h'
patching file 'gcc/collect2.cc'
patching file 'gcc/common.opt'
patching file 'gcc/common/config/aarch64/aarch64-common.cc'
patching file 'gcc/config.gcc'
patching file 'gcc/config.in'
patching file 'gcc/config/aarch64/aarch64-builtins.cc'
patching file 'gcc/config/aarch64/aarch64-c.cc'
patching file 'gcc/config/aarch64/aarch64-cores.def'
patching file 'gcc/config/aarch64/aarch64-protos.h'
patching file 'gcc/config/aarch64/aarch64-tune.md'
patching file 'gcc/config/aarch64/aarch64.cc'
patching file 'gcc/config/aarch64/aarch64.h'
patching file 'gcc/config/aarch64/aarch64.md'
patching file 'gcc/config/aarch64/aarch64.opt'
patching file 'gcc/config/aarch64/constraints.md'
patching file 'gcc/config/aarch64/darwin.h'
patching file 'gcc/config/aarch64/driver-aarch64.cc'
patching file 'gcc/config/aarch64/falkor-tag-collision-avoidance.cc'
patching file 'gcc/config/aarch64/iterators.md'
patching file 'gcc/config/aarch64/predicates.md'
patching file 'gcc/config/aarch64/t-aarch64-darwin'
patching file 'gcc/config/darwin-c.cc'
patching file 'gcc/config/darwin-driver.cc'
patching file 'gcc/config/darwin-protos.h'
patching file 'gcc/config/darwin.cc'
patching file 'gcc/config/darwin.h'
patching file 'gcc/config/darwin.opt'
patching file 'gcc/config/i386/darwin.h'
patching file 'gcc/config/i386/i386.cc'
patching file 'gcc/config/i386/i386.h'
patching file 'gcc/config/rs6000/darwin.h'
patching file 'gcc/configure'
patching file 'gcc/configure.ac'
patching file 'gcc/coretypes.h'
patching file 'gcc/cp/cp-lang.cc'
patching file 'gcc/cp/cp-objcp-common.cc'
patching file 'gcc/cp/cp-objcp-common.h'
patching file 'gcc/cp/decl2.cc'
patching file 'gcc/cp/parser.cc'
patching file 'gcc/cumulative-args.h'
patching file 'gcc/d/Make-lang.in'
patching file 'gcc/doc/contrib.texi'
patching file 'gcc/doc/cpp.texi'
patching file 'gcc/doc/extend.texi'
patching file 'gcc/doc/install.texi'
patching file 'gcc/doc/invoke.texi'
patching file 'gcc/doc/plugins.texi'
patching file 'gcc/doc/tm.texi'
patching file 'gcc/doc/tm.texi.in'
patching file 'gcc/exec-tool.in'
patching file 'gcc/explow.cc'
patching file 'gcc/explow.h'
patching file 'gcc/fortran/gfortran.texi'
patching file 'gcc/function.cc'
patching file 'gcc/function.h'
patching file 'gcc/gcc.cc'
patching file 'gcc/ginclude/stddef.h'
patching file 'gcc/jit/Make-lang.in'
patching file 'gcc/jit/jit-playback.cc'
patching file 'gcc/jit/libgccjit.h'
patching file 'gcc/m2/Make-lang.in'
patching file 'gcc/objc/objc-act.cc'
patching file 'gcc/objc/objc-act.h'
patching file 'gcc/objc/objc-lang.cc'
patching file 'gcc/objcp/objcp-lang.cc'
patching file 'gcc/opts.cc'
patching file 'gcc/plugin.cc'
patching file 'gcc/target.def'
patching file 'gcc/target.h'
patching file 'gcc/targhooks.cc'
patching file 'gcc/targhooks.h'
patching file 'gcc/tree-nested.cc'
patching file 'gcc/tree.cc'
patching file 'intl/Makefile.in'
patching file 'intl/configure'
patching file 'intl/configure.ac'
patching file 'libatomic/Makefile.am'
patching file 'libatomic/Makefile.in'
patching file 'libatomic/configure'
patching file 'libatomic/configure.ac'
patching file 'libbacktrace/configure'
patching file 'libbacktrace/configure.ac'
patching file 'libcc1/configure'
patching file 'libcody/Makefile.in'
patching file 'libcody/configure'
patching file 'libcody/configure.ac'
patching file 'libcpp/configure'
patching file 'libcpp/configure.ac'
patching file 'libcpp/include/cpplib.h'
patching file 'libcpp/init.cc'
patching file 'libcpp/macro.cc'
patching file 'libdecnumber/configure'
patching file 'libdecnumber/configure.ac'
patching file 'libffi/Makefile.am'
patching file 'libffi/Makefile.in'
patching file 'libffi/configure'
patching file 'libffi/configure.ac'
patching file 'libffi/doc/version.texi'
patching file 'libgcc/config.host'
patching file 'libgcc/config/aarch64/heap-trampoline.c'
patching file 'libgcc/config/aarch64/lse.S'
patching file 'libgcc/config/aarch64/sfp-machine.h'
patching file 'libgcc/config/aarch64/t-darwin'
patching file 'libgcc/config/aarch64/t-heap-trampoline'
patching file 'libgcc/config/i386/heap-trampoline.c'
patching file 'libgcc/config/i386/t-heap-trampoline'
patching file 'libgcc/config/t-darwin'
patching file 'libgcc/config/t-darwin-min-11'
patching file 'libgcc/config/t-darwin-rpath'
patching file 'libgcc/config/t-slibgcc-darwin'
patching file 'libgcc/libgcc-std.ver.in'
patching file 'libgcc/libgcc2.h'
patching file 'libgfortran/Makefile.am'
patching file 'libgfortran/Makefile.in'
patching file 'libgfortran/configure'
patching file 'libgfortran/configure.ac'
patching file 'libgm2/Makefile.am'
patching file 'libgm2/Makefile.in'
patching file 'libgm2/aclocal.m4'
patching file 'libgm2/configure'
patching file 'libgm2/configure.ac'
patching file 'libgm2/libm2cor/Makefile.am'
patching file 'libgm2/libm2cor/Makefile.in'
patching file 'libgm2/libm2iso/Makefile.am'
patching file 'libgm2/libm2iso/Makefile.in'
patching file 'libgm2/libm2log/Makefile.am'
patching file 'libgm2/libm2log/Makefile.in'
patching file 'libgm2/libm2min/Makefile.am'
patching file 'libgm2/libm2min/Makefile.in'
patching file 'libgm2/libm2pim/Makefile.am'
patching file 'libgm2/libm2pim/Makefile.in'
patching file 'libgo/configure'
patching file 'libgo/configure.ac'
patching file 'libgomp/Makefile.am'
patching file 'libgomp/Makefile.in'
patching file 'libgomp/configure'
patching file 'libgomp/configure.ac'
patching file 'libiberty/configure'
patching file 'libiberty/configure.ac'
patching file 'libitm/Makefile.am'
patching file 'libitm/Makefile.in'
patching file 'libitm/config/aarch64/sjlj.S'
patching file 'libitm/configure'
patching file 'libitm/configure.ac'
patching file 'libitm/configure.tgt'
patching file 'libobjc/configure'
patching file 'libobjc/configure.ac'
patching file 'libphobos/configure'
patching file 'libphobos/configure.ac'
patching file 'libphobos/libdruntime/Makefile.am'
patching file 'libphobos/libdruntime/Makefile.in'
patching file 'libphobos/src/Makefile.am'
patching file 'libphobos/src/Makefile.in'
patching file 'libquadmath/Makefile.am'
patching file 'libquadmath/Makefile.in'
patching file 'libquadmath/configure'
patching file 'libquadmath/configure.ac'
patching file 'libsanitizer/asan/Makefile.am'
patching file 'libsanitizer/asan/Makefile.in'
patching file 'libsanitizer/configure'
patching file 'libsanitizer/configure.ac'
patching file 'libsanitizer/hwasan/Makefile.am'
patching file 'libsanitizer/hwasan/Makefile.in'
patching file 'libsanitizer/lsan/Makefile.am'
patching file 'libsanitizer/lsan/Makefile.in'
patching file 'libsanitizer/tsan/Makefile.am'
patching file 'libsanitizer/tsan/Makefile.in'
patching file 'libsanitizer/ubsan/Makefile.am'
patching file 'libsanitizer/ubsan/Makefile.in'
patching file 'libssp/Makefile.am'
patching file 'libssp/Makefile.in'
patching file 'libssp/configure'
patching file 'libssp/configure.ac'
patching file 'libstdc++-v3/configure'
patching file 'libstdc++-v3/configure.ac'
patching file 'libstdc++-v3/src/Makefile.am'
patching file 'libstdc++-v3/src/Makefile.in'
patching file libtool.m4
patching file 'libvtv/configure'
patching file 'libvtv/configure.ac'
patching file 'lto-plugin/configure'
patching file 'lto-plugin/configure.ac'
patching file 'zlib/Makefile.in'
patching file 'zlib/configure'
patching file 'zlib/configure.ac'
sh-3.2# 
sh-3.2# patch < ../../patches/patch-libgcc_config.host 
patching file 'libgcc/config.host'
1 out of 3 hunks failed--saving rejects to 'libgcc/config.host.rej'
sh-3.2# 



Home | Main Index | Thread Index | Old Index