Skip to contentSkip to conversation

package/shared-mime-info: link with -latomic if needed

PATCH In review Bernd Kuhls 2 participants 2 messages Aug 20, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/shared-mime-info: link with -latomic if needed

Buildroot commit 3f9622fe3d85b4d9f734b879abc1d485afea19b2 added an optional dependency to libatomic for libglib2 which caused the build error fixed with this patch since glib-2.0.pc does not contain any information about libatomic.

Fixes:
http://autobuild.buildroot.net/results/d25/d2563ce649188cec2025e4fc6e58c4bbd98ff939/

---
 package/shared-mime-info/shared-mime-info.mk | 5 +++++
 1 file changed, 5 insertions(+)
package/shared-mime-info/shared-mime-info.mk +5 -0
index 9932bd2db0..a9713ee639 100644
@@ -25,6 +25,11 @@ SHARED_MIME_INFO_LICENSE_FILES = COPYING
 HOST_SHARED_MIME_INFO_DEPENDENCIES = \
 	host-pkgconf host-intltool host-libxml2 host-libglib2
 
+# Uses __atomic_compare_exchange_4 from libglib2
+ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
+SHARED_MIME_INFO_CONF_ENV += LIBS=-latomic
+endif
+
 define SHARED_MIME_INFO_INSTALL_TARGET_CMDS
 	$(HOST_MAKE_ENV) $(SHARED_MIME_INFO_HOST_BINARY) $(STAGING_DIR)/usr/share/mime
 	$(INSTALL) -D $(STAGING_DIR)/usr/share/mime/mime.cache $(TARGET_DIR)/usr/share/mime/mime.cache
Signature · 6 lines
2.39.2

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw
Quoted 18 lines · On Sun, 20 Aug 2023 17:40:41 +0200 Bernd Kuhls <[email protected]> wrote:

Buildroot commit 3f9622fe3d85b4d9f734b879abc1d485afea19b2 added an optional dependency to libatomic for libglib2 which caused the build error fixed with this patch since glib-2.0.pc does not contain any information about libatomic.

Fixes:
http://autobuild.buildroot.net/results/d25/d2563ce649188cec2025e4fc6e58c4bbd98ff939/

---
 package/shared-mime-info/shared-mime-info.mk | 5 +++++
 1 file changed, 5 insertions(+)
package/shared-mime-info/shared-mime-info.mk +0 -0
index 9932bd2db0..a9713ee639 100644

package/shared-mime-info/shared-mime-info.mk SHARED_MIME_INFO_LICENSE_FILES = COPYING · line 31

Quoted 7 lines
package/shared-mime-info/shared-mime-info.mk +4 -0
@@ -25,6 +25,11 @@ SHARED_MIME_INFO_LICENSE_FILES = COPYING
 HOST_SHARED_MIME_INFO_DEPENDENCIES = \
 	host-pkgconf host-intltool host-libxml2 host-libglib2
 
+# Uses __atomic_compare_exchange_4 from libglib2
+ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
+SHARED_MIME_INFO_CONF_ENV += LIBS=-latomic
+endif

Thanks, but I continue to think that this is not the proper way of fixing this. The proper way is for glib-2.0.pc to list -latomic in its Libs.private, so that it gets picked-up by shared-mime-info when statically linking.

Thomas

Signature · 7 lines
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot