Re: LLVM 10: lang/crystal

2020-08-03 Thread Wesley Moxam
Providing a new bootstrap won't be a problem (if needed).
It would be great to also bump to the latest crystal version (
https://marc.info/?l=openbsd-ports=159344614726528=2)

-- W

On Mon, Aug 3, 2020 at 5:09 AM Stuart Henderson  wrote:

> On 2020/08/02 20:25, George Koehler wrote:
> > Hi.  This is about OpenBSD ports/lang/crystal.
> >
> > When OpenBSD switches base-clang to LLVM 10, it will add
> > /usr/bin/llvm-config to base.  This will break crystal, because it
> > will run the wrong llvm-config and get a linker error:
> >
> http://build-failures.rhaalovely.net/amd64-clang/2020-08-01/lang/crystal.log
> >
> > This diff fixes crystal for me on amd64, by pointing to the correct
> > llvm-config.  (I don't set REVISION = 0 because both new and old
> > packages use the same llvm-config from ports.)  OK to commit?
>
> OK
>
> > But this only works as long as ports-clang stays at LLVM 8, because
> > the bootstrap crystal.o needs libLLVM-8.so, but we use the libLLVM
> > from llvm-config.  When we update devel/llvm to LLVM 10, then crystal
> > will break, unless someone will provide a new bootstrap.--George
>
> AFAIK base and ports LLVM should be kept in sync, so it will
> likely run into problems again soon.
>
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/lang/crystal/Makefile,v
> > retrieving revision 1.8
> > diff -u -p -r1.8 Makefile
> > --- Makefile  7 Sep 2019 08:46:41 -   1.8
> > +++ Makefile  2 Aug 2020 23:48:14 -
> > @@ -29,8 +29,9 @@ DISTFILES = crystal-${V}{${V}}.tar.gz \
> >   crystal-${V}-OpenBSD6.5.tar.gz:0 \
> >   shards-${V}{v${V_SHARDS}}.tar.gz:1
> >
> > -# Build requires llvm-config which only exists in ports-clang
> > +# Build requires llvm-config from ports, not from base
> >  COMPILER =   ports-clang
> > +LLVM_CONFIG =${LOCALBASE}/bin/llvm-config
> >
> >  BUILD_DEPENDS =  devel/llvm
> >  RUN_DEPENDS =devel/llvm,-main
> > @@ -49,13 +50,14 @@ NO_TEST = Yes
> >  do-build:
> >   mkdir -p ${WRKSRC}/.build
> >   # Link the compiler from the pre-built bootstrap object
> > - cd ${WRKSRC} && CXX=${CXX} ${MAKE_PROGRAM} llvm_ext libcrystal
> > + cd ${WRKSRC} && CXX=${CXX} LLVM_CONFIG=${LLVM_CONFIG} \
> > + ${MAKE_PROGRAM} llvm_ext libcrystal
> >   cd ${WRKSRC} && ${CXX} -rdynamic -o ${WRKBUILD}/.build/crystal \
> >   ${WRKSRC}/../crystal.o \
> >   ${WRKSRC}/src/llvm/ext/llvm_ext.o \
> >   ${WRKSRC}/src/ext/sigfault.o \
> >   -L${LOCALBASE}/lib \
> > - `(llvm-config --libs --system-libs --ldflags 2>
> /dev/null)` \
> > + `(${LLVM_CONFIG} --libs --system-libs --ldflags 2>
> /dev/null)` \
> >   -lz -lpcre -lgc -lpthread -levent_core -levent_extra -lssl
> \
> >   -lcrypto -liconv
> >   # Use the compiler to re-compile the compiler
> > @@ -63,7 +65,8 @@ do-build:
> >   cd ${WRKSRC}; \
> >   ulimit -s 5120 -d 4096000 && \
> >   CRYSTAL_CONFIG_PATH="lib:${TRUEPREFIX}/lib/crystal" \
> > - CXX=${CXX} ${MAKE_PROGRAM} ${ALL_TARGET}
> > + CXX=${CXX} LLVM_CONFIG=${LLVM_CONFIG} \
> > + ${MAKE_PROGRAM} ${ALL_TARGET}
> >   cd ${WRKSRC}/../shards-${V_SHARDS} && \
> >   ${MAKE_PROGRAM} CRYSTAL=${WRKSRC}/.build/crystal \
> >   CRYSTAL_PATH=${WRKSRC}/src CRFLAGS=--release
> >
>


[UPDATE] crystal-0.35.1

2020-06-29 Thread Wesley Moxam
Updates lang/crystal port to v0.35.1

Crystal is working towards a v1.0 release, and v0.35 brought some small
language changes and some polish to the stdlib.

It's worth noting that Crystal Shards now depends on crystal-molinillo
(which is a shard).

-- W


crystal-0.35.1.diff
Description: Binary data


[UPDATE] crystal-0.34.0

2020-04-12 Thread Wesley Moxam
Updates to crystal to version 0.34, shards to 0.10

Shards now depends on crystal-molinillo (which is a shard).


crystal-0.34.diff
Description: Binary data


[UPDATE] crystal-0.30.1

2019-09-05 Thread Wesley Moxam
Bumps the version of the crystal compiler to 0.30.1


crystal-0.30.1.diff
Description: Binary data


Re: llvm-7.0.1 fallout: lang/crystal

2019-08-05 Thread Wesley Moxam
On Mon, Aug 5, 2019 at 10:01 PM joshua stein  wrote:

> On Mon, 05 Aug 2019 at 21:49:05 -0400, Wesley Moxam wrote:
> > Crystal 0.30.0 has been released.
> >
> > Diff for the port is attached.
>
> Thanks!  One nit below.
>

Makes sense, thanks!


>
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/lang/crystal/Makefile,v
> > retrieving revision 1.6
> > diff -u -p -r1.6 Makefile
> > --- Makefile  12 Jul 2019 20:47:16 -  1.6
> > +++ Makefile  6 Aug 2019 01:31:42 -
> > @@ -1,12 +1,10 @@
> >  # $OpenBSD: Makefile,v 1.6 2019/07/12 20:47:16 sthen Exp $
> >
> > -BROKEN = does not build with LLVM 7
> > -
> >  # Hopefully ${CLANG_ARCHS} at some point.
> >  ONLY_FOR_ARCHS=  amd64
> >
> > -V =  0.26.1
> > -V_SHARDS =   0.8.1
> > +V =  0.30.0
> > +V_SHARDS =   0.9.0
> >  REVISION =   1
> >  COMMENT =statically typed object oriented language
> >  DISTNAME =   crystal-${V}
> > @@ -29,7 +27,7 @@ MASTER_SITES =  https://github.com/crysta
> >  MASTER_SITES0 =  https://wmoxam.com/public/
> >  MASTER_SITES1 =  https://github.com/crystal-lang/shards/archive/
> >  DISTFILES =  crystal-${V}{${V}}.tar.gz \
> > - crystal-${V}-OpenBSD6.4.tar.gz:0 \
> > + crystal-${V}-OpenBSD6.5.tar.gz:0 \
> >   shards-${V}{v${V_SHARDS}}.tar.gz:1
> >
> >  # Build requires llvm-config which only exists in ports-clang
> > @@ -57,13 +55,14 @@ do-build:
> >   ${WRKSRC}/../crystal.o \
> >   ${WRKSRC}/src/llvm/ext/llvm_ext.o \
> >   ${WRKSRC}/src/ext/sigfault.o \
> > + -L/usr/local/lib \
>
> That probably needs to be "-L${LOCALBASE}/lib"
>
> >   `(llvm-config --libs --system-libs --ldflags 2>
> /dev/null)` \
> >   -lz -lpcre -lgc -lpthread -levent_core -levent_extra -lssl
> \
> >   -lcrypto -liconv
> >   # Use the compiler to re-compile the compiler
> >   touch ${WRKSRC}/src/compiler/crystal.cr
> >   cd ${WRKSRC}; \
> > - ulimit -s 5120 -d 3145728 && \
> > + ulimit -s 5120 -d 4096000 && \
> >   CRYSTAL_CONFIG_PATH="lib:${TRUEPREFIX}/lib/crystal" \
> >   CXX=${CXX} ${MAKE_PROGRAM} ${ALL_TARGET}
> >   cd ${WRKSRC}/../shards-${V_SHARDS} && \
> > Index: distinfo
> > ===
> > RCS file: /cvs/ports/lang/crystal/distinfo,v
> > retrieving revision 1.2
> > diff -u -p -r1.2 distinfo
> > --- distinfo  13 Nov 2018 22:31:03 -  1.2
> > +++ distinfo  6 Aug 2019 01:31:42 -
> > @@ -1,6 +1,6 @@
> > -SHA256 (crystal-0.26.1-OpenBSD6.4.tar.gz) =
> fds/Izqj2rbqydL5FcDbj+kYIXssBHGzYQlFAIyb0x8=
> > -SHA256 (crystal-0.26.1.tar.gz) =
> t8dVp9D0n1cq5cCLiwE5/LHGhiyUed+udPAOLIQk/LA=
> > -SHA256 (shards-0.26.1.tar.gz) =
> dcdKtqzy1cWfYafv07vDxLHWUhf5EDQMuBjr9SMyB6U=
> > -SIZE (crystal-0.26.1-OpenBSD6.4.tar.gz) = 6485528
> > -SIZE (crystal-0.26.1.tar.gz) = 1994987
> > -SIZE (shards-0.26.1.tar.gz) = 31388
> > +SHA256 (crystal-0.30.0-OpenBSD6.5.tar.gz) =
> boJUfiTBCHk4lEIevlOhcRtCc3JQOUrOuEJS1AeYZIs=
> > +SHA256 (crystal-0.30.0.tar.gz) =
> /IhJcAieOCNEVAZ2qcWqTzacmg9F0YWOB5tM4mh4Fko=
> > +SHA256 (shards-0.30.0.tar.gz) =
> kPIwyHzHuUyoReb+NPJSPtyttWLXFdqvmGA+36KpTWU=
> > +SIZE (crystal-0.30.0-OpenBSD6.5.tar.gz) = 6947653
> > +SIZE (crystal-0.30.0.tar.gz) = 2151397
> > +SIZE (shards-0.30.0.tar.gz) = 41280
> > Index: pkg/PLIST
> > ===
> > RCS file: /cvs/ports/lang/crystal/pkg/PLIST,v
> > retrieving revision 1.2
> > diff -u -p -r1.2 PLIST
> > --- pkg/PLIST 13 Nov 2018 22:31:03 -  1.2
> > +++ pkg/PLIST 6 Aug 2019 01:31:43 -
> > @@ -2,8 +2,10 @@
> >  @bin bin/crystal
> >  @bin bin/shards
> >  lib/crystal/
> > +lib/crystal/VERSION
> >  lib/crystal/adler32/
> >  lib/crystal/adler32/adler32.cr
> > +lib/crystal/annotations.cr
> >  lib/crystal/array.cr
> >  lib/crystal/atomic.cr
> >  lib/crystal/base64.cr
> > @@ -26,6 +28,7 @@ lib/crystal/box.cr
> >  lib/crystal/callstack/
> >  lib/crystal/callstack.cr
> >  lib/crystal/callstack/lib_unwind.cr
> > +lib/crystal/channel.cr
> >  lib/crystal/char/
> >  lib/crystal/char.cr
> >  lib/crystal/char/reader.cr
> > @@ -57,9 +60,11 @@ lib/crystal/compil

Re: llvm-7.0.1 fallout: lang/crystal

2019-08-05 Thread Wesley Moxam
Crystal 0.30.0 has been released.

Diff for the port is attached.

On Fri, Jul 26, 2019 at 5:47 PM Wesley Moxam  wrote:

> LLVM 7 + 8 support recently hit the master branch (see:
> https://github.com/crystal-lang/crystal/pull/7986 &
> https://github.com/crystal-lang/crystal/pull/7987)
>
> Crystal 0.30 will include these, but I'm not sure when 0.30 will be
> officially released.
>
> On Thu, Jul 11, 2019 at 10:38 AM Wesley Moxam 
> wrote:
>
>> No news yet. There are plans to support newer llvm releases, potentially
>> support for LLVM 7 in Crystal 0.30, with LLVM 8 support to follow.
>>
>>
>> On Sun, Jun 30, 2019 at 12:20 PM Jeremie Courreges-Anglas 
>> wrote:
>>
>>>
>>> Hi Wesley,
>>>
>>> On Wed, Feb 13 2019, Wesley Moxam  wrote:
>>> >> On Feb 13, 2019, at 7:47 AM, Jeremie Courreges-Anglas 
>>> wrote:
>>> >>
>>> >>> On Thu, Feb 07 2019, Stuart Henderson  wrote:
>>> >>>> On 2019/02/07 18:02, Jeremie Courreges-Anglas wrote:
>>> >>>>
>>> >>>> Hi,
>>> >>>>
>>> >>>> I'm not sure you were notified so here's a heads-up: lang/crystal
>>> >>>> doesn't build any more after the update to clang 7 in both base and
>>> >>>> ports.
>>> >>>
>>> >>> Not handled upstream yet.
>>> >>> https://github.com/crystal-lang/crystal/issues/6754
>>> >>
>>> >> Wesley, I see that you have commented on this issue.  Do you mind if
>>> >> we mark lang/crystal as temporarily BROKEN?
>>> >
>>> > That’s fine with me. It may be a while before the issue is fixed
>>>
>>> Any news regarding lang/crystal?  The issue is still open and "@bcardiff
>>> removed this from the 0.28.0 milestone on Mar 27".
>>>
>>> If upstream doesn't plan to support newer llvm releases and no
>>> alternative fix is found, then the port should be removed.
>>>
>>> --
>>> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524
>>> E7EE
>>>
>>


crystal-0.30.0.diff
Description: Binary data


Re: llvm-7.0.1 fallout: lang/crystal

2019-07-26 Thread Wesley Moxam
LLVM 7 + 8 support recently hit the master branch (see:
https://github.com/crystal-lang/crystal/pull/7986 &
https://github.com/crystal-lang/crystal/pull/7987)

Crystal 0.30 will include these, but I'm not sure when 0.30 will be
officially released.

On Thu, Jul 11, 2019 at 10:38 AM Wesley Moxam 
wrote:

> No news yet. There are plans to support newer llvm releases, potentially
> support for LLVM 7 in Crystal 0.30, with LLVM 8 support to follow.
>
>
> On Sun, Jun 30, 2019 at 12:20 PM Jeremie Courreges-Anglas 
> wrote:
>
>>
>> Hi Wesley,
>>
>> On Wed, Feb 13 2019, Wesley Moxam  wrote:
>> >> On Feb 13, 2019, at 7:47 AM, Jeremie Courreges-Anglas 
>> wrote:
>> >>
>> >>> On Thu, Feb 07 2019, Stuart Henderson  wrote:
>> >>>> On 2019/02/07 18:02, Jeremie Courreges-Anglas wrote:
>> >>>>
>> >>>> Hi,
>> >>>>
>> >>>> I'm not sure you were notified so here's a heads-up: lang/crystal
>> >>>> doesn't build any more after the update to clang 7 in both base and
>> >>>> ports.
>> >>>
>> >>> Not handled upstream yet.
>> >>> https://github.com/crystal-lang/crystal/issues/6754
>> >>
>> >> Wesley, I see that you have commented on this issue.  Do you mind if
>> >> we mark lang/crystal as temporarily BROKEN?
>> >
>> > That’s fine with me. It may be a while before the issue is fixed
>>
>> Any news regarding lang/crystal?  The issue is still open and "@bcardiff
>> removed this from the 0.28.0 milestone on Mar 27".
>>
>> If upstream doesn't plan to support newer llvm releases and no
>> alternative fix is found, then the port should be removed.
>>
>> --
>> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524
>> E7EE
>>
>


Re: llvm-7.0.1 fallout: lang/crystal

2019-07-11 Thread Wesley Moxam
No news yet. There are plans to support newer llvm releases, potentially
support for LLVM 7 in Crystal 0.30, with LLVM 8 support to follow.


On Sun, Jun 30, 2019 at 12:20 PM Jeremie Courreges-Anglas 
wrote:

>
> Hi Wesley,
>
> On Wed, Feb 13 2019, Wesley Moxam  wrote:
> >> On Feb 13, 2019, at 7:47 AM, Jeremie Courreges-Anglas 
> wrote:
> >>
> >>> On Thu, Feb 07 2019, Stuart Henderson  wrote:
> >>>> On 2019/02/07 18:02, Jeremie Courreges-Anglas wrote:
> >>>>
> >>>> Hi,
> >>>>
> >>>> I'm not sure you were notified so here's a heads-up: lang/crystal
> >>>> doesn't build any more after the update to clang 7 in both base and
> >>>> ports.
> >>>
> >>> Not handled upstream yet.
> >>> https://github.com/crystal-lang/crystal/issues/6754
> >>
> >> Wesley, I see that you have commented on this issue.  Do you mind if
> >> we mark lang/crystal as temporarily BROKEN?
> >
> > That’s fine with me. It may be a while before the issue is fixed
>
> Any news regarding lang/crystal?  The issue is still open and "@bcardiff
> removed this from the 0.28.0 milestone on Mar 27".
>
> If upstream doesn't plan to support newer llvm releases and no
> alternative fix is found, then the port should be removed.
>
> --
> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE
>


Re: llvm-7.0.1 fallout: lang/crystal

2019-02-13 Thread Wesley Moxam



> On Feb 13, 2019, at 7:47 AM, Jeremie Courreges-Anglas  wrote:
> 
>> On Thu, Feb 07 2019, Stuart Henderson  wrote:
>>> On 2019/02/07 18:02, Jeremie Courreges-Anglas wrote:
>>> 
>>> Hi,
>>> 
>>> I'm not sure you were notified so here's a heads-up: lang/crystal
>>> doesn't build any more after the update to clang 7 in both base and
>>> ports.
>> 
>> Not handled upstream yet.
>> https://github.com/crystal-lang/crystal/issues/6754
> 
> Wesley, I see that you have commented on this issue.  Do you mind if
> we mark lang/crystal as temporarily BROKEN?

That’s fine with me. It may be a while before the issue is fixed



[UPDATE] crystal-0.27.0

2018-11-19 Thread Wesley Moxam
Bumps the version of the crystal compiler to v0.27.0


crystal-0.27.0.diff
Description: Binary data