@@ -111,49 +111,7 @@ $(EXTENSIONS_DIR)/micro_ros_src/install: $(EXTENSIONS_DIR)/esp32_toolchain.cmake
111111 -DCMAKE_C_STANDARD=$(C_STANDARD ) \
112112 -DUCLIENT_C_STANDARD=$(C_STANDARD ) ;
113113
114- patch_atomic :$(EXTENSIONS_DIR ) /micro_ros_src/install
115- # Workaround https://github.com/micro-ROS/micro_ros_espidf_component/issues/18
116- ifeq ($(IDF_TARGET ) ,$(filter $(IDF_TARGET ) ,esp32s2 esp32c3 esp32c6) )
117- echo $(UROS_DIR)/atomic_workaround; \
118- mkdir $(UROS_DIR)/atomic_workaround; cd $(UROS_DIR)/atomic_workaround; \
119- $(X_AR) x $(UROS_DIR)/install/lib/librcutils.a; \
120- $(X_STRIP) atomic_64bits.c.obj --strip-symbol=__atomic_fetch_add_8; \
121- if [ $(IDF_VERSION_MAJOR) -ge 4 ] && [ $(IDF_VERSION_MINOR) -ge 3 ]; then \
122- $(X_STRIP) atomic_64bits.c.obj --strip-symbol=__atomic_load_8; \
123- $(X_STRIP) atomic_64bits.c.obj --strip-symbol=__atomic_store_8; \
124- $(X_STRIP) atomic_64bits.c.obj --strip-symbol=__atomic_exchange_8; \
125- fi; \
126- if [ $(IDF_VERSION_MAJOR) -ge 4 ] && [ $(IDF_VERSION_MINOR) -ge 4 ]; then \
127- $(X_STRIP) atomic_64bits.c.obj --strip-symbol=__atomic_load_8; \
128- $(X_STRIP) atomic_64bits.c.obj --strip-symbol=__atomic_store_8; \
129- fi; \
130- if [ $(IDF_VERSION_MAJOR) -ge 5 ] && [ $(IDF_VERSION_MINOR) -ge 0 ]; then \
131- $(X_STRIP) atomic_64bits.c.obj --strip-symbol=__atomic_load_8; \
132- $(X_STRIP) atomic_64bits.c.obj --strip-symbol=__atomic_store_8; \
133- $(X_STRIP) atomic_64bits.c.obj --strip-symbol=__atomic_exchange_8; \
134- fi; \
135- $(X_AR) rc -s librcutils.a *.obj; \
136- cp -rf librcutils.a $(UROS_DIR)/install/lib/librcutils.a; \
137- cd ..; \
138- rm -rf $(UROS_DIR)/atomic_workaround;
139- endif
140- ifeq ($(IDF_TARGET ) ,$(filter $(IDF_TARGET ) ,esp32) )
141- echo $(UROS_DIR)/atomic_workaround; \
142- mkdir $(UROS_DIR)/atomic_workaround; cd $(UROS_DIR)/atomic_workaround; \
143- $(X_AR) x $(UROS_DIR)/install/lib/librcutils.a; \
144- $(X_STRIP) atomic_64bits.c.obj --strip-symbol=__atomic_fetch_add_8; \
145- if [ $(IDF_VERSION_MAJOR) -ge 5 ] && [ $(IDF_VERSION_MINOR) -ge 3 ]; then \
146- $(X_STRIP) atomic_64bits.c.obj --strip-symbol=__atomic_load_8; \
147- $(X_STRIP) atomic_64bits.c.obj --strip-symbol=__atomic_store_8; \
148- $(X_STRIP) atomic_64bits.c.obj --strip-symbol=__atomic_exchange_8; \
149- fi; \
150- $(X_AR) rc -s librcutils.a *.obj; \
151- cp -rf librcutils.a $(UROS_DIR)/install/lib/librcutils.a; \
152- cd ..; \
153- rm -rf $(UROS_DIR)/atomic_workaround;
154- endif
155-
156- $(EXTENSIONS_DIR ) /libmicroros.a : $(EXTENSIONS_DIR ) /micro_ros_src/install patch_atomic
114+ $(EXTENSIONS_DIR ) /libmicroros.a : $(EXTENSIONS_DIR ) /micro_ros_src/install
157115 mkdir -p $(UROS_DIR ) /libmicroros; cd $(UROS_DIR ) /libmicroros; \
158116 for file in $$ (find $( UROS_DIR) /install/lib/ -name ' *.a' ); do \
159117 folder=$$(echo $$file | sed -E "s/(.+ ) \/ (.+).a/\2 /" ); \
0 commit comments