From f6aa1348d1e491798206fa0bf37d92d1f408e130 Mon Sep 17 00:00:00 2001
From: Julien Muchembled <jm@nexedi.com>
Date: Fri, 25 Aug 2017 16:40:11 +0200
Subject: [PATCH] fixup! mariadb: explicitly extends 'gcc' for RocksDB

---
 component/mariadb/buildout.cfg   | 3 +++
 component/mariadb/mariarocks.cfg | 4 +---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/component/mariadb/buildout.cfg b/component/mariadb/buildout.cfg
index c1812d29f..9bf77c0ea 100644
--- a/component/mariadb/buildout.cfg
+++ b/component/mariadb/buildout.cfg
@@ -17,6 +17,9 @@ extends =
   ../readline/buildout.cfg
   ../xz-utils/buildout.cfg
   ../zlib/buildout.cfg
+# The following lines are only for mariarocks.cfg
+# to be extended last without touching 'parts'.
+  ../gcc/buildout.cfg
 
 parts =
   mariadb
diff --git a/component/mariadb/mariarocks.cfg b/component/mariadb/mariarocks.cfg
index 9bbca9490..06e5771c3 100644
--- a/component/mariadb/mariarocks.cfg
+++ b/component/mariadb/mariarocks.cfg
@@ -1,6 +1,4 @@
-[buildout]
-extends =
-  ../gcc/buildout.cfg
+# Do not extend any file that touch buildout:parts.
 
 [mariadb]
 url = https://downloads.mariadb.com/MariaDB/mariadb-10.2.6/source/mariadb-10.2.6.tar.gz
-- 
2.30.9