NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/quickjs: link with libatomic

Browse Source 
Link with libatomic if available.

Fixes:

  - http://autobuild.buildroot.net/results/e0766eef95a2559d51e58d1a81a9c40df84ae509

  .../build/quickjs-2020-11-08/quickjs.c:12229: undefined reference to `__atomic_fetch_xor_1'

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
[yann.morin.1998@free.fr:
  - make it a generic variable, not tied to -latomic
  - pass it in all step, like CROSS_PREFIX
]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This commit is contained in:
Peter Seiderer 2021-01-03 21:19:59 +01:00 committed by Yann E. MORIN
parent 1af6d7408c
commit ac992501e3
2 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
package/quickjs/0001-Makefile-add-optional-link-with-libatomic.patch Normal file
View File

@ -0,0 +1,37 @@
From 2cf2aa34d5d55a4eedb1aedd4d56d89d24870230 Mon Sep 17 00:00:00 2001
From: Peter Seiderer <ps.report@gmx.net>
Date: Sun, 3 Jan 2021 21:11:44 +0100
Subject: [PATCH] Makefile: allow linking with extra libraries
With some toolchains, it is neede to link with extra libraries, for
example with -latomic, to fix:
.../build/quickjs-2020-11-08/quickjs.c:12229: undefined reference to `__atomic_fetch_xor_1'
Fixes:
http://autobuild.buildroot.net/results/e0766eef95a2559d51e58d1a81a9c40df84ae509
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
[yann.morin.1998@free.fr:
- make it a generic variable, not tied to -latomic
]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index e6ae827..22ad496 100644
--- a/Makefile
+++ b/Makefile
@@ -179,6 +179,7 @@ endif
ifndef CONFIG_WIN32
LIBS+=-ldl -lpthread
endif
+LIBS+=$(EXTRA_LIBS)
$(OBJDIR):
mkdir -p $(OBJDIR) $(OBJDIR)/examples $(OBJDIR)/tests
--
2.29.2

7
package/quickjs/quickjs.mk
View File

@ -10,15 +10,21 @@ QUICKJS_SITE = https://bellard.org/quickjs
QUICKJS_LICENSE = MIT QUICKJS_LICENSE = MIT
QUICKJS_INSTALL_STAGING = YES QUICKJS_INSTALL_STAGING = YES
ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
QUICKJS_EXTRA_LIBS += -latomic
endif
define QUICKJS_BUILD_CMDS define QUICKJS_BUILD_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
CROSS_PREFIX="$(TARGET_CROSS)" \ CROSS_PREFIX="$(TARGET_CROSS)" \
EXTRA_LIBS="$(QUICKJS_EXTRA_LIBS)" \
all all
endef endef
define QUICKJS_INSTALL_STAGING_CMDS define QUICKJS_INSTALL_STAGING_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
CROSS_PREFIX="$(TARGET_CROSS)" \ CROSS_PREFIX="$(TARGET_CROSS)" \
EXTRA_LIBS="$(QUICKJS_EXTRA_LIBS)" \
DESTDIR=$(STAGING_DIR) \ DESTDIR=$(STAGING_DIR) \
STRIP=/bin/true \ STRIP=/bin/true \
prefix=/usr \ prefix=/usr \
@ -28,6 +34,7 @@ endef
define QUICKJS_INSTALL_TARGET_CMDS define QUICKJS_INSTALL_TARGET_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
CROSS_PREFIX="$(TARGET_CROSS)" \ CROSS_PREFIX="$(TARGET_CROSS)" \
EXTRA_LIBS="$(QUICKJS_EXTRA_LIBS)" \
DESTDIR=$(TARGET_DIR) \ DESTDIR=$(TARGET_DIR) \
STRIP=/bin/true \ STRIP=/bin/true \
prefix=/usr \ prefix=/usr \