Update: xtensa-lx106-elf

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

Update: xtensa-lx106-elf

Tracey Emery
Hello,

A bulk build from kmos@ and a report from naddy@ noted build problems on
both sparc64 and amd64. The following diff should correct those two
problems.

A patch was added for sparc64 and BUILD_DEPENDS added for amd64. These
were added as BUILD_DEPENDS, since both port-lib-depends-check and
portcheck complained, otherwise.

Was I right to bump the REVISION on the two subs?

I built this on amd64, sparc64 (generously borrowed from stsp and setup
by jca ... thank you), and i386 platforms.

OK?

Thanks.

--

Tracey Emery

diff 1fddd8b82485853cd5747e010d6c458686bb0458 /usr/ports
blob - b410bbe45ea73f91b8bdbb96b3ad9bd71f598be4
file + devel/xtensa-lx106-elf/gcc/Makefile
--- devel/xtensa-lx106-elf/gcc/Makefile
+++ devel/xtensa-lx106-elf/gcc/Makefile
@@ -5,6 +5,7 @@ COMMENT = gcc for ${CONFIG} cross-development
 VERSION = 4.8.5
 DISTNAME = gcc-${VERSION}
 PKGNAME = ${CONFIG}-gcc-${VERSION}
+REVISION = 0
 
 GH_ACCOUNT = jcmvbkbc
 GH_PROJECT = gcc-xtensa
blob - /dev/null
file + devel/xtensa-lx106-elf/gcc/patches/patch-gcc_cp_cfns_h
--- devel/xtensa-lx106-elf/gcc/patches/patch-gcc_cp_cfns_h
+++ devel/xtensa-lx106-elf/gcc/patches/patch-gcc_cp_cfns_h
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Index: gcc/cp/cfns.h
+--- gcc/cp/cfns.h.orig
++++ gcc/cp/cfns.h
+@@ -52,7 +52,11 @@ __inline
+ #endif
+ static unsigned int hash (const char *, unsigned int);
+ #ifdef __GNUC__
++#ifdef __GNUC_STDC_INLINE__
++__attribute__ ((__gnu_inline__))
++#else
+ __inline
++#endif
+ #endif
+ const char * libc_name_p (const char *, unsigned int);
+ /* maximum key range = 391, duplicates = 0 */
blob - 6ebf232515003582dd8b5dda25fe9f6b0ca8db17
file + devel/xtensa-lx106-elf/gdb/Makefile
--- devel/xtensa-lx106-elf/gdb/Makefile
+++ devel/xtensa-lx106-elf/gdb/Makefile
@@ -8,6 +8,7 @@ PKGNAME = ${CONFIG}-gdb-${VERSION}
 GH_ACCOUNT = jcmvbkbc
 GH_PROJECT = binutils-gdb-xtensa
 GH_TAGNAME = gdb-8.2.1-release
+REVISION = 0
 
 WANTLIB += ${COMPILER_LIBCXX} c curses expat m
 
@@ -15,6 +16,8 @@ COMPILER = base-clang ports-gcc base-gcc
 
 BUILD_DEPENDS = devel/libtool \
  devel/bison \
+ devel/gmp \
+ devel/mpfr \
  devel/xtensa-lx106-elf/binutils
 RUN_DEPENDS += devel/xtensa-lx106-elf/binutils
 
@@ -24,6 +27,8 @@ YACC = bison -y
 
 CONFIGURE_ARGS += --enable-commonbfdlib=no \
  --with-cross-host=yes \
+ --with-gmp=${LOCALBASE} \
+ --with-mpfr=${LOCALBASE} \
  --disable-werror \
  --disable-nls \
  --without-guile \

Reply | Threaded
Open this post in threaded view
|

Re: Update: xtensa-lx106-elf

Klemens Nanni-2
On Thu, Mar 19, 2020 at 03:02:26PM -0600, Tracey Emery wrote:
> Was I right to bump the REVISION on the two subs?
Bumping gcc is obvoiusly correct because you patched and therefore
changed the package;  I'm not sure about gdb:  does it's package change
as well because requires gcc sources at build time?

If in doubt, bump - it's cheap and avoids problems.

> I built this on amd64, sparc64 (generously borrowed from stsp and setup
> by jca ... thank you), and i386 platforms.
OK kn
 
> @@ -0,0 +1,17 @@
> +$OpenBSD$
> +
> +Index: gcc/cp/cfns.h
Please add a comment describing *why* you do this;  *what* often fails
to add value, but having a reason for patches in the description is
always helpful and also nice to see during `make patch' output.

Reply | Threaded
Open this post in threaded view
|

Re: Update: xtensa-lx106-elf

Tracey Emery
On Fri, Mar 20, 2020 at 01:16:17PM +0100, Klemens Nanni wrote:
> On Thu, Mar 19, 2020 at 03:02:26PM -0600, Tracey Emery wrote:
> > Was I right to bump the REVISION on the two subs?
> Bumping gcc is obvoiusly correct because you patched and therefore
> changed the package;  I'm not sure about gdb:  does it's package change
> as well because requires gcc sources at build time?
>
> If in doubt, bump - it's cheap and avoids problems.
>

I bumped this because CONFIGURE_ARGS were tweaked to go with the
BUILD_DEPENDS change. It seemed cheap and is a change in flags, which
build flags are mentioned in the porting guide.

> > I built this on amd64, sparc64 (generously borrowed from stsp and setup
> > by jca ... thank you), and i386 platforms.
> OK kn
>  
> > @@ -0,0 +1,17 @@
> > +$OpenBSD$
> > +
> > +Index: gcc/cp/cfns.h
> Please add a comment describing *why* you do this;  *what* often fails
> to add value, but having a reason for patches in the description is
> always helpful and also nice to see during `make patch' output.

Added and mentally noted for future obscure or not obvious patches.

Thanks!

--

Tracey Emery