From 83ffd0b8cf6ea14b8f8a71184f7ad98be9fba5e4 Mon Sep 17 00:00:00 2001
From: Georg Richter <georg@mariadb.com>
Date: Mon, 25 Nov 2019 18:34:07 +0100
Subject: [PATCH] Posix build fixes: Instead of environment variables we use
 now configuration from site.cfg

---
 mariadb_posix.py | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/mariadb_posix.py b/mariadb_posix.py
index 2b2d3bc..593723d 100644
--- a/mariadb_posix.py
+++ b/mariadb_posix.py
@@ -10,6 +10,8 @@ class MariaDBConfiguration():
     version = []
     includes = []
     extra_objects = []
+    extra_compile_args = []
+    extra_link_args = []
 
 
 def mariadb_config(config, option):
@@ -32,20 +34,13 @@ def dequote(s):
     return s
 
 
-def get_config():
-    required_version = "3.1.0"
+def get_config(options):
+    required_version = "3.1.3"
     no_env = 0
-    static = 0
+    static = options["link_static"]
 
-    try:
-        config_prg = os.environ["MARIADB_CONFIG"]
-    except KeyError:
-        config_prg = 'mariadb_config'
 
-    try:
-        static = os.environ["MARIADB_STATIC"]
-    except KeyError:
-        static = 0
+    config_prg= options["mariadb_config"]
 
     cc_version = mariadb_config(config_prg, "cc_version")
     if cc_version[0] < required_version: