diff --git a/sys-kernel/spl/Manifest b/sys-kernel/spl/Manifest index 7936c6d..4117f4b 100644 --- a/sys-kernel/spl/Manifest +++ b/sys-kernel/spl/Manifest @@ -1,3 +1,4 @@ +AUX spl-kernel4.13-fix.patch 1669 BLAKE2B 2cf15db82287e6235930c67f24ce15c0113949075434e5cf8184ed8a1de1284ba4d64e5756c2d1bb022c4f7280990878d56eb26405d9e34babe900d6193dda35 SHA512 d4fad64031aee42bd15ac59356a577a27bf385f3d94a2afcf5c24571e122f7039be95b7188a99d5207ab1eb7243fb74760b5253e78527674d5c5b9978b6c696f DIST spl-0.6.5.11.tar.gz 531710 BLAKE2B e89cb5a023d3f4b3949a385100b56e01c5fd0ff4448bc175f8463a84b74d1d8f1fcf669c2e4b73f2ec3326653594106ebfa3e66987e49a9cd029355bbb317990 SHA512 eae1641a0d528cb9182deccd309625e13abf3db88ba1cbb54947055b23d1f94b62c045f939d5e952784f19719eea5fdf85d65c5abd22b9db167ea7780bc55722 -EBUILD spl-0.6.5.11.ebuild 2602 BLAKE2B 73d09514a4c84c551ab5585b4953373e1513fd75e5f427a7ae51cfdae2fb52c4c85ad7195878c131baf31ef2d978d20e7359bca7e54b1d88ba0f36b8db67b5f2 SHA512 bf5e47912dbb131a8d27cf2ac8aa2cc40859f239db693302e4a352e5784834fde4d12b986d45fbb1a446cd4eb67cb7e86dcd42672d874f6d0c5a0089e52c1e4b +EBUILD spl-0.6.5.11.ebuild 2655 BLAKE2B b5aea16090ff1c819f3785a2fe6ad07b6f4146be39c56d49840012661bdde1fc4175d18e1ad9fe25f2ab70f4e284e93497995e3cdc1c07197a32f23a5f973449 SHA512 21fe54395a6b7c637dc742d2b0fdcf41ae66d41196e05c2236b15030417ffad7850d84f66d83cc98c08455c2d148fae6293b5d81acaef313021bbbb55dcfa271 MISC metadata.xml 436 BLAKE2B df6b2b25107b10b62618306f09e48f4337315792390c58392f73b270466f4927209dba0d8d1f1d8b8f65f345bce077a7b738f240f077a0eb26c23353673d412f SHA512 1b867378bde3ac034a7fbdc84e47b77b570ecf7a7688b0dc47950de7ea6601284c8101600928ddb7725f7a09ecc73eb01bdf646b0ecca250029e3063a4427ca8 diff --git a/sys-kernel/spl/files/spl-kernel4.13-fix.patch b/sys-kernel/spl/files/spl-kernel4.13-fix.patch new file mode 100644 index 0000000..d94a2aa --- /dev/null +++ b/sys-kernel/spl/files/spl-kernel4.13-fix.patch @@ -0,0 +1,64 @@ +From 8fadbed84951d54ef7379f2b08a63bb601dc8a08 Mon Sep 17 00:00:00 2001 +From: RageLtMan +Date: Fri, 13 Jan 2017 17:12:42 -0500 +Subject: [PATCH] Update struct member intializers to C89 + +When building SPL within the kernel tree, C99 initializers cause +build failures and need to be converted to C89 as kernel CFLAGS +specify -std=gnu89. + +This fix was provided by @behlendorf in #595 discussion notes and +manually implemented in the current master revision. + +Reviewed-by: Brian Behlendorf +Signed-off-by: RageLtMan +Closes #597 +--- + module/spl/spl-proc.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/module/spl/spl-proc.c b/module/spl/spl-proc.c +index eb00505d..08ca9741 100644 +--- a/module/spl/spl-proc.c ++++ b/module/spl/spl-proc.c +@@ -402,11 +402,11 @@ static struct ctl_table spl_kmem_table[] = { + .mode = 0444, + .proc_handler = &proc_doslab, + }, +- {0}, ++ {}, + }; + + static struct ctl_table spl_kstat_table[] = { +- {0}, ++ {}, + }; + + static struct ctl_table spl_table[] = { +@@ -437,7 +437,7 @@ static struct ctl_table spl_table[] = { + .mode = 0555, + .child = spl_kstat_table, + }, +- { 0 }, ++ {}, + }; + + static struct ctl_table spl_dir[] = { +@@ -446,7 +446,7 @@ static struct ctl_table spl_dir[] = { + .mode = 0555, + .child = spl_table, + }, +- { 0 } ++ {} + }; + + static struct ctl_table spl_root[] = { +@@ -458,7 +458,7 @@ static struct ctl_table spl_root[] = { + .mode = 0555, + .child = spl_dir, + }, +- { 0 } ++ {} + }; + + int diff --git a/sys-kernel/spl/spl-0.6.5.11.ebuild b/sys-kernel/spl/spl-0.6.5.11.ebuild index 9fd8163..1ac98b4 100644 --- a/sys-kernel/spl/spl-0.6.5.11.ebuild +++ b/sys-kernel/spl/spl-0.6.5.11.ebuild @@ -35,6 +35,10 @@ AT_M4DIR="config" AUTOTOOLS_IN_SOURCE_BUILD="1" DOCS=( AUTHORS DISCLAIMER ) +PATCHES=( + "${FILESDIR}"/spl-kernel4.13-fix.patch +) + pkg_setup() { linux-info_pkg_setup CONFIG_CHECK="