Attachment 221072 Details for Bug 252252 – git(1) diff against the ports tree

[patch] git(1) diff against the ports tree

0007-lang-scm-fix-build.patch (text/plain), 2.00 KB, created by Kyle Evans on 2020-12-29 05:50:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle Evans

Created: 2020-12-29 05:50:06 UTC

Size: 2.00 KB

patch

obsolete

>From 886d3ed33b76bc6c06be346652978b7e70bec7a9 Mon Sep 17 00:00:00 2001
>From: Kyle Evans <kevans@FreeBSD.org>
>Date: Mon, 28 Dec 2020 23:31:56 -0600
>Subject: [PATCH 07/13] lang/scm: fix build
>
>Signed-off-by: Kyle Evans <kevans@FreeBSD.org>
>---
> lang/scm/Makefile              | 2 ++
> lang/scm/files/patch-build.scm | 5 +++--
> 2 files changed, 5 insertions(+), 2 deletions(-)
>
>diff --git a/lang/scm/Makefile b/lang/scm/Makefile
>index d6f5a9cfe0c5..95efeb5299d7 100644
>--- a/lang/scm/Makefile
>+++ b/lang/scm/Makefile
>@@ -15,6 +15,8 @@ COMMENT=	Scheme interpreter
> 
> LICENSE=	LGPL21
> 
>+LIB_DEPENDS=	libgnuregex.so.6:devel/libgnuregex
>+
> BROKEN_aarch64=	ld: error: undefined symbol: sbrk
> BROKEN_powerpc64=	fails to build: "/wrkdirs/usr/ports/lang/scm/work/slib/lineio.scm": read-char: Wrong type in arg1 #f
> 
>diff --git a/lang/scm/files/patch-build.scm b/lang/scm/files/patch-build.scm
>index 0c582c235504..951bfe797afc 100644
>--- a/lang/scm/files/patch-build.scm
>+++ b/lang/scm/files/patch-build.scm
>@@ -9,7 +9,8 @@
>       (m freebsd "" "-lm" #f () ())
> -     (curses freebsd "" "-lncurses" "/usr/lib/libncurses.a" () ())
> +     (curses freebsd "" "-lcurses" "/usr/lib/libcurses.a" () ())
>-      (regex freebsd "-I/usr/include/gnu" "-lgnuregex" "" () ())
>+-     (regex freebsd "-I/usr/include/gnu" "-lgnuregex" "" () ())
>++     (regex freebsd "-I%%LOCALBASE%%/include" "-lgnuregex" "-L%%LOCALBASE%%/lib" () ())
>       (editline freebsd "" "-lreadline" "" () ())
> -     (dlll freebsd "-DSUN_DL" "-export-dynamic" "" () ())
> -     (nostart freebsd "" "-e start -dc -dp -Bstatic -lgnumalloc" #f ("pre-crt0.c") ())
>@@ -56,7 +57,7 @@
>  		 (cond
>  		  ((equal? (car fnames) "edline") "-lreadline")
> -		  ((equal? (car fnames) "x") "-L/usr/X11R6/lib -lSM -lICE -lXext -lX11 -lxpg4")
>-+		  ((equal? (car fnames) "rgx") "-lgnuregex")
>++		  ((equal? (car fnames) "rgx") "-L%%LOCALBASE%%/lib -lgnuregex")
> +		  ((equal? (car fnames) "x") "-L%%LOCALBASE%%/lib -lSM -lICE -lXext -lX11")
>  		  (else ""))
>  		 "-o" (string-append (car fnames) ".so")
>-- 
>2.29.2
>

Actions: View | Diff

Attachments on bug 252252: 221072