Skip to content

Commit ac62308

Browse files
committed
Explain why these items are silenced ("tag - you're it!")
1 parent e489bc2 commit ac62308

File tree

4 files changed

+10
-4
lines changed

4 files changed

+10
-4
lines changed

src/Makefile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,12 @@ CFLAGS := $(INCLUDE) $(OPT) $(DEBUG) $(EXTRA_DEBUG) -DULAPI -std=gnu99 -fgnu89-i
249249
CXXFLAGS := $(INCLUDE) $(EXTRA_DEBUG) -DULAPI $(DEBUG) $(OPT) -Woverloaded-virtual $(CXXFLAGS) $(CPPFLAGS)
250250
CXXFLAGS += $(call cxx-option, -Wno-psabi)
251251
CXXFLAGS += $(call cxx-option, -std=gnu++11, -std=gnu++0x)
252+
# In Debian 11, any inclusion of <boost/python.hpp> leads to several
253+
# diagnostics from included headers about deprecated features. LinuxCNC does
254+
# not directly use these deprecated features, but it does use boost::python.
255+
# Silence the warnings just when they occur in files using boost/python.hpp by
256+
# adding SILENCE_BOOST_INTERNAL_DIAGNOSTICS_FLAGS to the object's EXTRAFLAGS
257+
SILENCE_BOOST_INTERNAL_DIAGNOSTICS_FLAGS = -DBOOST_ALLOW_DEPRECATED_HEADERS=1 -DBOOST_BIND_GLOBAL_PLACEHOLDERS=1
252258

253259
CFLAGS += $(TOOL_NML_FLAG)
254260
CXXFLAGS += $(TOOL_NML_FLAG)

src/emc/kinematics/Submakefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ USERSRCS += $(GENSERKINSSRCS)
77

88
DELTAMODULESRCS := emc/kinematics/lineardeltakins.cc
99
PYSRCS += $(DELTAMODULESRCS)
10-
$(call TOOBJS, $(DELTAMODULESRCS)): EXTRAFLAGS += -DBOOST_ALLOW_DEPRECATED_HEADERS=1 -DBOOST_BIND_GLOBAL_PLACEHOLDERS=1
10+
$(call TOOBJS, $(DELTAMODULESRCS)): EXTRAFLAGS += $(SILENCE_BOOST_INTERNAL_DIAGNOSTICS_FLAGS)
1111

1212
DELTAMODULE := ../lib/python/lineardeltakins.so
1313
$(DELTAMODULE): $(call TOOBJS, $(DELTAMODULESRCS))
@@ -27,7 +27,7 @@ TARGETS += ../bin/genserkins
2727

2828
RDELTAMODULESRCS := emc/kinematics/rotarydeltakins.cc
2929
PYSRCS += $(RDELTAMODULESRCS)
30-
$(call TOOBJS, $(RDELTAMODULESRCS)): EXTRAFLAGS += -DBOOST_ALLOW_DEPRECATED_HEADERS=1 -DBOOST_BIND_GLOBAL_PLACEHOLDERS=1
30+
$(call TOOBJS, $(RDELTAMODULESRCS)): EXTRAFLAGS += $(SILENCE_BOOST_INTERNAL_DIAGNOSTICS_FLAGS)
3131

3232
RDELTAMODULE := ../lib/python/rotarydeltakins.so
3333
$(RDELTAMODULE): $(call TOOBJS, $(RDELTAMODULESRCS))

src/emc/rs274ngc/Submakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ LIBRS274SRCS := $(addprefix emc/rs274ngc/, \
3737
USERSRCS += $(LIBRS274SRCS)
3838

3939
$(call TOOBJSDEPS, $(LIBRS274SRCS)) : EXTRAFLAGS+=-fPIC $(BOOST_DEBUG_FLAGS)
40-
$(call TOOBJSDEPS, emc/rs274ngc/pyinterp1.cc emc/rs274ngc/pyparamclass.cc emc/rs274ngc/pyinterp1.cc emc/rs274ngc/pyblock.cc emc/rs274ngc/pyarrays.cc emc/rs274ngc/interpmodule.cc): EXTRAFLAGS += -DBOOST_ALLOW_DEPRECATED_HEADERS=1 -DBOOST_BIND_GLOBAL_PLACEHOLDERS=1
40+
$(call TOOBJSDEPS, emc/rs274ngc/pyinterp1.cc emc/rs274ngc/pyparamclass.cc emc/rs274ngc/pyinterp1.cc emc/rs274ngc/pyblock.cc emc/rs274ngc/pyarrays.cc emc/rs274ngc/interpmodule.cc): EXTRAFLAGS += $(SILENCE_BOOST_INTERNAL_DIAGNOSTICS_FLAGS)
4141

4242
TARGETS += ../lib/librs274.so ../lib/librs274.so.0
4343

src/emc/task/Submakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ MILLTASKSRCS := \
2323
emc/task/taskclass.cc \
2424
emc/task/backtrace.cc \
2525

26-
$(call TOOBJSDEPS, emc/task/taskmodule.cc): EXTRAFLAGS += -DBOOST_ALLOW_DEPRECATED_HEADERS=1
26+
$(call TOOBJSDEPS, emc/task/taskmodule.cc): EXTRAFLAGS += $(SILENCE_BOOST_INTERNAL_DIAGNOSTICS_FLAGS)
2727

2828
USERSRCS += $(MILLTASKSRCS)
2929

0 commit comments

Comments
 (0)