From d08f8dd0f4607a72f1d5497467a2f0cf5a8ee5d4 Mon Sep 17 00:00:00 2001 From: Dominik Prien Date: Mon, 1 Jul 2019 19:43:34 +0200 Subject: make: Move -std=99 to setup.py --- Makefile | 4 +--- setup.py | 10 +++++----- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 6d6f749..b7070df 100644 --- a/Makefile +++ b/Makefile @@ -6,8 +6,6 @@ INCLUDE_FLAGS := $(shell pkg-config --cflags libsystemd) VERSION := $(shell $(PYTHON) setup.py --version) TESTFLAGS = -v -CFLAGS = -std=c99 - define buildscript import sys,sysconfig print("build/lib.{}-{}.{}".format(sysconfig.get_platform(), *sys.version_info[:2])) @@ -32,7 +30,7 @@ update-constants: update-constants.py $(INCLUDE_DIR)/systemd/sd-messages.h mv docs/id128.rst{.tmp,} build: - CFLAGS=$(CFLAGS) $(PYTHON) setup.py build_ext $(INCLUDE_FLAGS) + $(PYTHON) setup.py build_ext $(INCLUDE_FLAGS) $(PYTHON) setup.py build install: diff --git a/setup.py b/setup.py index 1381d23..099819b 100644 --- a/setup.py +++ b/setup.py @@ -51,30 +51,30 @@ defines = {'define_macros':[('PACKAGE_VERSION', '"{}"'.format(version))]} _journal = Extension('systemd/_journal', sources = ['systemd/_journal.c', 'systemd/pyutil.c'], - extra_compile_args=['-Werror=implicit-function-declaration'], + extra_compile_args=['-std=c99', '-Werror=implicit-function-declaration'], **lib('libsystemd', 'libsystemd-journal', **defines)) _reader = Extension('systemd/_reader', sources = ['systemd/_reader.c', 'systemd/pyutil.c', 'systemd/strv.c'], - extra_compile_args=['-Werror=implicit-function-declaration'], + extra_compile_args=['-std=c99', '-Werror=implicit-function-declaration'], **lib('libsystemd', 'libsystemd-journal', **defines)) _daemon = Extension('systemd/_daemon', sources = ['systemd/_daemon.c', 'systemd/pyutil.c', 'systemd/util.c'], - extra_compile_args=['-Werror=implicit-function-declaration'], + extra_compile_args=['-std=c99', '-Werror=implicit-function-declaration'], **lib('libsystemd', 'libsystemd-daemon', **defines)) id128 = Extension('systemd/id128', sources = ['systemd/id128.c', 'systemd/pyutil.c'], - extra_compile_args=['-Werror=implicit-function-declaration'], + extra_compile_args=['-std=c99', '-Werror=implicit-function-declaration'], **lib('libsystemd', 'libsystemd-id128', **defines)) login = Extension('systemd/login', sources = ['systemd/login.c', 'systemd/pyutil.c', 'systemd/strv.c'], - extra_compile_args=['-Werror=implicit-function-declaration'], + extra_compile_args=['-std=c99', '-Werror=implicit-function-declaration'], **lib('libsystemd', 'libsystemd-login', **defines)) setup (name = 'systemd-python', version = version, -- cgit v1.2.1