Attachment 179952 Details for Bug 217074 – patch

[patch] patch

sysutils_cdrdao.diff (text/plain), 4.14 KB, created by Mikael Urankar on 2017-02-13 17:06:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikael Urankar

Created: 2017-02-13 17:06:35 UTC

Size: 4.14 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 433636)
>+++ Makefile	(working copy)
>@@ -70,7 +70,6 @@
> SCSILIBTARGET=		${ARCH:S/powerpc64/powerpc/}-freebsd-cc
> 
> 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
> 
>Index: files/patch-scsilib_RULES_mk-gmake.id
>===================================================================
>--- files/patch-scsilib_RULES_mk-gmake.id	(nonexistent)
>+++ files/patch-scsilib_RULES_mk-gmake.id	(working copy)
>@@ -0,0 +1,11 @@
>+--- scsilib/RULES/mk-gmake.id.orig	2009-10-05 11:58:21 UTC
>++++ scsilib/RULES/mk-gmake.id
>+@@ -41,7 +41,7 @@ _MACHCMD=	(uname -p || true)	2> /dev/nul
>+ _ARCHCMD=	(arch || /usr/ucb/arch || true)	2> /dev/null
>+ 
>+ XP_ARCH:=	$(shell $(_MACHCMD) | tr '[A-Z]' '[a-z]' | tr ', /\\()"' ',//////' | tr ',/' ',-')
>+-XK_ARCH:=	$(shell uname -m    | tr '[A-Z]' '[a-z]' | tr ', /\\()"' ',//////' | tr ',/' ',-')
>++XK_ARCH:=	$(shell uname -p    | tr '[A-Z]' '[a-z]' | tr ', /\\()"' ',//////' | tr ',/' ',-')
>+ XM_ARCH:=	$(shell $(_ARCHCMD) | tr '[A-Z]' '[a-z]' | tr ', /\\()"' ',//////' | tr ',/' ',-')
>+ 
>+ P_ARCH=		$(XP_ARCH)
>
>Property changes on: files/patch-scsilib_RULES_mk-gmake.id
>___________________________________________________________________
>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_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__)
>+ #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