Commit 8cc1be30 authored by VIGNET Pierre's avatar VIGNET Pierre
Browse files

DONT REMOVE mandatory flags for gcc in Fedora => removing -D_FORTIFY_SOURCE=2...

DONT REMOVE mandatory flags for gcc in Fedora => removing -D_FORTIFY_SOURCE=2 causes gcc to.. block (sic); cleaner setup.py
parent 8881f154
...@@ -35,7 +35,7 @@ from distutils import sysconfig ...@@ -35,7 +35,7 @@ from distutils import sysconfig
from setuptools import setup, Extension, find_packages from setuptools import setup, Extension, find_packages
from setuptools.command.test import test as TestCommand from setuptools.command.test import test as TestCommand
__PACKAGE_VERSION__ = "0.1.3" __PACKAGE_VERSION__ = "0.1.4"
__LIBRARY_VERSION__ = "0.1.0" __LIBRARY_VERSION__ = "0.1.0"
################################################################################ ################################################################################
...@@ -64,8 +64,7 @@ class PyTest(TestCommand): ...@@ -64,8 +64,7 @@ class PyTest(TestCommand):
# through what you have to do to make that happen. # through what you have to do to make that happen.
d = sysconfig.get_config_vars() d = sysconfig.get_config_vars()
for k, v in d.items(): for k, v in d.items():
for unwanted in ('-Wstrict-prototypes', '-DNDEBUG', ' -g ', for unwanted in (' -g ', '-O2'):
'-O2', '-D_FORTIFY_SOURCE=2', '-fstack-protector-strong'):
if str(v).find(unwanted) != -1: if str(v).find(unwanted) != -1:
v = d[k] = str(v).replace(unwanted, ' ') v = d[k] = str(v).replace(unwanted, ' ')
...@@ -83,12 +82,9 @@ modules = [ ...@@ -83,12 +82,9 @@ modules = [
"-march=native", "-march=native",
"-mtune=native", "-mtune=native",
"-Ofast", "-Ofast",
#"-O3",
#"-Wall", #"-Wall",
#"-g", # Not define NDEBUG macro => Debug build #"-g", # Not define NDEBUG macro => Debug build
"-DNDEBUG", # Force release build "-DNDEBUG", # Force release build
#"-DBOOST_TEST_DYN_LINK",
#"-DUSE_ZLIB",
"-std=c11", "-std=c11",
"-Wno-unused-variable", "-Wno-unused-variable",
"-Wno-unused-but-set-variable", "-Wno-unused-but-set-variable",
...@@ -96,7 +92,7 @@ modules = [ ...@@ -96,7 +92,7 @@ modules = [
# and multiplication wraps around using twos-complement # and multiplication wraps around using twos-complement
# representation # representation
"-fwrapv", "-fwrapv",
#BOF protect (use both) # BOF protect (use both)
#"-D_FORTIFY_SOURCE=2", #"-D_FORTIFY_SOURCE=2",
#"-fstack-protector-strong", #"-fstack-protector-strong",
"-pthread", "-pthread",
...@@ -137,7 +133,7 @@ setup( ...@@ -137,7 +133,7 @@ setup(
ext_modules=modules, ext_modules=modules,
description="Cadbiom library", description="Cadbiom library",
long_description=open('README.md').read(), long_description=open('README.md').read(),
install_requires=["networkx<2", "lxml", "pycryptosat"], install_requires=["networkx<2", "lxml", "pycryptosat>0.1.3"],
# Tests # Tests
tests_require=['pytest'], tests_require=['pytest'],
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment