Changes have been pushed for the repository "fawkesrobotics/fawkes".
Clone: https://github.com/fawkesrobotics/fawkes.git Gitweb: https://github.com/fawkesrobotics/fawkes The branch, thofmann/fedora34 has been updated to 7b991909c09876a5fdab88a21207b4ab476aaa03 (commit) via de9fe8ece7a7e10952c1fdc61bfd630339c68959 (commit) from 5eaf3fde9ffa321349c50b640d0a56c727898d2c (commit) https://github.com/fawkesrobotics/fawkes/tree/thofmann/fedora34 Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --------------------------------------------------------------- commit de9fe8ece7a7e10952c1fdc61bfd630339c68959 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Mon May 3 12:48:15 2021 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Mon May 3 12:57:27 2021 +0200 gazebo: only add -Wno-range-loop-construct with gazebo < 12 Assuming that this will be fixed in gazebo 12. https://github.com/fawkesrobotics/fawkes/commit/de9fe8ece - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 7b991909c09876a5fdab88a21207b4ab476aaa03 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Mon May 3 12:57:43 2021 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Mon May 3 12:57:43 2021 +0200 gazebo: also link against libm This is needed and apparently missing from gazebo's ldflags. https://github.com/fawkesrobotics/fawkes/commit/7b991909c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* ----------------------------------------------------------- src/plugins/gazebo/gazebo.mk | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) - *Diffs* ------------------------------------------------------------- - *commit* de9fe8ece7a7e10952c1fdc61bfd630339c68959 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Mon May 3 12:48:15 2021 +0200 Subject: gazebo: only add -Wno-range-loop-construct with gazebo < 12 src/plugins/gazebo/gazebo.mk | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) _Diff for modified files_: diff --git a/src/plugins/gazebo/gazebo.mk b/src/plugins/gazebo/gazebo.mk index 1350eec81..057c1b1e2 100644 --- a/src/plugins/gazebo/gazebo.mk +++ b/src/plugins/gazebo/gazebo.mk @@ -28,6 +28,7 @@ ifneq ($(PKGCONFIG),) HAVE_GAZEBO_96 = $(if $(shell $(PKGCONFIG) --atleast-version=9.6.0 'gazebo'; echo $${?/1/}),1,0) HAVE_GAZEBO_10 = $(if $(shell $(PKGCONFIG) --atleast-version=10 'gazebo'; echo $${?/1/}),1,0) HAVE_GAZEBO_11 = $(if $(shell $(PKGCONFIG) --atleast-version=11 'gazebo'; echo $${?/1/}),1,0) + HAVE_GAZEBO_12 = $(if $(shell $(PKGCONFIG) --atleast-version=12 'gazebo'; echo $${?/1/}),1,0) endif ifeq ($(HAVE_GAZEBO),1) @@ -35,9 +36,8 @@ ifeq ($(HAVE_GAZEBO),1) # references in its headers. Disable the warning until this is fixed # upstream. CFLAGS_GAZEBO = -DHAVE_GAZEBO $(shell $(PKGCONFIG) --cflags 'gazebo') \ - -DTBB_SUPPRESS_DEPRECATED_MESSAGES \ - -Wno-range-loop-construct - ifneq ($(HAVE_GAZEBO_101),1) + -DTBB_SUPPRESS_DEPRECATED_MESSAGES + ifneq ($(HAVE_GAZEBO_10),1) # Gazebo 8 declared several symbols as deprecated but still uses them. # Those were fixed in Gazebo 10. # Disable the deprecated declarations warning with older gazebo versions. @@ -52,9 +52,12 @@ ifeq ($(HAVE_GAZEBO),1) ifneq ($(HAVE_GAZEBO_11),1) CFLAGS_GAZEBO += -DBOOST_BIND_GLOBAL_PLACEHOLDERS endif - + # Assume that this is no longer necessary in Gazebo 12. + ifneq ($(HAVE_GAZEBO_12),1) + CFLAGS_GAZEBO += -Wno-range-loop-construct + endif # if ffmpeg is installed, gazebo may have been compiled with support for it - # # hence check for headers and add the respective include directories + # hence check for headers and add the respective include directories ifneq ($(wildcard $(SYSROOT)/usr/include/ffmpeg/libavcodec/avcodec.h),) CFLAGS_GAZEBO += -I$(SYSROOT)/usr/include/ffmpeg endif - *commit* 7b991909c09876a5fdab88a21207b4ab476aaa03 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Mon May 3 12:57:43 2021 +0200 Subject: gazebo: also link against libm src/plugins/gazebo/gazebo.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) _Diff for modified files_: diff --git a/src/plugins/gazebo/gazebo.mk b/src/plugins/gazebo/gazebo.mk index 057c1b1e2..fe1001f77 100644 --- a/src/plugins/gazebo/gazebo.mk +++ b/src/plugins/gazebo/gazebo.mk @@ -43,7 +43,7 @@ ifeq ($(HAVE_GAZEBO),1) # Disable the deprecated declarations warning with older gazebo versions. CFLAGS += -Wno-deprecated-declarations endif - LDFLAGS_GAZEBO = $(shell $(PKGCONFIG) --libs 'gazebo') -ldl + LDFLAGS_GAZEBO = $(shell $(PKGCONFIG) --libs 'gazebo') -ldl -lm ifeq ($(HAVE_GAZEBO_96)$(boost-have-lib system),11) LDFLAGS_GAZEBO += $(boost-lib-ldflags system) _______________________________________________ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
