Attachment 231194 Details for Bug 261359 – This fixes c66a851d13783558a8fa17ffcf64759a0c1b5bab.

[patch] This fixes c66a851d13783558a8fa17ffcf64759a0c1b5bab.

fix-c66a851d13783558a8fa17ffcf64759a0c1b5bab.diff (text/plain), 3.37 KB, created by Cy Schubert on 2022-01-20 21:16:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Cy Schubert

Created: 2022-01-20 21:16:16 UTC

Size: 3.37 KB

patch

obsolete

>diff --git a/x11/cde/Makefile b/x11/cde/Makefile
>index a87ec364b298..564a5e54c419 100644
>--- a/x11/cde/Makefile
>+++ b/x11/cde/Makefile
>@@ -40,6 +40,12 @@ MAKE_JOBS_UNSAFE=yes
> SUB_FILES=	pkg-message
> LDFLAGS+=	-z muldefs #--allow-multiple-definition
> 
>+.include <bsd.port.pre.mk>
>+
>+.if ${ARCH} == powerpc64le
>+CPPFLAGS+=	-DPOWERPC64LE
>+.endif
>+
> post-patch:
> 	@if [ -f /usr/include/iconv.h ]; then \
> 	    ${REINPLACE_CMD} -e 's!^[[:space:]]*const char .ip = (const char .) .bp!char *ip = *bp!' \
>@@ -116,4 +122,4 @@ do-install:
> post-install:
> 	${FIND} ${STAGEDIR}/${PREFIX}/dt -type f -exec ${SH} -c '${STRIP_CMD} {} > /dev/null 2>&1' \;
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>diff --git a/x11/cde/files/patch-programs_dtksh_ksh93_src_lib_libast_hash_hashalloc.c b/x11/cde/files/patch-programs_dtksh_ksh93_src_lib_libast_hash_hashalloc.c
>index f050420f5e21..004f6a5212b9 100644
>--- a/x11/cde/files/patch-programs_dtksh_ksh93_src_lib_libast_hash_hashalloc.c
>+++ b/x11/cde/files/patch-programs_dtksh_ksh93_src_lib_libast_hash_hashalloc.c
>@@ -1,20 +1,25 @@
>---- programs/dtksh/ksh93/src/lib/libast/hash/hashalloc.c.orig	2021-12-13 19:03:46 UTC
>-+++ programs/dtksh/ksh93/src/lib/libast/hash/hashalloc.c
>-@@ -49,6 +49,7 @@ hashalloc(Hash_table_t* ref, ...)
>+--- programs/dtksh/ksh93/src/lib/libast/hash/hashalloc.c.orig	2022-01-20 12:56:31.275926000 -0800
>++++ programs/dtksh/ksh93/src/lib/libast/hash/hashalloc.c	2022-01-20 12:59:47.461533000 -0800
>+@@ -49,6 +49,9 @@
>  	va_list*		vp = va;
>  	Hash_region_f		region = 0;
>  	void*			handle;
>++#ifdef POWERPC64LE
> +	va_listarg		tmpval;
>++#endif
>  
>  	va_start(ap, ref);
>  
>-@@ -151,7 +152,8 @@ hashalloc(Hash_table_t* ref, ...)
>+@@ -151,7 +154,12 @@
>  				va_copy(*vp, ap);
>  				vp++;
>  			}
>--			va_copy(ap, va_listval(va_arg(ap, va_listarg)));
>++#ifdef POWERPC64LE
> +			tmpval = va_listval(va_arg(ap, va_listarg));
> +			va_copy(ap, tmpval);
>++#else
>+ 			va_copy(ap, va_listval(va_arg(ap, va_listarg)));
>++#endif
>  			break;
>  		case 0:
>  			if (vp > va)
>diff --git a/x11/cde/files/patch-programs_dtksh_ksh93_src_lib_libast_string_tokscan.c b/x11/cde/files/patch-programs_dtksh_ksh93_src_lib_libast_string_tokscan.c
>index 5dcf7b11dafe..ae486604c41e 100644
>--- a/x11/cde/files/patch-programs_dtksh_ksh93_src_lib_libast_string_tokscan.c
>+++ b/x11/cde/files/patch-programs_dtksh_ksh93_src_lib_libast_string_tokscan.c
>@@ -1,20 +1,25 @@
>---- programs/dtksh/ksh93/src/lib/libast/string/tokscan.c.orig	2021-12-13 22:46:02 UTC
>-+++ programs/dtksh/ksh93/src/lib/libast/string/tokscan.c
>-@@ -188,6 +188,7 @@ tokscan(register char* s, char** nxt, const char* fmt,
>+--- programs/dtksh/ksh93/src/lib/libast/string/tokscan.c.orig	2022-01-20 12:56:38.679529000 -0800
>++++ programs/dtksh/ksh93/src/lib/libast/string/tokscan.c	2022-01-20 13:02:26.179022000 -0800
>+@@ -188,6 +188,9 @@
>  	char**		p_string;
>  	char*		prv_f = 0;
>  	va_list		prv_ap;
>++#ifdef POWERPC64LE
> +	va_listarg	tmpval;
>++#endif
>  
>  	va_start(ap, fmt);
>  	if (!*s || *s == '\n')
>-@@ -233,7 +234,8 @@ tokscan(register char* s, char** nxt, const char* fmt,
>+@@ -233,7 +236,12 @@
>  			prv_f = f;
>  			f = va_arg(ap, char*);
>  			va_copy(prv_ap, ap);
>--			va_copy(ap, va_listval(va_arg(ap, va_listarg)));
>++#ifdef POWERPC64LE
> +			tmpval = va_listval(va_arg(ap, va_listarg));
> +			va_copy(ap, tmpval);
>++#else
>+ 			va_copy(ap, va_listval(va_arg(ap, va_listarg)));
>++#endif
>  			continue;
>  		case 'c':
>  			p_char = va_arg(ap, char*);

Actions: View | Diff

Attachments on bug 261359: 231185 | 231194 | 231198 | 231200