Attachment 197611 Details for Bug 231780 – Fix GCC based archs, keep mips working

[patch] Fix GCC based archs, keep mips working

redis (text/plain), 3.17 KB, created by Nathan on 2018-09-30 02:25:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nathan

Created: 2018-09-30 02:25:24 UTC

Size: 3.17 KB

patch

obsolete

>databases/redis-devel: Fix build on gcc based platforms
>
>PR:		231780
>Submitted by:	Nathan <ndowens@yahoo.com>
>
>Index: databases/redis-devel/Makefile
>===================================================================
>--- databases/redis-devel/Makefile	(revision 480931)
>+++ databases/redis-devel/Makefile	(working copy)
>@@ -11,6 +11,9 @@
> 
> LICENSE=	BSD3CLAUSE
> 
>+USES=		compiler:c11 gmake
>+
>+MAKE_ENV=	"V=yo"
> USE_GITHUB=	yes
> GH_ACCOUNT=	antirez
> 
>@@ -24,11 +27,12 @@
> TESTS_DESC=	Install lang/tcl for redis unit tests
> TRIB_DESC=	Install redis-trib.rb (lang/ruby req.)
> 
>-USES+=		gmake
>-MAKE_ENV=	"V=yo"
>-
> .include <bsd.port.options.mk>
> 
>+.if ${ARCH} == mips
>+USES:=	compiler gmake
>+.endif
>+
> .if ${ARCH} == i386 && ! ${CFLAGS:M-march=*}
> # Needed for __atomic_fetch_add_8
> USE_GCC=	yes
>@@ -99,6 +103,10 @@
> .if ${PORT_OPTIONS:MLUAJIT} || ${PORT_OPTIONS:MLUA}
> 	@cd ${WRKSRC}/deps/lua/src && ${CP} fpconv.* lua_* strbuf.* ${WRKSRC}/src/
> .endif
>+.include <bsd.port.pre.mk>
>+.if ${COMPILER_TYPE} == clang
>+EXTRA_PATCHES=		${PATCHDIR}/extra-patches-src_lzf__d.c
>+.endif
> 
> post-build:
> 	${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
>@@ -118,4 +126,4 @@
> do-test:
> 	@cd ${WRKSRC} && ${TCLSH} tests/test_helper.tcl
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>Index: databases/redis-devel/files/patch-deps_lua_src_lua__cjson.c
>===================================================================
>--- databases/redis-devel/files/patch-deps_lua_src_lua__cjson.c	(nonexistent)
>+++ databases/redis-devel/files/patch-deps_lua_src_lua__cjson.c	(working copy)
>@@ -0,0 +1,12 @@
>+--- deps/lua/src/lua_cjson.c.orig	2018-09-06 11:04:23 UTC
>++++ deps/lua/src/lua_cjson.c
>+@@ -46,7 +46,9 @@
>+ #include "strbuf.h"
>+ #include "fpconv.h"
>+ 
>++#if defined(__sun)
>+ #include "../../../src/solarisfixes.h"
>++#endif
>+ 
>+ #ifndef CJSON_MODNAME
>+ #define CJSON_MODNAME   "cjson"
>
>Property changes on: databases/redis-devel/files/patch-deps_lua_src_lua__cjson.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: databases/redis-devel/files/patch-src-lua_cjson.c
>===================================================================
>--- databases/redis-devel/files/patch-src-lua_cjson.c	(revision 480931)
>+++ databases/redis-devel/files/patch-src-lua_cjson.c	(nonexistent)
>@@ -1,12 +0,0 @@
>---- deps/lua/src/lua_cjson.c.orig	2016-12-04 20:49:41.925218000 -0500
>-+++ deps/lua/src/lua_cjson.c	2016-12-04 20:49:59.728885000 -0500
>-@@ -46,7 +46,9 @@
>- #include "strbuf.h"
>- #include "fpconv.h"
>- 
>-+#if defined(__sun)
>- #include "../../../src/solarisfixes.h"
>-+#endif
>- 
>- #ifndef CJSON_MODNAME
>- #define CJSON_MODNAME   "cjson"
>
>Property changes on: databases/redis-devel/files/patch-src-lua_cjson.c
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 231780: 197567 | 197588 | 197611 | 197612 | 198305