On Sun, Feb 19, 2023 at 01:47:06PM +0100, Patrick Wildt wrote:
> On Thu, Feb 16, 2023 at 07:32:57AM +0100, Antoine Jacoutot wrote:
> > On Wed, Feb 08, 2023 at 06:03:04AM -0700, Patrick Wildt wrote:
> > > CVSROOT: /cvs
> > > Module name: ports
> > > Changes by: patr...@cvs.openbsd.org 2023/02/08 06:03:04
> > >
> > > Modified files:
> > > devel/riscv-elf/gcc: Makefile distinfo
> > > devel/riscv-elf/gcc/patches: patch-Makefile_in
> > > patch-gcc_Makefile_in
> > > patch-gcc_configure
> > > patch-libgcc_Makefile_in
> > > patch-libiberty_Makefile_in
> > > devel/riscv-elf/gcc/pkg: PLIST
> > > Removed files:
> > > devel/riscv-elf/gcc/patches: patch-gcc_tree-vect-stmts_c
> > >
> > > Log message:
> > > Update riscv-elf-gcc to 12.2.0
> > >
> > > ok kevlo@
> >
> > Fails to build because dpb junks libzstd.
> >
> >
> > c++ -fno-PIE -c -DIN_GCC_FRONTEND -O2 -pipe -DIN_GCC
> > -DCROSS_DIRECTORY_STRUCTURE -fno-strict-aliasing -fno-exceptions -fno-rtti
> > -fasynchronous-unwind-tables -W -Wall -Wno-narrowing -Wwrite-strings
> > -Wcast-qual -Wmissing-format-attr
> > ibute -Woverloaded-virtual -pedantic -Wno-long-long -Wno-variadic-macros
> > -Wno-overlength-strings -DHAVE_CONFIG_H -I. -I.
> > -I/exopi-obj/pobj/riscv-elf-gcc-12.2.0/gcc-12.2.0/gcc
> > -I/exopi-obj/pobj/riscv-elf-gcc-12.2.0/gcc-12.2.0/gcc/. -I/ex
> > opi-obj/pobj/riscv-elf-gcc-12.2.0/gcc-12.2.0/gcc/../include
> > -I/exopi-obj/pobj/riscv-elf-gcc-12.2.0/gcc-12.2.0/gcc/../libcpp/include
> > -I/exopi-obj/pobj/riscv-elf-gcc-12.2.0/gcc-12.2.0/gcc/../libcody
> > -I/usr/local/include -I/exopi-obj/pobj/r
> > iscv-elf-gcc-12.2.0/gcc-12.2.0/gcc/../libdecnumber
> > -I/exopi-obj/pobj/riscv-elf-gcc-12.2.0/gcc-12.2.0/gcc/../libdecnumber/dpd
> > -I../libdecnumber
> > -I/exopi-obj/pobj/riscv-elf-gcc-12.2.0/gcc-12.2.0/gcc/../libbacktrace
> > -I/usr/local/include -o
> > cc1-checksum.o -MT cc1-checksum.o -MMD -MP -MF ./.deps/cc1-checksum.TPo
> > cc1-checksum.cc
> > c++ -nopie -O2 -pipe -DIN_GCC -DCROSS_DIRECTORY_STRUCTURE
> > -fno-strict-aliasing -fno-exceptions -fno-rtti -fasynchronous-unwind-tables
> > -W -Wall -Wno-narrowing -Wwrite-strings -Wcast-qual
> > -Wmissing-format-attribute -Woverloaded-virt
> > ual -pedantic -Wno-long-long -Wno-variadic-macros -Wno-overlength-strings
> > -DHAVE_CONFIG_H -L/usr/local/lib -o cc1 c/c-lang.o c-family/stub-objc.o
> > attribs.o c/c-errors.o c/c-decl.o c/c-typeck.o c/c-convert.o c/c-aux-info.o
> > c/c-objc-commo
> > n.o c/c-parser.o c/c-fold.o c/gimple-parser.o c-family/c-common.o
> > c-family/c-cppbuiltin.o c-family/c-dump.o c-family/c-format.o
> > c-family/c-gimplify.o c-family/c-indentation.o c-family/c-lex.o
> > c-family/c-omp.o c-family/c-opts.o c-family/c-
> > pch.o c-family/c-ppoutput.o c-family/c-pragma.o c-family/c-pretty-print.o
> > c-family/c-semantics.o c-family/c-ada-spec.o c-family/c-ubsan.o
> > c-family/known-headers.o c-family/c-attribs.o c-family/c-warn.o
> > c-family/c-spellcheck.o default-c.o
> > \
> > cc1-checksum.o libbackend.a main.o libcommon-target.a libcommon.a
> > ../libcpp/libcpp.a ../libdecnumber/libdecnumber.a libcommon.a
> > ../libcpp/libcpp.a /usr/local/lib/libiconv.a
> > ../libbacktrace/.libs/libbacktrace.a ../libiberty/libiberty.a
> > ../libdecnumber/libdecnumber.a -L/usr/local/lib -lmpc -lmpfr -lgmp
> > -rdynamic -L./../zlib -lz -lzstd
> > ld: error: unable to find library -lzstd
> >
> >
> > --
> > Antoine
>
> This seems to compile me without not having zstd installed.
>
> ok?
OK
>
> diff --git a/devel/riscv-elf/gcc/Makefile b/devel/riscv-elf/gcc/Makefile
> index 0c52745b3e9..e6eaf554355 100644
> --- a/devel/riscv-elf/gcc/Makefile
> +++ b/devel/riscv-elf/gcc/Makefile
> @@ -3,6 +3,7 @@ COMMENT= gcc for riscv-elf cross-development
> VERSION= 12.2.0
> DISTNAME= gcc-${VERSION}
> PKGNAME= riscv-elf-gcc-${VERSION}
> +REVISION= 0
>
> SUBST_VARS+= VERSION
>
> @@ -34,7 +35,8 @@ CONFIGURE_ARGS+=--enable-languages=${LANGS} \
> --disable-libcc1 \
> --disable-lto \
> --enable-cpp \
> - --without-isl
> + --without-isl \
> + --without-zstd
> CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
> LDFLAGS="-L${LOCALBASE}/lib"
>
--
Antoine
