Re: amd64 bulk breakage 2013-12-29

2013-12-30 Thread Brad Smith

On 30/12/13 3:13 PM, Pascal Stumpf wrote:

On Mon, 30 Dec 2013 11:56:16 -0800, Matthew Dempsky wrote:

On Mon, Dec 30, 2013 at 9:47 AM, Christian Weisgerber
 wrote:

math/octave undefined reference to `__guard'


That's odd.  Can you send me the build logs from this (or put them
somewhere I can access them)?




I don't have logs, but the problem is that lang/g77 still emits
references go __guard.  The following diff should fix it (currently
compiling math/octave).


Well it's the same as what went into the GCC 3 stack protector code.
Ok from me if it builds ok.


Index: Makefile
===
RCS file: /cvs/ports/lang/g77/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- Makefile9 Aug 2013 11:02:28 -   1.24
+++ Makefile30 Dec 2013 20:12:34 -
@@ -2,7 +2,7 @@

  V =   3.3.6
  PKGNAME = g77-$V
-REVISION = 2
+REVISION = 3
  EPOCH =   1
  DISTFILES =   g77-openbsd-3.3.6.tgz

Index: patches/patch-gcc_protector_c
===
RCS file: patches/patch-gcc_protector_c
diff -N patches/patch-gcc_protector_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-gcc_protector_c   30 Dec 2013 20:12:34 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- gcc/protector.c.orig   Mon Dec 30 18:54:07 2013
 gcc/protector.cMon Dec 30 18:54:17 2013
+@@ -867,7 +867,7 @@ rtl_prologue (insn)
+   
+   start_sequence ();
+
+-  _guard = gen_rtx_MEM (GUARD_m, gen_rtx_SYMBOL_REF (Pmode, "__guard"));
++  _guard = gen_rtx_MEM (GUARD_m, gen_rtx_SYMBOL_REF (Pmode, "__guard_local"));
+   emit_move_insn ( guard_area, _guard);
+
+   _val = get_insns ();





--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.



Re: amd64 bulk breakage 2013-12-29

2013-12-30 Thread Matthew Dempsky
On Mon, Dec 30, 2013 at 12:13 PM, Pascal Stumpf  wrote:
> I don't have logs, but the problem is that lang/g77 still emits
> references go __guard.  The following diff should fix it (currently
> compiling math/octave).

Ah, makes sense.  Diff looks ok to me assuming it builds successfully.



Re: amd64 bulk breakage 2013-12-29

2013-12-30 Thread Pascal Stumpf
On Mon, 30 Dec 2013 11:56:16 -0800, Matthew Dempsky wrote:
> On Mon, Dec 30, 2013 at 9:47 AM, Christian Weisgerber
>  wrote:
> > math/octave undefined reference to `__guard'
> 
> That's odd.  Can you send me the build logs from this (or put them
> somewhere I can access them)?
> 
> 

I don't have logs, but the problem is that lang/g77 still emits
references go __guard.  The following diff should fix it (currently
compiling math/octave).


Index: Makefile
===
RCS file: /cvs/ports/lang/g77/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- Makefile9 Aug 2013 11:02:28 -   1.24
+++ Makefile30 Dec 2013 20:12:34 -
@@ -2,7 +2,7 @@
 
 V =3.3.6
 PKGNAME =  g77-$V
-REVISION = 2
+REVISION = 3
 EPOCH =1
 DISTFILES =g77-openbsd-3.3.6.tgz
 
Index: patches/patch-gcc_protector_c
===
RCS file: patches/patch-gcc_protector_c
diff -N patches/patch-gcc_protector_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-gcc_protector_c   30 Dec 2013 20:12:34 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- gcc/protector.c.orig   Mon Dec 30 18:54:07 2013
 gcc/protector.cMon Dec 30 18:54:17 2013
+@@ -867,7 +867,7 @@ rtl_prologue (insn)
+   
+   start_sequence ();
+ 
+-  _guard = gen_rtx_MEM (GUARD_m, gen_rtx_SYMBOL_REF (Pmode, "__guard"));
++  _guard = gen_rtx_MEM (GUARD_m, gen_rtx_SYMBOL_REF (Pmode, "__guard_local"));
+   emit_move_insn ( guard_area, _guard);
+ 
+   _val = get_insns ();



Re: amd64 bulk breakage 2013-12-29

2013-12-30 Thread Matthew Dempsky
On Mon, Dec 30, 2013 at 9:47 AM, Christian Weisgerber
 wrote:
> math/octave undefined reference to `__guard'

That's odd.  Can you send me the build logs from this (or put them
somewhere I can access them)?



Re: amd64 bulk breakage 2013-12-29

2013-12-30 Thread Marc Espie
On Mon, Dec 30, 2013 at 06:47:38PM +0100, Christian Weisgerber wrote:
> x11/py-wxPython cannot find -lwx_gtk2_media

This comes from av support, I think, yet another side-effect of the ffmpeg
update...



amd64 bulk breakage 2013-12-29

2013-12-30 Thread Christian Weisgerber
Failures in the latest amd64 bulk build, very briefly:

math/octave undefined reference to `__guard'
textproc/redland-bindings,-python   swig: -php4 is no longer supported
mail/zarafa/zarafa  'SWIG_From_long' was not declared in this scope
www/py-wtforms  sphinx-build: Command not found
www/py-flask-wtfsphinx-build: Command not found
x11/py-wxPython cannot find -lwx_gtk2_media
geo/mapserver,,-maincmake: Could NOT find PostgreSQL

The logs are on hub (for other package builders who have access there).

-- 
Christian "naddy" Weisgerber  na...@mips.inka.de