This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: libgo patch committed: Update to Go1.8rc1


Andreas Schwab <schwab@linux-m68k.org> writes:

> In file included from ../../../libgo/runtime/runtime.h:113:0,
>                  from ../../../libgo/runtime/go-libmain.c:15:
> ./runtime.inc:650:8: error: redefinition of 'struct siginfo'
>  struct siginfo {
>         ^~~~~~~
> In file included from /usr/include/signal.h:79:0,
>                  from ../../../libgo/runtime/runtime.h:9,
>                  from ../../../libgo/runtime/go-libmain.c:15:
> /usr/include/bits/siginfo.h:46:16: note: originally defined here
>  typedef struct siginfo
>                 ^~~~~~~
> In file included from ../../../libgo/runtime/runtime.h:113:0,
>                  from ../../../libgo/runtime/go-main.c:17:
> ./runtime.inc:650:8: error: redefinition of 'struct siginfo'
>  struct siginfo {
>         ^~~~~~~
> In file included from /usr/include/signal.h:79:0,
>                  from ../../../libgo/runtime/runtime.h:9,
>                  from ../../../libgo/runtime/go-main.c:17:
> /usr/include/bits/siginfo.h:46:16: note: originally defined here
>  typedef struct siginfo
>                 ^~~~~~~
> In file included from ../../../libgo/runtime/runtime.h:113:0,
>                  from ../../../libgo/runtime/aeshash.c:7:
> ./runtime.inc:650:8: error: redefinition of 'struct siginfo'
>  struct siginfo {
>         ^~~~~~~
> In file included from /usr/include/signal.h:79:0,
>                  from ../../../libgo/runtime/runtime.h:9,
>                  from ../../../libgo/runtime/aeshash.c:7:
> /usr/include/bits/siginfo.h:46:16: note: originally defined here
>  typedef struct siginfo
>                 ^~~~~~~
> make[4]: *** [libgobegin_a-go-main.o] Error 1

Same on Solaris.  However, before I even get there, I hit

make[4]: *** No rule to make target 'golang_org/x/net/lif/lif.lo', needed by 'libgo.la'.  Stop.

Fixed like this:

diff --git a/libgo/Makefile.am b/libgo/Makefile.am
--- a/libgo/Makefile.am
+++ b/libgo/Makefile.am
@@ -1133,7 +1133,7 @@ if LIBGO_IS_BSD
 $(eval $(call PACKAGE_template,golang_org/x/net/route))
 
 golang_org_x_net_route_lo = \
-	golang_org/x/net/route/route.lo
+	golang_org/x/net/route.lo
 golang_org_x_net_route_check = \
 	golang_org/x/net/route/check
 
@@ -1146,7 +1146,7 @@ if LIBGO_IS_SOLARIS
 $(eval $(call PACKAGE_template,golang_org/x/net/lif))
 
 golang_org_x_net_lif_lo = \
-	golang_org/x/net/lif/lif.lo
+	golang_org/x/net/lif.lo
 golang_org_x_net_lif_check = \
 	golang_org/x/net/lif/check
 
	Rainer

-- 
-----------------------------------------------------------------------------
Rainer Orth, Center for Biotechnology, Bielefeld University

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]