quickjs: remove -latomic

This commit is contained in:
Đoàn Trần Công Danh 2023-09-09 10:50:01 +07:00
parent fe8f4f7590
commit 8ca78ce64b
3 changed files with 30 additions and 20 deletions

View File

@ -1,12 +0,0 @@
--- a/qjsc.c
+++ b/qjsc.c
@@ -452,6 +452,9 @@ static int output_executable(const char *out_filename, const char *cfilename,
*arg++ = "-lm";
*arg++ = "-ldl";
*arg++ = "-lpthread";
+#ifdef LINK_ATOMIC
+ *arg++ = "-latomic";
+#endif
*arg = NULL;
if (verbose) {

View File

@ -0,0 +1,29 @@
--- a/Makefile
+++ b/Makefile
@@ -197,7 +197,7 @@ ifneq ($(CROSS_PREFIX),)
$(QJSC): $(OBJDIR)/qjsc.host.o \
$(patsubst %.o, %.host.o, $(QJS_LIB_OBJS))
- $(HOST_CC) $(LDFLAGS) -o $@ $^ $(HOST_LIBS)
+ $(HOST_CC) $(BUILD_LDFLAGS) -o $@ $^ $(HOST_LIBS)
endif #CROSS_PREFIX
@@ -263,7 +263,7 @@ $(OBJDIR)/%.o: %.c | $(OBJDIR)
$(CC) $(CFLAGS_OPT) -c -o $@ $<
$(OBJDIR)/%.host.o: %.c | $(OBJDIR)
- $(HOST_CC) $(CFLAGS_OPT) -c -o $@ $<
+ $(HOST_CC) $(BUILD_CFLAGS) -c -o $@ $<
$(OBJDIR)/%.pic.o: %.c | $(OBJDIR)
$(CC) $(CFLAGS_OPT) -fPIC -DJS_SHARED_LIBRARY -c -o $@ $<
@@ -287,7 +287,7 @@ regexp_test: libregexp.c libunicode.c cu
$(CC) $(LDFLAGS) $(CFLAGS) -DTEST -o $@ libregexp.c libunicode.c cutils.c $(LIBS)
unicode_gen: $(OBJDIR)/unicode_gen.host.o $(OBJDIR)/cutils.host.o libunicode.c unicode_gen_def.h
- $(HOST_CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OBJDIR)/unicode_gen.host.o $(OBJDIR)/cutils.host.o
+ $(HOST_CC) $(BUILD_LDFLAGS) $(BUILD_CFLAGS) -o $@ $(OBJDIR)/unicode_gen.host.o $(OBJDIR)/cutils.host.o
clean:
rm -f repl.c qjscalc.c out.c

View File

@ -5,7 +5,6 @@ revision=4
build_style=gnu-makefile
make_use_env=true
make_build_args="CONFIG_LTO="
make_install_args="${make_build_args}"
short_desc="Small and embeddable Javascript engine"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="MIT"
@ -15,17 +14,11 @@ checksum=a45bface4c3379538dea8533878d694e289330488ea7028b105f72572fe7fe1a
if [ "$CROSS_BUILD" ]; then
make_build_args+=" CROSS_PREFIX=${XBPS_CROSS_TRIPLET}-"
make_install_args="${make_build_args}"
fi
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
CFLAGS+=" -DLINK_ATOMIC"
export EXTRA_LIBS="-latomic"
fi
make_install_args="${make_build_args}"
pre_configure() {
vsed -i -e 's|%s/lib/quickjs|%s/lib|' qjsc.c
vsed -i -e '/HOST_CC/s/CFLAGS_OPT/BUILD_CFLAGS/' Makefile
cat >>Makefile <<EOF
CFLAGS += ${CFLAGS}
LDFLAGS += ${LDFLAGS}