Skip to content

Add "-std=c99" to cflags implicitly #468

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 1, 2021
Merged

Add "-std=c99" to cflags implicitly #468

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
584ab6d
Support MYSQLCLIDNT_CFLAGS and MYSQLCLIENT_LDFLAGS
methane Dec 31, 2020
eabd3b8
fixup
methane Dec 31, 2020
dbd6df5
black
methane Dec 31, 2020
9e96c2f
Add "-std=c99" by default
methane Dec 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 42 additions & 21 deletions setup_posix.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,17 @@ def dequote(s):


def mysql_config(what):
from os import popen

f = popen("{} --{}".format(_mysql_config_path, what))
cmd = "{} --{}".format(_mysql_config_path, what)
print(cmd)
f = os.popen(cmd)
data = f.read().strip().split()
ret = f.close()
if ret:
if ret / 256:
data = []
if ret / 256 > 1:
raise OSError("{} not found".format(_mysql_config_path))
print(data)
return data


Expand Down Expand Up @@ -62,26 +63,41 @@ def get_config():
static = True
sys.argv.remove("--static")

libs = mysql_config("libs")
libs = os.environ.get("MYSQLCLIENT_LDFLAGS")
if libs:
libs = libs.strip().split()
else:
libs = mysql_config("libs")
library_dirs = [dequote(i[2:]) for i in libs if i.startswith("-L")]
libraries = [dequote(i[2:]) for i in libs if i.startswith("-l")]
extra_link_args = [x for x in libs if not x.startswith(("-l", "-L"))]

removable_compile_args = ("-I", "-L", "-l")
extra_compile_args = [
i.replace("%", "%%")
for i in mysql_config("cflags")
if i[:2] not in removable_compile_args
]
cflags = os.environ.get("MYSQLCLIENT_CFLAGS")
if cflags:
use_mysqlconfig_cflags = False
cflags = cflags.strip().split()
else:
use_mysqlconfig_cflags = True
cflags = mysql_config("cflags")

include_dirs = []
extra_compile_args = ["-std=c99"]

for a in cflags:
if a.startswith("-I"):
include_dirs.append(dequote(a[2:]))
elif a.startswith(("-L", "-l")): # This should be LIBS.
pass
else:
extra_compile_args.append(a.replace("%", "%%"))

# Copy the arch flags for linking as well
for i in range(len(extra_compile_args)):
if extra_compile_args[i] == "-arch":
try:
i = extra_compile_args.index("-arch")
if "-arch" not in extra_link_args:
extra_link_args += ["-arch", extra_compile_args[i + 1]]

include_dirs = [
dequote(i[2:]) for i in mysql_config("include") if i.startswith("-I")
]
except ValueError:
pass

if static:
# properly handle mysql client libraries that are not called libmysqlclient
Expand Down Expand Up @@ -109,11 +125,12 @@ def get_config():
if client in libraries:
libraries.remove(client)
else:
# mysql_config may have "-lmysqlclient -lz -lssl -lcrypto", but zlib and
# ssl is not used by _mysql. They are needed only for static build.
for L in ("crypto", "ssl", "z"):
if L in libraries:
libraries.remove(L)
if use_mysqlconfig_cflags:
# mysql_config may have "-lmysqlclient -lz -lssl -lcrypto", but zlib and
# ssl is not used by _mysql. They are needed only for static build.
for L in ("crypto", "ssl", "z"):
if L in libraries:
libraries.remove(L)

name = "mysqlclient"
metadata["name"] = name
Expand All @@ -138,6 +155,10 @@ def get_config():
if static:
ext_options["language"] = "c++"

print("ext_options:")
for k, v in ext_options.items():
print(" {}: {}".format(k, v))

return metadata, ext_options


Expand Down