Friday, December 27, 2019

Re: Build fix for textproc/aspell/core on mips64el

Friendly ping.

Xiyue Deng <manphiz@gmail.com> writes:

> Stuart Henderson <stu@spacehopper.org> writes:
>
>> On 2019/12/24 00:29, Xiyue Deng wrote:
>>> Hi ports maintainers,
>>>
>>> Some time ago I reported textproc/aspell/core build issue[1] which was
>>> due to a ld.bfd ICE issue. Recently Stuart and Brian helped me fix
>>> several other build failure related to ld.bfd by using ld.lld, and I
>>> applied a similar fix to aspell and it also worked.
>>>
>>> The patch is attached. As aspell doesn't seem to have a dedicated
>>> maintainer someone will be needed to help submit it. Thanks!
>>>
>>> [1] https://marc.info/?l=openbsd-ports&m=154900374211243&w=2
>>>
>>
>>> Index: Makefile
>>> ===================================================================
>>> RCS file: /cvs/ports/textproc/aspell/core/Makefile,v
>>> retrieving revision 1.46
>>> diff -u -p -r1.46 Makefile
>>> --- Makefile 12 Jul 2019 20:49:56 -0000 1.46
>>> +++ Makefile 24 Dec 2019 07:36:57 -0000
>>> @@ -24,7 +24,7 @@ PERMIT_PACKAGE= Yes
>>>
>>> WANTLIB= c iconv intl m curses pthread ${COMPILER_LIBCXX}
>>>
>>> -COMPILER = base-clang ports-gcc base-gcc
>>> +COMPILER = base-clang ports-clang base-gcc
>>
>> This may potentially break things on powerpc/sparc64. I think this more
>> targetted setup might be better:
>>
>> COMPILER = base-clang ports-clang ports-gcc base-gcc
>> MODCLANG_ARCHS = mips64 mips64el
>>
>>>
>>> LIB_DEPENDS= devel/gettext,-runtime
>>>
>>> @@ -35,6 +35,11 @@ CONFIGURE_ARGS+= --enable-static \
>>> --enable-curses=ncursesw \
>>> --enable-dict-dir=${PREFIX}/share/aspell \
>>> --enable-docdir=${PREFIX}/share/doc/aspell
>>> +
>>> +.if ${MACHINE_ARCH} == "mips64" || ${MACHINE_ARCH} == "mips64el"
>>> +USE_LLD = Yes
>>> +CONIFGURE_ENV += LD="/usr/bin/ld.lld" LDFLAGS="-fuse-ld=lld"
>>
>> Setting LD/LDFLAGS should not be needed, that is taken care of by the wrapper
>> script.
>>
>> CONFIGURE is misspelt anyway so that line isn't doing anything.
>>
>>> +.endif
>>>
>>> post-build:
>>> cd ${WRKDIR}/${DIST_EN} && \
>
> Thanks for the comments! The updated diff is attached.
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/textproc/aspell/core/Makefile,v
> retrieving revision 1.46
> diff -u -p -r1.46 Makefile
> --- Makefile 12 Jul 2019 20:49:56 -0000 1.46
> +++ Makefile 24 Dec 2019 14:31:52 -0000
> @@ -24,7 +24,8 @@ PERMIT_PACKAGE= Yes
>
> WANTLIB= c iconv intl m curses pthread ${COMPILER_LIBCXX}
>
> -COMPILER = base-clang ports-gcc base-gcc
> +COMPILER = base-clang ports-clang ports-gcc base-gcc
> +MODCLANG_ARCHS = mips64 mips64el
>
> LIB_DEPENDS= devel/gettext,-runtime
>
> @@ -35,6 +36,10 @@ CONFIGURE_ARGS+= --enable-static \
> --enable-curses=ncursesw \
> --enable-dict-dir=${PREFIX}/share/aspell \
> --enable-docdir=${PREFIX}/share/doc/aspell
> +
> +.if ${MACHINE_ARCH} == "mips64" || ${MACHINE_ARCH} == "mips64el"
> +USE_LLD = Yes
> +.endif
>
> post-build:
> cd ${WRKDIR}/${DIST_EN} && \

No comments:

Post a Comment