svn commit: r392430 - head/devel/android-tools-fastboot-devel/files

[Jan Beich]

Author: jbeich
Date: Sat Jul 18 16:42:12 2015
New Revision: 392430
URL: https://svnweb.freebsd.org/changeset/ports/392430

Log:
  devel/android-tools-fastboot-devel: unbreak build on DragonFly
  
  As only make_ext4fs(1) with -u option wants -DREAL_UUID no need
  to try to use uuid(3) instead here.

Added:
  head/devel/android-tools-fastboot-devel/files/patch-ext4__utils_ext4__utils.c   (contents, props changed)

Added: head/devel/android-tools-fastboot-devel/files/patch-ext4__utils_ext4__utils.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/android-tools-fastboot-devel/files/patch-ext4__utils_ext4__utils.c	Sat Jul 18 16:42:12 2015	(r392430)
@@ -0,0 +1,22 @@
+Avoid conflict with slightly different |struct uuid| in <sys/uuid.h>.
+
+  ext4_utils/ext4_utils.c:64:8: error: redefinition of 'struct uuid'
+   struct uuid {
+          ^
+  In file included from /usr/include/sys/disklabel.h:47:0,
+                   from /usr/include/sys/diskslice.h:70,
+                   from ext4_utils/ext4_utils.c:53:
+  /usr/include/sys/uuid.h:45:8: note: originally defined here
+   struct uuid {
+          ^
+
+--- ext4_utils/ext4_utils.c.orig	2015-07-18 11:53:50 UTC
++++ ext4_utils/ext4_utils.c
+@@ -53,6 +61,7 @@ struct sparse_file *ext4_sparse_file;
+ jmp_buf setjmp_env;
+ 
+ /* Definition from RFC-4122 */
++#define uuid ext4_uuid
+ struct uuid {
+     u32 time_low;
+     u16 time_mid;