svn commit: r556299 - in head/lang/quickjs: . files

[Piotr Kubaj]

Author: pkubaj
Date: Wed Nov 25 17:49:35 2020
New Revision: 556299
URL: https://svnweb.freebsd.org/changeset/ports/556299

Log:
  lang/quickjs: fix build on GCC architectures
  
  Don't use Clang if we need to use GCC
  
  PR:		251030
  Approved by:	yuri (maintainer timeout)
  MFH:		2020Q4 (fix build blanket)

Added:
  head/lang/quickjs/files/extra-clang-patch-Makefile
     - copied unchanged from r556298, head/lang/quickjs/files/patch-Makefile
  head/lang/quickjs/files/extra-gcc-patch-Makefile
     - copied, changed from r554856, head/lang/quickjs/files/patch-Makefile
Deleted:
  head/lang/quickjs/files/patch-Makefile
Modified:
  head/lang/quickjs/Makefile

Modified: head/lang/quickjs/Makefile
==============================================================================
--- head/lang/quickjs/Makefile	Wed Nov 25 17:43:33 2020	(r556298)
+++ head/lang/quickjs/Makefile	Wed Nov 25 17:49:35 2020	(r556299)
@@ -11,6 +11,16 @@ COMMENT=	Embeddable Javascript interpreter in C
 
 LICENSE=	MIT
 
-USES=		gmake tar:xz
+USES=		compiler:c11 gmake tar:xz
 
-.include <bsd.port.mk>
+EXTRA_PATCHES=	${FILESDIR}/extra-${CHOSEN_COMPILER_TYPE}-patch-Makefile
+
+.include <bsd.port.pre.mk>
+
+.if ${CHOSEN_COMPILER_TYPE} == gcc
+post-patch:
+	@${REINPLACE_CMD} -e 's/%%GCC_DEFAULT%%/${GCC_DEFAULT}/' \
+		${WRKSRC}/Makefile
+.endif
+
+.include <bsd.port.post.mk>

Copied: head/lang/quickjs/files/extra-clang-patch-Makefile (from r556298, head/lang/quickjs/files/patch-Makefile)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/quickjs/files/extra-clang-patch-Makefile	Wed Nov 25 17:49:35 2020	(r556299, copy of r556298, head/lang/quickjs/files/patch-Makefile)
@@ -0,0 +1,25 @@
+--- Makefile.orig	2019-09-18 18:34:20 UTC
++++ Makefile
+@@ -25,6 +25,9 @@
+ ifeq ($(shell uname -s),Darwin)
+ CONFIG_DARWIN=y
+ endif
++ifeq ($(shell uname -s),FreeBSD)
++CONFIG_FREEBSD=y
++endif
+ # Windows cross compilation from Linux
+ #CONFIG_WIN32=y
+ # use link time optimization (smaller and faster executables but slower build)
+@@ -38,6 +41,12 @@ ifdef CONFIG_DARWIN
+ # use clang instead of gcc
+ CONFIG_CLANG=y
+ CONFIG_DEFAULT_AR=y
++endif
++ifdef CONFIG_FREEBSD
++# use clang instead of gcc
++CONFIG_CLANG=y
++CONFIG_DEFAULT_AR=y
++CONFIG_LTO=
+ endif
+ 
+ # installation directory

Copied and modified: head/lang/quickjs/files/extra-gcc-patch-Makefile (from r554856, head/lang/quickjs/files/patch-Makefile)
==============================================================================
--- head/lang/quickjs/files/patch-Makefile	Tue Nov 10 20:04:49 2020	(r554856, copy source)
+++ head/lang/quickjs/files/extra-gcc-patch-Makefile	Wed Nov 25 17:49:35 2020	(r556299)
@@ -1,4 +1,4 @@
---- Makefile.orig	2019-09-18 18:34:20 UTC
+--- Makefile.orig	2020-09-06 09:31:51 UTC
 +++ Makefile
 @@ -25,6 +25,9 @@
  ifeq ($(shell uname -s),Darwin)
@@ -10,16 +10,27 @@
  # Windows cross compilation from Linux
  #CONFIG_WIN32=y
  # use link time optimization (smaller and faster executables but slower build)
-@@ -38,6 +41,12 @@ ifdef CONFIG_DARWIN
- # use clang instead of gcc
+@@ -39,6 +42,12 @@ ifdef CONFIG_DARWIN
  CONFIG_CLANG=y
  CONFIG_DEFAULT_AR=y
-+endif
+ endif
 +ifdef CONFIG_FREEBSD
 +# use clang instead of gcc
-+CONFIG_CLANG=y
++CONFIG_CLANG=
 +CONFIG_DEFAULT_AR=y
 +CONFIG_LTO=
- endif
++endif
  
  # installation directory
+ prefix=/usr/local
+@@ -81,8 +90,8 @@ ifdef CONFIG_CLANG
+     endif
+   endif
+ else
+-  HOST_CC=gcc
+-  CC=$(CROSS_PREFIX)gcc
++  HOST_CC=gcc%%GCC_DEFAULT%%
++  CC=$(CROSS_PREFIX)gcc%%GCC_DEFAULT%%
+   CFLAGS=-g -Wall -MMD -MF $(OBJDIR)/$(@F).d
+   CFLAGS += -Wno-array-bounds -Wno-format-truncation
+   ifdef CONFIG_LTO