svn commit: r235483 - in stable/9/sys: conf contrib/xz-embedded/freebsd contrib/xz-embedded/linux/include/linux contrib/xz-embedded/linux/lib/xz

[Josh Paetzel]

Author: jpaetzel
Date: Tue May 15 20:48:09 2012
New Revision: 235483
URL: http://svn.freebsd.org/changeset/base/235483

Log:
  MFC 229533:
  
  Update contrib/xz-embedded to build with new GEOM_UNCOMPRESS module.

Added:
  stable/9/sys/contrib/xz-embedded/freebsd/
     - copied from r229533, head/sys/contrib/xz-embedded/freebsd/
Modified:
  stable/9/sys/conf/files
  stable/9/sys/contrib/xz-embedded/linux/include/linux/xz.h
  stable/9/sys/contrib/xz-embedded/linux/lib/xz/xz_private.h
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/conf/   (props changed)

Modified: stable/9/sys/conf/files
==============================================================================
--- stable/9/sys/conf/files	Tue May 15 20:47:00 2012	(r235482)
+++ stable/9/sys/conf/files	Tue May 15 20:48:09 2012	(r235483)
@@ -2264,6 +2264,21 @@ geom/raid3/g_raid3.c		optional geom_raid
 geom/raid3/g_raid3_ctl.c	optional geom_raid3
 geom/shsec/g_shsec.c		optional geom_shsec
 geom/stripe/g_stripe.c		optional geom_stripe
+contrib/xz-embedded/freebsd/xz_malloc.c	\
+	optional xz_embedded \
+	compile-with "${NORMAL_C} -I$S/contrib/xz-embedded/freebsd/ -I$S/contrib/xz-embedded/linux/lib/xz/ -I$S/contrib/xz-embedded/linux/include/linux/"
+contrib/xz-embedded/linux/lib/xz/xz_crc32.c \
+	optional xz_embedded \
+	compile-with "${NORMAL_C} -I$S/contrib/xz-embedded/freebsd/ -I$S/contrib/xz-embedded/linux/lib/xz/ -I$S/contrib/xz-embedded/linux/include/linux/"
+contrib/xz-embedded/linux/lib/xz/xz_dec_bcj.c \
+	optional xz_embedded \
+	compile-with "${NORMAL_C} -I$S/contrib/xz-embedded/freebsd/ -I$S/contrib/xz-embedded/linux/lib/xz/ -I$S/contrib/xz-embedded/linux/include/linux/"
+contrib/xz-embedded/linux/lib/xz/xz_dec_lzma2.c \
+	optional xz_embedded \
+	compile-with "${NORMAL_C} -I$S/contrib/xz-embedded/freebsd/ -I$S/contrib/xz-embedded/linux/lib/xz/ -I$S/contrib/xz-embedded/linux/include/linux/"
+contrib/xz-embedded/linux/lib/xz/xz_dec_stream.c \
+	optional xz_embedded \
+	compile-with "${NORMAL_C} -I$S/contrib/xz-embedded/freebsd/ -I$S/contrib/xz-embedded/linux/lib/xz/ -I$S/contrib/xz-embedded/linux/include/linux/"
 geom/uzip/g_uzip.c		optional geom_uzip
 geom/virstor/binstream.c	optional geom_virstor
 geom/virstor/g_virstor.c	optional geom_virstor

Modified: stable/9/sys/contrib/xz-embedded/linux/include/linux/xz.h
==============================================================================
--- stable/9/sys/contrib/xz-embedded/linux/include/linux/xz.h	Tue May 15 20:47:00 2012	(r235482)
+++ stable/9/sys/contrib/xz-embedded/linux/include/linux/xz.h	Tue May 15 20:48:09 2012	(r235483)
@@ -15,9 +15,14 @@
 #	include <linux/stddef.h>
 #	include <linux/types.h>
 #else
+#ifdef __FreeBSD__
+#	include <sys/stddef.h>
+#	include <sys/types.h>
+#else
 #	include <stddef.h>
 #	include <stdint.h>
 #endif
+#endif
 
 #ifdef __cplusplus
 extern "C" {

Modified: stable/9/sys/contrib/xz-embedded/linux/lib/xz/xz_private.h
==============================================================================
--- stable/9/sys/contrib/xz-embedded/linux/lib/xz/xz_private.h	Tue May 15 20:47:00 2012	(r235482)
+++ stable/9/sys/contrib/xz-embedded/linux/lib/xz/xz_private.h	Tue May 15 20:48:09 2012	(r235483)
@@ -47,7 +47,7 @@
 	 * macros and functions. This makes it easier to adapt the code into
 	 * different environments and avoids clutter in the Linux kernel tree.
 	 */
-#	include "xz_config.h"
+#	include <contrib/xz-embedded/freebsd/xz_config.h>
 #endif
 
 /* If no specific decoding mode is requested, enable support for all modes. */