From owner-svn-src-all@FreeBSD.ORG Tue May 15 20:48:10 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 709381065670; Tue, 15 May 2012 20:48:10 +0000 (UTC) (envelope-from jpaetzel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 58DC98FC0C; Tue, 15 May 2012 20:48:10 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q4FKmAHq004941; Tue, 15 May 2012 20:48:10 GMT (envelope-from jpaetzel@svn.freebsd.org) Received: (from jpaetzel@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4FKmAEN004937; Tue, 15 May 2012 20:48:10 GMT (envelope-from jpaetzel@svn.freebsd.org) Message-Id: <201205152048.q4FKmAEN004937@svn.freebsd.org> From: Josh Paetzel Date: Tue, 15 May 2012 20:48:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r235483 - in stable/9/sys: conf contrib/xz-embedded/freebsd contrib/xz-embedded/linux/include/linux contrib/xz-embedded/linux/lib/xz X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 May 2012 20:48:10 -0000 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 # include #else +#ifdef __FreeBSD__ +# include +# include +#else # include # include #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 #endif /* If no specific decoding mode is requested, enable support for all modes. */