Generate DWARF for python HelperSDT (refix)

Refix commit 4e8058f38d7f2ec2040d43ddcfddff5217e89423 by letting
CFLAGS propagate to python/setup.py through the Makefile, instead
of passing the flag explicitly.  Suggested by Miro Hroncok in
https://issues.redhat.com/browse/RHEL-43481 .

diff --git a/python/Makefile.am b/python/Makefile.am
index a254480f9d653e7c2c6a2528adf640ac21f11867..13618dc2f20d7cc651e4e2ddf4f167f208322f8c 100644 (file)
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -29,12 +29,12 @@ pkglibexecpython_DATA += stap-resolve-module-function.py
 
 all-local:
 if HAVE_PYTHON2_PROBES
-       (cd $(srcdir); CFLAGS="$(AM_CPPFLAGS)" $(PYTHON) setup.py build \
+       (cd $(srcdir); CFLAGS="$(CFLAGS) $(AM_CPPFLAGS)" $(PYTHON) setup.py build \
          --build-base $(shell readlink -f $(builddir))/py2build \
          --verbose)
 endif
 if HAVE_PYTHON3_PROBES
-       (cd $(srcdir); CFLAGS="$(AM_CPPFLAGS)" $(PYTHON3) setup.py build \
+       (cd $(srcdir); CFLAGS="$(CFLAGS) $(AM_CPPFLAGS)" $(PYTHON3) setup.py build \
          --build-base $(shell readlink -f $(builddir))/py3build \
          --verbose)
 endif
@@ -45,7 +45,7 @@ endif
 # and we need to keep separate build directories for python 2 and 3.
 install-exec-local:
 if HAVE_PYTHON2_PROBES
-       (cd $(srcdir); CFLAGS="$(AM_CPPFLAGS)" $(PYTHON) setup.py build \
+       (cd $(srcdir); CFLAGS="$(CFLAGS) $(AM_CPPFLAGS)" $(PYTHON) setup.py build \
          --build-base $(shell readlink -f $(builddir))/py2build \
         install --prefix $(DESTDIR)$(prefix) \
         --single-version-externally-managed \
@@ -53,7 +53,7 @@ if HAVE_PYTHON2_PROBES
          --verbose)
 endif
 if HAVE_PYTHON3_PROBES
-       (cd $(srcdir); CFLAGS="$(AM_CPPFLAGS)" $(PYTHON3) setup.py build \
+       (cd $(srcdir); CFLAGS="$(CFLAGS) $(AM_CPPFLAGS)" $(PYTHON3) setup.py build \
          --build-base $(shell readlink -f $(builddir))/py3build \
         install --prefix $(DESTDIR)$(prefix) \
         --single-version-externally-managed \

diff --git a/python/Makefile.in b/python/Makefile.in
index 1216eefff85d7cd18c2a362fa453b5836e029af5..62fe2129c40b9758610074293decba7933b1bc75 100644 (file)
--- a/python/Makefile.in
+++ b/python/Makefile.in
@@ -624,10 +624,10 @@ uninstall-am: uninstall-pkglibexecpythonDATA \
 
 
 @HAVE_PYTHON_PROBES_TRUE@all-local:
-@HAVE_PYTHON2_PROBES_TRUE@@HAVE_PYTHON_PROBES_TRUE@    (cd $(srcdir); CFLAGS="$(AM_CPPFLAGS)" $(PYTHON) setup.py build \
+@HAVE_PYTHON2_PROBES_TRUE@@HAVE_PYTHON_PROBES_TRUE@    (cd $(srcdir); CFLAGS="$(CFLAGS) $(AM_CPPFLAGS)" $(PYTHON) setup.py build \
 @HAVE_PYTHON2_PROBES_TRUE@@HAVE_PYTHON_PROBES_TRUE@         --build-base $(shell readlink -f $(builddir))/py2build \
 @HAVE_PYTHON2_PROBES_TRUE@@HAVE_PYTHON_PROBES_TRUE@         --verbose)
-@HAVE_PYTHON3_PROBES_TRUE@@HAVE_PYTHON_PROBES_TRUE@    (cd $(srcdir); CFLAGS="$(AM_CPPFLAGS)" $(PYTHON3) setup.py build \
+@HAVE_PYTHON3_PROBES_TRUE@@HAVE_PYTHON_PROBES_TRUE@    (cd $(srcdir); CFLAGS="$(CFLAGS) $(AM_CPPFLAGS)" $(PYTHON3) setup.py build \
 @HAVE_PYTHON3_PROBES_TRUE@@HAVE_PYTHON_PROBES_TRUE@         --build-base $(shell readlink -f $(builddir))/py3build \
 @HAVE_PYTHON3_PROBES_TRUE@@HAVE_PYTHON_PROBES_TRUE@         --verbose)
 
@@ -635,13 +635,13 @@ uninstall-am: uninstall-pkglibexecpythonDATA \
 # since only the build command has the '--build-base' directory option
 # and we need to keep separate build directories for python 2 and 3.
 @HAVE_PYTHON_PROBES_TRUE@install-exec-local:
-@HAVE_PYTHON2_PROBES_TRUE@@HAVE_PYTHON_PROBES_TRUE@    (cd $(srcdir); CFLAGS="$(AM_CPPFLAGS)" $(PYTHON) setup.py build \
+@HAVE_PYTHON2_PROBES_TRUE@@HAVE_PYTHON_PROBES_TRUE@    (cd $(srcdir); CFLAGS="$(CFLAGS) $(AM_CPPFLAGS)" $(PYTHON) setup.py build \
 @HAVE_PYTHON2_PROBES_TRUE@@HAVE_PYTHON_PROBES_TRUE@         --build-base $(shell readlink -f $(builddir))/py2build \
 @HAVE_PYTHON2_PROBES_TRUE@@HAVE_PYTHON_PROBES_TRUE@     install --prefix $(DESTDIR)$(prefix) \
 @HAVE_PYTHON2_PROBES_TRUE@@HAVE_PYTHON_PROBES_TRUE@     --single-version-externally-managed \
 @HAVE_PYTHON2_PROBES_TRUE@@HAVE_PYTHON_PROBES_TRUE@     --record $(shell readlink -f $(builddir))/py2build/install_files.txt \
 @HAVE_PYTHON2_PROBES_TRUE@@HAVE_PYTHON_PROBES_TRUE@         --verbose)
-@HAVE_PYTHON3_PROBES_TRUE@@HAVE_PYTHON_PROBES_TRUE@    (cd $(srcdir); CFLAGS="$(AM_CPPFLAGS)" $(PYTHON3) setup.py build \
+@HAVE_PYTHON3_PROBES_TRUE@@HAVE_PYTHON_PROBES_TRUE@    (cd $(srcdir); CFLAGS="$(CFLAGS) $(AM_CPPFLAGS)" $(PYTHON3) setup.py build \
 @HAVE_PYTHON3_PROBES_TRUE@@HAVE_PYTHON_PROBES_TRUE@         --build-base $(shell readlink -f $(builddir))/py3build \
 @HAVE_PYTHON3_PROBES_TRUE@@HAVE_PYTHON_PROBES_TRUE@     install --prefix $(DESTDIR)$(prefix) \
 @HAVE_PYTHON3_PROBES_TRUE@@HAVE_PYTHON_PROBES_TRUE@     --single-version-externally-managed \

diff --git a/python/setup.py b/python/setup.py
index 0942fab043a273616bfcd051c4ce1cc608db8852..aea5ce9c8b1aef53dfc220fd9e33c6c7951e97c0 100644 (file)
--- a/python/setup.py
+++ b/python/setup.py
@@ -48,8 +48,7 @@ setup(
     author = 'Systemtap Development Team',
     author_email = 'systemtap@sourceware.org',
     ext_modules = [
-        Extension("HelperSDT._HelperSDT", ["HelperSDT/_HelperSDT.c"],
-        extra_compile_args=['-g'], extra_link_args=['-g']),
+        Extension("HelperSDT._HelperSDT", ["HelperSDT/_HelperSDT.c"]),
     ],
     packages = ['HelperSDT'],
     cmdclass={