Re: mu: use ports-gcc
On 2020/01/24 13:31, Stefan Hagen wrote: > Stuart Henderson wrote: > > Diff doesn't apply (tabs/spaces). I'll redo it by hand. > > Thank you. It was the first time I tried to inline a patch. The tabs got > lost during copy & paste. Sorry & thanks for fixing. > > Best Regards, > Stefan > Easy way: pkg_add xclip cvs diff | xclip Alternatively cvs diff > /tmp/foo and insert the file in your editor.
Re: mu: use ports-gcc
Stuart Henderson wrote: > Diff doesn't apply (tabs/spaces). I'll redo it by hand. Thank you. It was the first time I tried to inline a patch. The tabs got lost during copy & paste. Sorry & thanks for fixing. Best Regards, Stefan
Re: mu: use ports-gcc
On 2020/01/24 11:15, Stefan Hagen wrote:
> Xiyue Deng wrote:
> > Stefan Hagen writes:
> > > Updated patch below.
> >
> > Oh BTW please help commit it because I don't have permission. Thanks again!
>
> I'm maintaining the package, but I'm not a committer.
>
> Adding Stuart to CC again, maybe he can commit it.
>
> > > Index: Makefile
> > > ===
> > > RCS file: /cvs/ports/mail/mu/Makefile,v
> > > retrieving revision 1.18
> > > diff -u -p -u -p -r1.18 Makefile
> > > --- Makefile21 Jul 2019 00:10:04 - 1.18
> > > +++ Makefile22 Jan 2020 20:13:28 -
> > > @@ -3,6 +3,7 @@
> > > COMMENT= maildir indexer and searcher with emacs frontend
> > >
> > > DISTNAME= mu-1.2.0
> > > +REVISION= 1
> > >
> > > CATEGORIES=mail
> > > HOMEPAGE= http://www.djcbsoftware.nl/code/mu/
> > > @@ -13,9 +14,9 @@ MAINTAINER= Stefan Hagen > > PERMIT_PACKAGE=Yes
> > >
> > > WANTLIB+= assuan c ffi gio-2.0 glib-2.0 gmime-3.0 gmodule-2.0
> > > -WANTLIB+= gobject-2.0 gpg-error gpgme gthread-2.0 iconv
> > > +WANTLIB+= gobject-2.0 gpg-error gpgme gthread-2.0 iconv idn2
> > > WANTLIB+= intl json-glib-1.0 m pcre pthread ${COMPILER_LIBCXX}
> > > -WANTLIB+= uuid xapian z
> > > +WANTLIB+= unistring uuid xapian z
> > >
> > > MASTER_SITES= https://github.com/djcb/mu/releases/download/1.2/
> > > EXTRACT_SUFX= .tar.xz
> > > @@ -30,7 +31,7 @@ LIB_DEPENDS= databases/xapian-core \
> > >
> > >
> > > # C++14 required
> > > -COMPILER= base-clang ports-clang
> > > +COMPILER= base-clang ports-gcc
> > >
> > > AUTOCONF_VERSION= 2.69
> > > AUTOMAKE_VERSION= 1.15
>
Diff doesn't apply (tabs/spaces). I'll redo it by hand.
Re: mu: use ports-gcc
Xiyue Deng wrote:
> Stefan Hagen writes:
> > Updated patch below.
>
> Oh BTW please help commit it because I don't have permission. Thanks again!
I'm maintaining the package, but I'm not a committer.
Adding Stuart to CC again, maybe he can commit it.
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/mail/mu/Makefile,v
> > retrieving revision 1.18
> > diff -u -p -u -p -r1.18 Makefile
> > --- Makefile21 Jul 2019 00:10:04 - 1.18
> > +++ Makefile22 Jan 2020 20:13:28 -
> > @@ -3,6 +3,7 @@
> > COMMENT= maildir indexer and searcher with emacs frontend
> >
> > DISTNAME= mu-1.2.0
> > +REVISION= 1
> >
> > CATEGORIES=mail
> > HOMEPAGE= http://www.djcbsoftware.nl/code/mu/
> > @@ -13,9 +14,9 @@ MAINTAINER= Stefan Hagen > PERMIT_PACKAGE=Yes
> >
> > WANTLIB+= assuan c ffi gio-2.0 glib-2.0 gmime-3.0 gmodule-2.0
> > -WANTLIB+= gobject-2.0 gpg-error gpgme gthread-2.0 iconv
> > +WANTLIB+= gobject-2.0 gpg-error gpgme gthread-2.0 iconv idn2
> > WANTLIB+= intl json-glib-1.0 m pcre pthread ${COMPILER_LIBCXX}
> > -WANTLIB+= uuid xapian z
> > +WANTLIB+= unistring uuid xapian z
> >
> > MASTER_SITES= https://github.com/djcb/mu/releases/download/1.2/
> > EXTRACT_SUFX= .tar.xz
> > @@ -30,7 +31,7 @@ LIB_DEPENDS= databases/xapian-core \
> >
> >
> > # C++14 required
> > -COMPILER= base-clang ports-clang
> > +COMPILER= base-clang ports-gcc
> >
> > AUTOCONF_VERSION= 2.69
> > AUTOMAKE_VERSION= 1.15
Re: mu: use ports-gcc
Stefan Hagen writes:
> Stuart Henderson wrote:
>> On 2020/01/22 18:25, Stefan Hagen wrote:
>>> Stuart Henderson wrote:
On 2020/01/21 18:22, Xiyue Deng wrote:
> # C++14 required
> -COMPILER=base-clang ports-clang
>+COMPILER= base-clang ports-gcc
This part is ok with me with the bump added.
>>>
>>> Experiement below:
>>>
>>> I don't have a gcc architecture available, so i tried to compile mail/mu
>>> und its dependency database/xapian-core with COMPILER= ports-gcc set on
>>> my amd64 box.
>>>
>>> It looks like xapian-core is not honoring the COMPILER= ports-gcc
>>> flag.
>>
>> That is working here, did you have an old package lying around etc?:
>
> Sort of. I figured it out. I recompiled xapian-core without adding a
> revision. Which then has installed the cached package.
>
> It worked now.
>
>> No maildirs here for full tests with mu, but "make test" has lots of "OK"s..
>
> That, and I did some manual tests on my 200k email-mailbox.
>
> Updated patch below.
>
> Best Regards,
> Stefan
Oh BTW please help commit it because I don't have permission. Thanks again!
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/mail/mu/Makefile,v
> retrieving revision 1.18
> diff -u -p -u -p -r1.18 Makefile
> --- Makefile21 Jul 2019 00:10:04 - 1.18
> +++ Makefile22 Jan 2020 20:13:28 -
> @@ -3,6 +3,7 @@
> COMMENT= maildir indexer and searcher with emacs frontend
>
> DISTNAME= mu-1.2.0
> +REVISION= 1
>
> CATEGORIES=mail
> HOMEPAGE= http://www.djcbsoftware.nl/code/mu/
> @@ -13,9 +14,9 @@ MAINTAINER= Stefan Hagen PERMIT_PACKAGE=Yes
>
> WANTLIB+= assuan c ffi gio-2.0 glib-2.0 gmime-3.0 gmodule-2.0
> -WANTLIB+= gobject-2.0 gpg-error gpgme gthread-2.0 iconv
> +WANTLIB+= gobject-2.0 gpg-error gpgme gthread-2.0 iconv idn2
> WANTLIB+= intl json-glib-1.0 m pcre pthread ${COMPILER_LIBCXX}
> -WANTLIB+= uuid xapian z
> +WANTLIB+= unistring uuid xapian z
>
> MASTER_SITES= https://github.com/djcb/mu/releases/download/1.2/
> EXTRACT_SUFX= .tar.xz
> @@ -30,7 +31,7 @@ LIB_DEPENDS= databases/xapian-core \
>
>
> # C++14 required
> -COMPILER= base-clang ports-clang
> +COMPILER= base-clang ports-gcc
>
> AUTOCONF_VERSION= 2.69
> AUTOMAKE_VERSION= 1.15
signature.asc
Description: PGP signature
Re: mu: use ports-gcc
Stuart Henderson writes:
> On 2020/01/21 18:22, Xiyue Deng wrote:
>> Hi,
>>
>> Currently mu requires ports-clang which I think is because there was a
>> time that GCC 4.9 didn't support C++14. Now that GCC is on 8.3, mu can
>> be unblocked for GCC archs as well. I didn't change patch level as I
>> think there is no visible change, but correct me if I'm wrong.
>>
>> Tested on mips64el/loongson.
>>
>> Index: Makefile
>> ===
>> RCS file: /cvs/ports/mail/mu/Makefile,v
>> retrieving revision 1.18
>> diff -u -p -r1.18 Makefile
>> --- Makefile 21 Jul 2019 00:10:04 - 1.18
>> +++ Makefile 22 Jan 2020 02:16:59 -
>> @@ -14,7 +14,7 @@ PERMIT_PACKAGE=Yes
>>
>> WANTLIB+= assuan c ffi gio-2.0 glib-2.0 gmime-3.0 gmodule-2.0
>> WANTLIB+= gobject-2.0 gpg-error gpgme gthread-2.0 iconv
>> -WANTLIB+= intl json-glib-1.0 m pcre pthread ${COMPILER_LIBCXX}
>> +WANTLIB+= intl json-glib-1.0 m pcre pthread
>> WANTLIB+= uuid xapian z
>
> ${COMPILER_LIBCXX} should stay in the list. Seems that idn2 and unistring
> should be added too.
>
> Also needs a REVISION bump.
>
> btw your mail was quoted-printable encoded and the patch couldn't be applied
> directly.
>
Thanks for reviewing the patch! This seems to be caused by PGP
signing. Is there a way to workaround this or I need to attach the
patch instead of inlining it when sending signed emails?
>> # C++14 required
>> -COMPILER= base-clang ports-clang
>> +COMPILER= base-clang ports-gcc
>
> This part is ok with me with the bump added.
>
>> AUTOCONF_VERSION= 2.69
>> AUTOMAKE_VERSION= 1.15
signature.asc
Description: PGP signature
Re: mu: use ports-gcc
Stefan Hagen writes:
> Stuart Henderson wrote:
>> On 2020/01/22 18:25, Stefan Hagen wrote:
>>> Stuart Henderson wrote:
On 2020/01/21 18:22, Xiyue Deng wrote:
> # C++14 required
> -COMPILER=base-clang ports-clang
>+COMPILER= base-clang ports-gcc
This part is ok with me with the bump added.
>>>
>>> Experiement below:
>>>
>>> I don't have a gcc architecture available, so i tried to compile mail/mu
>>> und its dependency database/xapian-core with COMPILER= ports-gcc set on
>>> my amd64 box.
>>>
>>> It looks like xapian-core is not honoring the COMPILER= ports-gcc
>>> flag.
>>
>> That is working here, did you have an old package lying around etc?:
>
> Sort of. I figured it out. I recompiled xapian-core without adding a
> revision. Which then has installed the cached package.
>
> It worked now.
>
>> No maildirs here for full tests with mu, but "make test" has lots of "OK"s..
>
> That, and I did some manual tests on my 200k email-mailbox.
>
> Updated patch below.
>
> Best Regards,
> Stefan
>
Thanks Stefan and Stuart for revising the patch!
> Index: Makefile
> ===
> RCS file: /cvs/ports/mail/mu/Makefile,v
> retrieving revision 1.18
> diff -u -p -u -p -r1.18 Makefile
> --- Makefile21 Jul 2019 00:10:04 - 1.18
> +++ Makefile22 Jan 2020 20:13:28 -
> @@ -3,6 +3,7 @@
> COMMENT= maildir indexer and searcher with emacs frontend
>
> DISTNAME= mu-1.2.0
> +REVISION= 1
>
> CATEGORIES=mail
> HOMEPAGE= http://www.djcbsoftware.nl/code/mu/
> @@ -13,9 +14,9 @@ MAINTAINER= Stefan Hagen PERMIT_PACKAGE=Yes
>
> WANTLIB+= assuan c ffi gio-2.0 glib-2.0 gmime-3.0 gmodule-2.0
> -WANTLIB+= gobject-2.0 gpg-error gpgme gthread-2.0 iconv
> +WANTLIB+= gobject-2.0 gpg-error gpgme gthread-2.0 iconv idn2
> WANTLIB+= intl json-glib-1.0 m pcre pthread ${COMPILER_LIBCXX}
> -WANTLIB+= uuid xapian z
> +WANTLIB+= unistring uuid xapian z
>
> MASTER_SITES= https://github.com/djcb/mu/releases/download/1.2/
> EXTRACT_SUFX= .tar.xz
> @@ -30,7 +31,7 @@ LIB_DEPENDS= databases/xapian-core \
>
>
> # C++14 required
> -COMPILER= base-clang ports-clang
> +COMPILER= base-clang ports-gcc
>
> AUTOCONF_VERSION= 2.69
> AUTOMAKE_VERSION= 1.15
signature.asc
Description: PGP signature
Re: mu: use ports-gcc
Stuart Henderson wrote: > On 2020/01/22 18:25, Stefan Hagen wrote: >> Stuart Henderson wrote: >>> On 2020/01/21 18:22, Xiyue Deng wrote: # C++14 required -COMPILER= base-clang ports-clang +COMPILER= base-clang ports-gcc >>> >>> This part is ok with me with the bump added. >> >> Experiement below: >> >> I don't have a gcc architecture available, so i tried to compile mail/mu >> und its dependency database/xapian-core with COMPILER= ports-gcc set on >> my amd64 box. >> >> It looks like xapian-core is not honoring the COMPILER= ports-gcc >> flag. > > That is working here, did you have an old package lying around etc?: Sort of. I figured it out. I recompiled xapian-core without adding a revision. Which then has installed the cached package. It worked now. > No maildirs here for full tests with mu, but "make test" has lots of "OK"s.. That, and I did some manual tests on my 200k email-mailbox. Updated patch below. Best Regards, Stefan Index: Makefile === RCS file: /cvs/ports/mail/mu/Makefile,v retrieving revision 1.18 diff -u -p -u -p -r1.18 Makefile --- Makefile21 Jul 2019 00:10:04 - 1.18 +++ Makefile22 Jan 2020 20:13:28 - @@ -3,6 +3,7 @@ COMMENT= maildir indexer and searcher with emacs frontend DISTNAME= mu-1.2.0 +REVISION= 1 CATEGORIES=mail HOMEPAGE= http://www.djcbsoftware.nl/code/mu/ @@ -13,9 +14,9 @@ MAINTAINER= Stefan Hagen https://github.com/djcb/mu/releases/download/1.2/ EXTRACT_SUFX= .tar.xz @@ -30,7 +31,7 @@ LIB_DEPENDS= databases/xapian-core \ # C++14 required -COMPILER= base-clang ports-clang +COMPILER= base-clang ports-gcc AUTOCONF_VERSION= 2.69 AUTOMAKE_VERSION= 1.15
Re: mu: use ports-gcc
On 2020/01/22 18:25, Stefan Hagen wrote: > Stuart Henderson wrote: > > On 2020/01/21 18:22, Xiyue Deng wrote: > > > # C++14 required > > > -COMPILER=base-clang ports-clang > > > +COMPILER=base-clang ports-gcc > > > > This part is ok with me with the bump added. > > Experiement below: > > I don't have a gcc architecture available, so i tried to compile mail/mu > und its dependency database/xapian-core with COMPILER= ports-gcc set on > my amd64 box. > > It looks like xapian-core is not honoring the COMPILER= ports-gcc > flag. That is working here, did you have an old package lying around etc?: $ objdump -p /pobj/xapian-core-1.4.14/fake-amd64/usr/local/lib/libxapian.so.5.1 | grep NEEDED NEEDED libz.so.5.0 NEEDED libuuid.so.14.0 NEEDED libestdc++.so.19.0 NEEDED libm.so.10.1 > Afterwards compiling and installing xapian-core, mail/mu still > complains about an incompatible ABI: > > ld: error: undefined symbol: > Xapian::Document::get_value[abi:cxx11](unsigned int) const No maildirs here for full tests with mu, but "make test" has lots of "OK"s.. > # nm --demangle: > mu-1.2.0/lib/tests/.libs/libxapian.so.5.1 > => _ZNK6Xapian8Document9get_valueEj > mu-1.2.0/lib/tests/.libs/libtestmucommon.a > => _ZNK6Xapian8Document9get_valueB5cxx11Ej > > I'm interested to find out why this is happening... > > Can this behavior break on other archs? > > Best Regards, > Stefan >
Re: mu: use ports-gcc
Stuart Henderson wrote: > On 2020/01/21 18:22, Xiyue Deng wrote: > > # C++14 required > > -COMPILER= base-clang ports-clang > > +COMPILER= base-clang ports-gcc > > This part is ok with me with the bump added. Experiement below: I don't have a gcc architecture available, so i tried to compile mail/mu und its dependency database/xapian-core with COMPILER= ports-gcc set on my amd64 box. It looks like xapian-core is not honoring the COMPILER= ports-gcc flag. Afterwards compiling and installing xapian-core, mail/mu still complains about an incompatible ABI: ld: error: undefined symbol: Xapian::Document::get_value[abi:cxx11](unsigned int) const # nm --demangle: mu-1.2.0/lib/tests/.libs/libxapian.so.5.1 => _ZNK6Xapian8Document9get_valueEj mu-1.2.0/lib/tests/.libs/libtestmucommon.a => _ZNK6Xapian8Document9get_valueB5cxx11Ej I'm interested to find out why this is happening... Can this behavior break on other archs? Best Regards, Stefan
Re: mu: use ports-gcc
Xiyue Deng wrote:
> Xiyue Deng writes:
> > Currently mu requires ports-clang which I think is because there was a
> > time that GCC 4.9 didn't support C++14. Now that GCC is on 8.3, mu can
> > be unblocked for GCC archs as well. I didn't change patch level as I
> > think there is no visible change, but correct me if I'm wrong.
> >
> > Tested on mips64el/loongson.
Yes, this makes sense. I'm ok with this patch.
Best Regards,
Stefan
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/mail/mu/Makefile,v
> > retrieving revision 1.18
> > diff -u -p -r1.18 Makefile
> > --- Makefile21 Jul 2019 00:10:04 - 1.18
> > +++ Makefile22 Jan 2020 02:16:59 -
> > @@ -14,7 +14,7 @@ PERMIT_PACKAGE= Yes
> >
> > WANTLIB+= assuan c ffi gio-2.0 glib-2.0 gmime-3.0 gmodule-2.0
> > WANTLIB+= gobject-2.0 gpg-error gpgme gthread-2.0 iconv
> > -WANTLIB+= intl json-glib-1.0 m pcre pthread ${COMPILER_LIBCXX}
> > +WANTLIB+= intl json-glib-1.0 m pcre pthread
> > WANTLIB+= uuid xapian z
> >
> > MASTER_SITES= https://github.com/djcb/mu/releases/download/1.2/
> > @@ -30,7 +30,7 @@ LIB_DEPENDS= databases/xapian-core \
> >
> >
> > # C++14 required
> > -COMPILER= base-clang ports-clang
> > +COMPILER= base-clang ports-gcc
> >
> > AUTOCONF_VERSION= 2.69
> > AUTOMAKE_VERSION= 1.15
Re: mu: use ports-gcc
On 2020/01/21 18:22, Xiyue Deng wrote:
> Hi,
>
> Currently mu requires ports-clang which I think is because there was a
> time that GCC 4.9 didn't support C++14. Now that GCC is on 8.3, mu can
> be unblocked for GCC archs as well. I didn't change patch level as I
> think there is no visible change, but correct me if I'm wrong.
>
> Tested on mips64el/loongson.
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/mail/mu/Makefile,v
> retrieving revision 1.18
> diff -u -p -r1.18 Makefile
> --- Makefile 21 Jul 2019 00:10:04 - 1.18
> +++ Makefile 22 Jan 2020 02:16:59 -
> @@ -14,7 +14,7 @@ PERMIT_PACKAGE= Yes
>
> WANTLIB+=assuan c ffi gio-2.0 glib-2.0 gmime-3.0 gmodule-2.0
> WANTLIB+=gobject-2.0 gpg-error gpgme gthread-2.0 iconv
> -WANTLIB+=intl json-glib-1.0 m pcre pthread ${COMPILER_LIBCXX}
> +WANTLIB+=intl json-glib-1.0 m pcre pthread
> WANTLIB+=uuid xapian z
${COMPILER_LIBCXX} should stay in the list. Seems that idn2 and unistring
should be added too.
Also needs a REVISION bump.
btw your mail was quoted-printable encoded and the patch couldn't be applied
directly.
> # C++14 required
> -COMPILER=base-clang ports-clang
> +COMPILER=base-clang ports-gcc
This part is ok with me with the bump added.
> AUTOCONF_VERSION=2.69
> AUTOMAKE_VERSION=1.15
Re: mu: use ports-gcc
Xiyue Deng writes:
> Hi,
>
> Currently mu requires ports-clang which I think is because there was a
> time that GCC 4.9 didn't support C++14. Now that GCC is on 8.3, mu can
> be unblocked for GCC archs as well. I didn't change patch level as I
> think there is no visible change, but correct me if I'm wrong.
>
> Tested on mips64el/loongson.
>
CCing maintainer Stefan.
> Index: Makefile
> ===
> RCS file: /cvs/ports/mail/mu/Makefile,v
> retrieving revision 1.18
> diff -u -p -r1.18 Makefile
> --- Makefile 21 Jul 2019 00:10:04 - 1.18
> +++ Makefile 22 Jan 2020 02:16:59 -
> @@ -14,7 +14,7 @@ PERMIT_PACKAGE= Yes
>
> WANTLIB+=assuan c ffi gio-2.0 glib-2.0 gmime-3.0 gmodule-2.0
> WANTLIB+=gobject-2.0 gpg-error gpgme gthread-2.0 iconv
> -WANTLIB+=intl json-glib-1.0 m pcre pthread ${COMPILER_LIBCXX}
> +WANTLIB+=intl json-glib-1.0 m pcre pthread
> WANTLIB+=uuid xapian z
>
> MASTER_SITES=https://github.com/djcb/mu/releases/download/1.2/
> @@ -30,7 +30,7 @@ LIB_DEPENDS=databases/xapian-core \
>
>
> # C++14 required
> -COMPILER=base-clang ports-clang
> +COMPILER=base-clang ports-gcc
>
> AUTOCONF_VERSION=2.69
> AUTOMAKE_VERSION=1.15
signature.asc
Description: PGP signature
mu: use ports-gcc
Hi,
Currently mu requires ports-clang which I think is because there was a
time that GCC 4.9 didn't support C++14. Now that GCC is on 8.3, mu can
be unblocked for GCC archs as well. I didn't change patch level as I
think there is no visible change, but correct me if I'm wrong.
Tested on mips64el/loongson.
Index: Makefile
===
RCS file: /cvs/ports/mail/mu/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- Makefile21 Jul 2019 00:10:04 - 1.18
+++ Makefile22 Jan 2020 02:16:59 -
@@ -14,7 +14,7 @@ PERMIT_PACKAGE= Yes
WANTLIB+= assuan c ffi gio-2.0 glib-2.0 gmime-3.0 gmodule-2.0
WANTLIB+= gobject-2.0 gpg-error gpgme gthread-2.0 iconv
-WANTLIB+= intl json-glib-1.0 m pcre pthread ${COMPILER_LIBCXX}
+WANTLIB+= intl json-glib-1.0 m pcre pthread
WANTLIB+= uuid xapian z
MASTER_SITES= https://github.com/djcb/mu/releases/download/1.2/
@@ -30,7 +30,7 @@ LIB_DEPENDS= databases/xapian-core \
# C++14 required
-COMPILER= base-clang ports-clang
+COMPILER= base-clang ports-gcc
AUTOCONF_VERSION= 2.69
AUTOMAKE_VERSION= 1.15
signature.asc
Description: PGP signature
