On Sun, 24 Jan 2016 13:30:51 +0100, Pascal Stumpf wrote:
> On Sun, 24 Jan 2016 20:02:16 +1100, Jonathan Gray wrote:
> > On Sun, Jan 24, 2016 at 09:47:28AM +0100, Pascal Stumpf wrote:
> > > On Sun, 24 Jan 2016 17:03:16 +1100, Jonathan Gray wrote:
> > > > On Sat, Jan 23, 2016 at 07:03:23PM -0500, Michael McConville wrote:
> > > > > FWIW, I've been running this patch without issue for months. >
> > > > > Juan Francisco Cantero Hurtado wrote: > > Can you modify the
> > > > structure of devel/llvm/ to something like > > devel/llvm/version/?
> > > > With lang/gcc works pretty well, we can work with > > the latest
> > > > version while the ports tree uses the stable version by > > default.
> > > > > > This sounds like a good idea to me. > > We should probably also
> > > > make sure that this update won't further > complicate things for
> > > > Jonathan: > > https://marc.info/?l=openbsd-cvs&m=145088099210901&w=2
> > > > > > https://marc.info/?l=openbsd-cvs&m=144816103704050&w=2 >
> > > > > https://marc.info/?l=openbsd-cvs&m=145091674119104&w=2 > >
> > > > https://marc.info/?l=openbsd-cvs&m=145108545813434&w=2 >
> > > >
> > > > Well, Mesa won't build with the existing ports llvm so any update can't
> > > > make it worse.
> > > >
> > > > I do wonder if llvm should be patched to use libestdc++ until such time
> > > > that libc++ is useable though. As otherwise clang can't compile against
> > > > the clang headers...
> > >
> > > That's exactly what I did in the port:
> > >
> > > #include "..." search starts here:
> > > #include <...> search starts here:
> > > /usr/local/include/c++/4.9.3
> > > /usr/local/include/c++/4.9.3/x86_64-unknown-openbsd5.9
> > > /usr/local/include/c++/4.9.3/backward
> > > /usr/include/g++
> > > /usr/include/g++/amd64-unknown-openbsd5.9
> > > /usr/include/g++/backward
> > > /usr/local/bin/../lib/clang/3.7.1/include
> > > /usr/include
> > > End of search list.
> > > "/usr/bin/ld" -e __start --eh-frame-hdr -Bdynamic -dynamic-linker
> > > /usr/libexec/ld.so -o a.out /usr/lib/crt0.o /usr/lib/crtbegin.o
> > > -L/usr/local/lib/gcc/x86_64-unknown-openbsd5.9/4.9.3 -L/usr/local/lib
> > > /tmp/hw-dc2526.o -lestdc++ -lm -lgcc -lc -lgcc /usr/lib/crtend.o
> >
> > I'm curious how you get that, as I'm using the patch you posted.
>
> Grrr, CVS ate the important patches. Sorry.
>
Also resending lang/gcc and lang/clang patches in case anyone lost them.
Index: gcc/4.9/gcc4.port.mk
===================================================================
RCS file: /cvs/ports/lang/gcc/4.9/gcc4.port.mk,v
retrieving revision 1.4
diff -u -p -r1.4 gcc4.port.mk
--- gcc/4.9/gcc4.port.mk 17 Jul 2015 22:42:12 -0000 1.4
+++ gcc/4.9/gcc4.port.mk 24 Jan 2016 12:34:06 -0000
@@ -29,6 +29,10 @@ _MODGCC4_ARCH_USES = Yes
COMPILER_VERSION ?= gcc2
+MODGCC4STDCPP = estdc++
+MODGCC4_CPPLIBDEP = lang/gcc/4.9,-libs>=4.9,<4.10
+MODGCC4_CPPWANTLIB = estdc++>=17
+
_MODGCC4_LINKS =
.if ${_MODGCC4_ARCH_USES:L} == "yes"
@@ -39,10 +43,7 @@ _MODGCC4_LINKS += egcc gcc egcc cc
. if ${MODGCC4_LANGS:L:Mc++}
BUILD_DEPENDS += lang/gcc/4.9,-c++>=4.9,<4.10
-MODGCC4STDCPP = estdc++
-MODGCC4_CPPLIBDEP = lang/gcc/4.9,-libs>=4.9,<4.10
LIB_DEPENDS += ${MODGCC4_CPPLIBDEP}
-MODGCC4_CPPWANTLIB = estdc++>=17
WANTLIB += ${MODGCC4_CPPWANTLIB}
_MODGCC4_LINKS += eg++ g++ eg++ c++
. endif
Index: clang/clang.port.mk
===================================================================
RCS file: /cvs/ports/lang/clang/clang.port.mk,v
retrieving revision 1.15
diff -u -p -r1.15 clang.port.mk
--- clang/clang.port.mk 11 Feb 2015 00:30:00 -0000 1.15
+++ clang/clang.port.mk 24 Jan 2016 12:34:06 -0000
@@ -1,6 +1,6 @@
# $OpenBSD: clang.port.mk,v 1.15 2015/02/11 00:30:00 brad Exp $
-MODCLANG_VERSION= 3.5.20140228p27
+MODCLANG_VERSION= 3.7.1
MODCLANG_ARCHS ?=
MODCLANG_LANGS ?=
@@ -35,6 +35,12 @@ _MODCLANG_LINKS = clang gcc clang cc
. if ${MODCLANG_LANGS:L:Mc++}
_MODCLANG_LINKS += clang++ g++ clang++ c++
+# uses libestdc++
+MODULES += gcc4
+MODCLANG_CPPLIBDEP = ${MODGCC4_CPPLIBDEP}
+LIB_DEPENDS += ${MODCLANG_CPPLIBDEP}
+MODCLANG_CPPWANTLIB = ${MODGCC4_CPPWANTLIB}
+WANTLIB += ${MODCLANG_CPPWANTLIB}
. endif
.endif
