Avoid symbol redefition to fix armel builds (#457)

* Avoid symbol redefiniition on armel builds Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
gazebosim · Oct 13, 2021 · e61ff3c · e61ff3c
1 parent 43f53aa
commit e61ff3c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/include/ignition/rendering/Storage.hh b/include/ignition/rendering/Storage.hh
@@ -294,6 +294,10 @@ namespace ignition
       public: virtual ~StoreWrapper() { }
     };
 
+// armhf failed to build with this code. It can not be removed for the rest
+// of arches to keep ABI but should be removed in major versions unreleased
+// see https://github.com/ignitionrobotics/ign-rendering/pull/457
+#ifndef __ARM_PCS_VFP
     template class Store<Scene>;
     template class Store<Node>;
     template class Store<Light>;
@@ -303,6 +307,7 @@ namespace ignition
     template class Store<SubMesh>;
     template class Map<Material>;
     template class CompositeStore<Node>;
+#endif
 
     /// \def SceneStore
     /// \brief Store of Scene

diff --git a/ogre/include/ignition/rendering/ogre/OgreStorage.hh b/ogre/include/ignition/rendering/ogre/OgreStorage.hh
@@ -34,7 +34,11 @@ namespace ignition
   namespace rendering
   {
     inline namespace IGNITION_RENDERING_VERSION_NAMESPACE {
-    //
+
+// armhf failed to build with this code. It can not be removed for the rest
+// of arches to keep ABI but should be removed in major versions unreleased
+// see https://github.com/ignitionrobotics/ign-rendering/pull/457
+#ifndef __ARM_PCS_VFP
     template class BaseSceneStore<OgreScene>;
     template class BaseNodeStore<OgreNode>;
     template class BaseLightStore<OgreLight>;
@@ -43,6 +47,7 @@ namespace ignition
     template class BaseGeometryStore<OgreGeometry>;
     template class BaseSubMeshStore<OgreSubMesh>;
     template class BaseMaterialMap<OgreMaterial>;
+#endif
 
     typedef BaseSceneStore<OgreScene>       OgreSceneStore;
     typedef BaseNodeStore<OgreNode>         OgreNodeStore;

diff --git a/ogre2/include/ignition/rendering/ogre2/Ogre2Storage.hh b/ogre2/include/ignition/rendering/ogre2/Ogre2Storage.hh
@@ -33,14 +33,19 @@ namespace ignition
   namespace rendering
   {
     inline namespace IGNITION_RENDERING_VERSION_NAMESPACE {
-    //
+
+// armhf failed to build with this code. It can not be removed for the rest
+// of arches to keep ABI but should be removed in major versions unreleased
+// see https://github.com/ignitionrobotics/ign-rendering/pull/457
+#ifndef __ARM_PCS_VFP
     template class BaseGeometryStore<Ogre2Geometry>;
     template class BaseLightStore<Ogre2Light>;
     template class BaseNodeStore<Ogre2Node>;
     template class BaseSceneStore<Ogre2Scene>;
     template class BaseSensorStore<Ogre2Sensor>;
     template class BaseSubMeshStore<Ogre2SubMesh>;
     template class BaseVisualStore<Ogre2Visual>;
+#endif
 
     typedef BaseGeometryStore<Ogre2Geometry>    Ogre2GeometryStore;
     typedef BaseLightStore<Ogre2Light>          Ogre2LightStore;