Tuesday, December 31, 2019

Re: UPDATE mail/s-nail

Le Tue, 31 Dec 2019 20:55:02 +0100,
Steffen Nurpmeso <steffen@sdaoden.eu> a écrit :

> Hello ports@.
>
> An update to v14.9.16. Mailcap support etc., many fixes.
>
> Now really parallelizes tests even on OpenBSD even without -j
> make flag. Unfortunately needs a patch since i broke clang
> (non-) inlining for levels <-O1 (that "rework that false INLINE
> sauce" was .. false). But i assumed OpenBSD does not like
> OPT_AUTOGCC still, even if it enables a lot of security related
> compile time flags :).
>
> Thanks for your consideration, and a hopefully
>
> Happy new year 2020.
>
> Ciao from Germany!
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/mail/s-nail/Makefile,v
> retrieving revision 1.25
> diff -u -p -r1.25 Makefile
> --- Makefile 20 Aug 2019 09:59:59 -0000 1.25
> +++ Makefile 31 Dec 2019 19:46:16 -0000
> @@ -2,7 +2,7 @@
>
> COMMENT= SysV mail/BSD Mail/POSIX mailx: send and
> receive mail
> -DISTNAME= s-nail-14.9.15
> +DISTNAME= s-nail-14.9.16
> CATEGORIES= mail
> HOMEPAGE= https://www.sdaoden.eu/code.html\#s-mailx
>
> @@ -26,10 +26,8 @@ MAKE_FLAGS= CC="${CC}" \
> VAL_SYSCONFDIR="${SYSCONFDIR}" \
> VAL_SID= \
> OPT_ALWAYS_UNICODE_LOCALE=yes \
> - OPT_AGENT=no \
> OPT_AUTOCC=no \
> OPT_DOTLOCK=no \
> - OPT_GSSAPI=no \
> VAL_RANDOM=arc4
>
> .if ${FLAVOR:Midna}
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/mail/s-nail/distinfo,v
> retrieving revision 1.18
> diff -u -p -r1.18 distinfo
> --- distinfo 20 Aug 2019 09:59:59 -0000 1.18
> +++ distinfo 31 Dec 2019 19:46:16 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (s-nail-14.9.15.tar.gz) =
> TEux2uD9btq/HSaKxqR23pqrPBW0u+IUFUmhHb8rrnM= -SIZE
> (s-nail-14.9.15.tar.gz) = 1036102 +SHA256 (s-nail-14.9.16.tar.gz) =
> 6tdv3+YquK8P2w3a2fi4QZeqsYge0V6y+mVFcqjLvu0= +SIZE
> (s-nail-14.9.16.tar.gz) = 1075490 Index:
> patches/patch-include_su_code_h
> ===================================================================
> RCS file: patches/patch-include_su_code_h diff -N
> patches/patch-include_su_code_h --- /dev/null 1 Jan 1970
> 00:00:00 -0000 +++ patches/patch-include_su_code_h 31 Dec 2019
> 19:46:16 -0000 @@ -0,0 +1,39 @@
> +$OpenBSD$
> +
> +commit 0eb2314c
> +Author: Steffen Nurpmeso <steffen@sdaoden.eu>
> +AuthorDate: 2019-12-31 20:34:34 +0100
> +Commit: Steffen Nurpmeso <steffen@sdaoden.eu>
> +CommitDate: 2019-12-31 20:34:52 +0100
> +
> + FIX clang: not inlining with <-O2; comment out _Alignof() usage
> +---
> + include/su/code.h | 8 +++++---
> + 1 file changed, 5 insertions(+), 3 deletions(-)
> +
> +diff --git a/include/su/code.h b/include/su/code.h
> +index 6e6cd74c..af1e5a30 100644
> +--- include/su/code.h
> ++++ include/su/code.h
> +@@ -470,8 +470,9 @@ do{\
> + # define su_INLINE static inline
> + # define su_SINLINE static inline
> + # else
> +-# define su_INLINE inline
> +-# define su_SINLINE static inline
> ++ /* clang does not like inline with <-O2 */
> ++# define su_INLINE inline __attribute__((always_inline))
> ++# define su_SINLINE static inline __attribute__((always_inline))
> + # endif
> + # else
> + # define su_INLINE static __inline
> +@@ -534,7 +535,8 @@ do{\
> + #define su_ROUND_UP2(X,BASE) (((X) + ((BASE) - 1)) & (~((BASE) -
> 1)))
> +
> + /* Alignment. Note: su_uz POW2 asserted in POD section below! */
> +-#if defined __STDC_VERSION__ && __STDC_VERSION__ +0 >= 201112L
> ++/* Commented out: "_Alignof() applied to an expression is a GNU
> extension" */ ++#if 0 && defined __STDC_VERSION__ && __STDC_VERSION__
> +0 >= 201112L
> + # include <stdalign.h>
> + # define su_ALIGNOF(X) _Alignof(X)
> + #else
>
> --steffen
> |
> |Der Kragenbaer, The moon bear,
> |der holt sich munter he cheerfully and one by one
> |einen nach dem anderen runter wa.ks himself off
> |(By Robert Gernhardt)
>

hi, portcheck(1) reports this error but I'm unsure why

Missing library for idn2>=0.0
*** Error 1 in . (/home/ports/infrastructure/mk/bsd.port.mk:3374 'port-wantlib-args')
*** Error 1 in /home/ports/mail/s-nail (/home/ports/infrastructure/mk/bsd.port.mk:3033 'print-plist-with-depends')
in FLAVOR "idna": the following libraries in WANTLIB look like masked by RUN_DEPENDS: idn2

No comments:

Post a Comment