quickjs: Avoid to build 32 bit programs on 64 bit platforms

[Leonardo Taccari <leot%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Sat Jul 13 15:06:35 2019 +0200
Changeset:	4c0a0022e40adaaa2ffbc7ed15a5d0e650fa067b

Modified Files:
	quickjs/distinfo
	quickjs/patches/patch-Makefile

Log Message:
quickjs: Avoid to build 32 bit programs on 64 bit platforms

At least aarch64 gcc doesn't support `-m32' option.  For the moment,
unconditionally unset CONFIG_M32 for all platforms.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=4c0a0022e40adaaa2ffbc7ed15a5d0e650fa067b

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 quickjs/distinfo               |  2 +-
 quickjs/patches/patch-Makefile | 18 ++++++++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diffs:
diff --git a/quickjs/distinfo b/quickjs/distinfo
index 59e24f7fb6..9b3064d432 100644
--- a/quickjs/distinfo
+++ b/quickjs/distinfo
@@ -4,7 +4,7 @@ SHA1 (quickjs-2019-07-09.tar.xz) = f225a1815a462f2613390d3d98c66575f519d133
 RMD160 (quickjs-2019-07-09.tar.xz) = 63f444e699a25b3d5b7c0870778843cad352cd13
 SHA512 (quickjs-2019-07-09.tar.xz) = db2498659ae1c22e5c0a24e0f2d582db6003e18a182a80f407b1ee8779edddff473572bcfecd1584281c65af8c428b2794d1c7aae90ec87e4338f7bbd9a61b7c
 Size (quickjs-2019-07-09.tar.xz) = 737248 bytes
-SHA1 (patch-Makefile) = 8c85191708cb69dafab41603a5580cdfe8c671e9
+SHA1 (patch-Makefile) = d96c2a797bb9bc7becc7f1217fc3d3457527d55f
 SHA1 (patch-cutils.h) = 9719a77add566ce6443af1ac2ba1d1ea61e5c248
 SHA1 (patch-qjs.c) = d26b8ac0f7bf84bdb17fb4784f637dcb012cbd93
 SHA1 (patch-qjsc.c) = 58733721d4e4647737d111e8835b4c1016ea2889
diff --git a/quickjs/patches/patch-Makefile b/quickjs/patches/patch-Makefile
index 6181aeda57..77d1cbc3ad 100644
--- a/quickjs/patches/patch-Makefile
+++ b/quickjs/patches/patch-Makefile
@@ -1,10 +1,11 @@
 $NetBSD$
 
 Adapt for NetBSD & pkgsrc.
+Avoid to build 32 bit utilities: aarch64 gcc does not support `-m32'.
 
---- Makefile.orig	2019-07-12 10:37:48.098876640 +0000
+--- Makefile.orig	2019-07-09 17:49:47.000000000 +0000
 +++ Makefile
-@@ -25,10 +25,17 @@
+@@ -25,17 +25,26 @@
  ifeq ($(shell uname -s),Darwin)
  CONFIG_DARWIN=y
  endif
@@ -22,7 +23,16 @@ Adapt for NetBSD & pkgsrc.
  # consider warnings as errors (for development)
  #CONFIG_WERROR=y
  
-@@ -150,8 +157,10 @@ QJSBN_OBJS=$(OBJDIR)/qjs.bn.o $(OBJDIR)/
+ ifndef CONFIG_WIN32
++ifndef CONFIG_NETBSD
+ # force 32 bit build for some utilities
+ CONFIG_M32=y
+ endif
++endif
+ ifdef CONFIG_DARWIN
+ # use clang instead of gcc
+ CONFIG_CLANG=y
+@@ -150,8 +159,10 @@ QJSBN_OBJS=$(OBJDIR)/qjs.bn.o $(OBJDIR)/
  
  LIBS=-lm
  ifndef CONFIG_WIN32
@@ -33,7 +43,7 @@ Adapt for NetBSD & pkgsrc.
  
  $(OBJDIR):
  	mkdir -p $(OBJDIR)
-@@ -300,16 +309,16 @@ clean:
+@@ -300,16 +311,16 @@ clean:
  	rm -rf run-test262-debug run-test262-32 run-test262-bn32
  
  install: all