From 8ca78ce64b16d1356dcd977f0613cdb380988fd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Sep 2023 10:50:01 +0700
Subject: [PATCH] quickjs: remove -latomic

---
 srcpkgs/quickjs/patches/atomic.patch | 12 ------------
 srcpkgs/quickjs/patches/cross.patch  | 29 ++++++++++++++++++++++++++++
 srcpkgs/quickjs/template             |  9 +--------
 3 files changed, 30 insertions(+), 20 deletions(-)
 delete mode 100644 srcpkgs/quickjs/patches/atomic.patch
 create mode 100644 srcpkgs/quickjs/patches/cross.patch

diff --git a/srcpkgs/quickjs/patches/atomic.patch b/srcpkgs/quickjs/patches/atomic.patch
deleted file mode 100644
index c6b658a3c86..00000000000
--- a/srcpkgs/quickjs/patches/atomic.patch
+++ /dev/null
@@ -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) {
diff --git a/srcpkgs/quickjs/patches/cross.patch b/srcpkgs/quickjs/patches/cross.patch
new file mode 100644
index 00000000000..6b7ae3ef11c
--- /dev/null
+++ b/srcpkgs/quickjs/patches/cross.patch
@@ -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
diff --git a/srcpkgs/quickjs/template b/srcpkgs/quickjs/template
index 52e343d12ff..da651cba2cb 100644
--- a/srcpkgs/quickjs/template
+++ b/srcpkgs/quickjs/template
@@ -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}