Attachment 180794 Details for Bug 217074 – patch

[patch] patch

cdrdao.diff (text/plain), 3.46 KB, created by Mikael Urankar on 2017-03-13 20:28:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikael Urankar

Created: 2017-03-13 20:28:13 UTC

Size: 3.46 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 436108)
>+++ Makefile	(working copy)
>@@ -68,10 +68,9 @@
> 			--with-posix-threads=no --with-scglib
> MAKE_ENV=		CCOM=cc
> SCSILIBTARGET=		${ARCH:S/powerpc64/powerpc/}-freebsd-cc
>+CDRTLSXARCH!=		${UNAME} -m
> 
> BROKEN_aarch64=		Fails to install: gmake: p: Command not found
>-BROKEN_armv6=		Fails to install: gmake: p: Command not found
>-BROKEN_mips=		Fails to install: gmake: p: Command not found
> BROKEN_mips64=		Fails to install: gmake: p: Command not found
> 
> .include <bsd.port.pre.mk>
>@@ -78,9 +77,9 @@
> 
> post-extract:
> 	@(cd ${WRKSRC}/scsilib/RULES && ${CP} os-freebsd.id os-dragonfly.id)
>-.if ${SCSILIBTARGET} != "i386-freebsd-cc"
>+.if ${CDRTLSXARCH} != "i386"
> 	@${LN} -sf ${WRKSRC}/scsilib/RULES/i386-freebsd-cc.rul \
>-		${WRKSRC}/scsilib/RULES/${SCSILIBTARGET}.rul
>+		${WRKSRC}/scsilib/RULES/${CDRTLSXARCH}-${OPSYS:tl}-cc.rul
> .endif
> 
> post-patch:
>Index: files/patch-scsilib_include_mconfig.h
>===================================================================
>--- files/patch-scsilib_include_mconfig.h	(nonexistent)
>+++ files/patch-scsilib_include_mconfig.h	(working copy)
>@@ -0,0 +1,11 @@
>+--- scsilib/include/mconfig.h.orig	2017-02-08 17:19:15 UTC
>++++ scsilib/include/mconfig.h
>+@@ -77,7 +77,7 @@ extern "C" {
>+ #define SIZEOF_CHAR_P 8
>+ #define SIZEOF_UNSIGNED_LONG_INT 8
>+ #define SIZEOF_UNSIGNED_CHAR_P 8
>+-#elif defined(__i386__) || defined(__powerpc__) || defined(__s390__) || defined(__sparc__)
>++#elif defined(__arm__) || defined(__i386__) || defined(__powerpc__) || defined(__s390__) || defined(__sparc__) || defined(__mips__)
>+ #define SIZEOF_LONG_INT 4
>+ #define SIZEOF_CHAR_P 4
>+ #define SIZEOF_UNSIGNED_LONG_INT 4
>
>Property changes on: files/patch-scsilib_include_mconfig.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-scsilib_libschily_format.c
>===================================================================
>--- files/patch-scsilib_libschily_format.c	(nonexistent)
>+++ files/patch-scsilib_libschily_format.c	(working copy)
>@@ -0,0 +1,28 @@
>+--- scsilib/libschily/format.c.orig	2017-02-08 17:14:59 UTC
>++++ scsilib/libschily/format.c
>+@@ -166,6 +166,7 @@ format(fun, farg, fmt, args)
>+ 	Ulong res;
>+ 	char *rfmt;
>+ 	f_args	fa;
>++	va_list vl;
>+ 
>+ 	fa.outf = fun;
>+ 	fa.farg = farg;
>+@@ -432,6 +433,7 @@ format(fun, farg, fmt, args)
>+ 		case 'r':			/* recursive printf */
>+ 		case 'R':			/* recursive printf */
>+ 			rfmt  = va_arg(args, char *);
>++			va_copy(vl, args);
>+ 			/*
>+ 			 * I don't know any portable way to get an arbitrary
>+ 			 * C object from a var arg list so I use a
>+@@ -446,7 +448,8 @@ format(fun, farg, fmt, args)
>+ 			 * It would be nice to have something like
>+ 			 * __va_arg_list() in stdarg.h
>+ 			 */
>+-			count += format(fun, farg, rfmt, __va_arg_list(args));
>++			count += format(fun, farg, rfmt, vl);
>++			va_end(vl);
>+ 			continue;
>+ 
>+ 		case 'n':
>
>Property changes on: files/patch-scsilib_libschily_format.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 217074: 179952 | 180793 | 180794