File tree Expand file tree Collapse file tree 4 files changed +10
-4
lines changed
Expand file tree Collapse file tree 4 files changed +10
-4
lines changed Original file line number Diff line number Diff line change @@ -249,6 +249,12 @@ CFLAGS := $(INCLUDE) $(OPT) $(DEBUG) $(EXTRA_DEBUG) -DULAPI -std=gnu99 -fgnu89-i
249249CXXFLAGS := $(INCLUDE ) $(EXTRA_DEBUG ) -DULAPI $(DEBUG ) $(OPT ) -Woverloaded-virtual $(CXXFLAGS ) $(CPPFLAGS )
250250CXXFLAGS += $(call cxx-option, -Wno-psabi)
251251CXXFLAGS += $(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
253259CFLAGS += $(TOOL_NML_FLAG )
254260CXXFLAGS += $(TOOL_NML_FLAG )
Original file line number Diff line number Diff line change @@ -7,7 +7,7 @@ USERSRCS += $(GENSERKINSSRCS)
77
88DELTAMODULESRCS := emc/kinematics/lineardeltakins.cc
99PYSRCS += $(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
1212DELTAMODULE := ../lib/python/lineardeltakins.so
1313$(DELTAMODULE): $(call TOOBJS, $(DELTAMODULESRCS))
@@ -27,7 +27,7 @@ TARGETS += ../bin/genserkins
2727
2828RDELTAMODULESRCS := emc/kinematics/rotarydeltakins.cc
2929PYSRCS += $(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
3232RDELTAMODULE := ../lib/python/rotarydeltakins.so
3333$(RDELTAMODULE): $(call TOOBJS, $(RDELTAMODULESRCS))
Original file line number Diff line number Diff line change @@ -37,7 +37,7 @@ LIBRS274SRCS := $(addprefix emc/rs274ngc/, \
3737USERSRCS += $(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
4242TARGETS += ../lib/librs274.so ../lib/librs274.so.0
4343
Original file line number Diff line number Diff 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
2828USERSRCS += $(MILLTASKSRCS)
2929
You can’t perform that action at this time.
0 commit comments