Attachment #213818 for bug #245941




# $FreeBSD$

PORTNAME=	ccl
PORTVERSION=	1.12
PORTREVISION=	1
CATEGORIES=	lang lisp

USE_GITHUB=	nodefault
GH_ACCOUNT=	Clozure
GH_TAGNAME=	v${PORTVERSION}
DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:DEFAULT freebsdx86.tar.gz:bootstrap
DIST_SUBDIR=	${PORTNAME}/v${PORTVERSION}
MASTER_SITES+=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${PORTVERSION}/:bootstrap
EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}

MAINTAINER=	olgeni@FreeBSD.org
COMMENT=	Clozure CL is a free Common Lisp implementation

LICENSE=	LGPL21

ONLY_FOR_ARCHS=	amd64

BROKEN_FreeBSD_12=	SHF_MERGE section size must be a multiple of sh_entsize
BROKEN_FreeBSD_13=	SHF_MERGE section size must be a multiple of sh_entsize
ONLY_FOR_ARCHS=	i386 amd64

CCL_DIRECTORY=	${PREFIX}/lib/ccl
CCL_PLIST=	${WRKDIR}/pkg-plist

SUB_LIST+=	FX86CL="${FX86CL}" CCL_DIRECTORY="${CCL_DIRECTORY}"
SUB_FILES=	ccl.sh

post-extract: .EXEC
	@cd ${WRKSRC} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/freebsdx86.tar.gz

post-patch:
	@${SED}	-i '' -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/tools/asdf.lisp
	@${SED}	-i '' -e 's|%%TAG%%|v${PORTVERSION}|' ${WRKSRC}/lisp-kernel/freebsdx86*/Makefile
	@${FIND} ${WRKSRC} -name .svn -or -name .cvsignore -or -name "*.orig" \
		| ${XARGS} ${RM} -r


Lines 1-2 Link Here

(-)b/lang/ccl/distinfo (-2 / +5 lines)
1	SHA256 (ccl-1.11-freebsdx86.tar.gz) = 9110e5f4b1b0940c42fcc812b5ceafe6b4b2ca7706db4e2698e5d4943646273f	1	TIMESTAMP = 1587890495
2	SIZE (ccl-1.11-freebsdx86.tar.gz) = 44608881	2	SHA256 (ccl/v1.12/ccl-1.12.tar.gz) = 774a06b4fb6dc4b51dfb26da8e1cc809c605e7706c12180805d1be6f2885bd52
		3	SIZE (ccl/v1.12/ccl-1.12.tar.gz) = 5014439
		4	SHA256 (ccl/v1.12/freebsdx86.tar.gz) = 43d4bec7af719462807c39d2bc16c8a5482ee62084861e0997b0596c525257e3
		5	SIZE (ccl/v1.12/freebsdx86.tar.gz) = 6526273

Lines 1-11 Link Here

(-)b/lang/ccl/files/patch-lisp-kernel_freebsdx8632_Makefile (-10 / +10 lines)
1	--- lisp-kernel/freebsdx8632/Makefile.orig 2015-11-06 20:10:03 UTC	1	--- lisp-kernel/freebsdx8632/Makefile.orig 2020-04-19 21:32:56 UTC
2	+++ lisp-kernel/freebsdx8632/Makefile	2	+++ lisp-kernel/freebsdx8632/Makefile
3	@@ -21,7 +21,7 @@ AS = as	3	@@ -13,7 +13,7 @@
4	M4 = m4	4	# See the License for the specific language governing permissions and
5	ASFLAGS = --32	5	# limitations under the License.
6	M4FLAGS = -DFREEBSD -DX86 -DX8632 -DHAVE_TLS	6
7	-CDEFINES = -DFREEBSD -D_REENTRANT -DX86 -DX8632 -D_GNU_SOURCE -DHAVE_TLS -DSVN_REVISION=$(SVN_REVISION)	7	-VC_REVISION != sh -c "git describe --dirty 2>/dev/null \|\| echo unknown"
8	+CDEFINES = -DFREEBSD -D_REENTRANT -DX86 -DX8632 -D_GNU_SOURCE -DHAVE_TLS	8	+VC_REVISION:= %%TAG%%
9	CDEBUG = -g	9
10	COPT = #-O2	10	VPATH = ..
11	# Once in a while, -Wformat says something useful. The odds are against that,	11	RM = /bin/rm

Lines 1-11 Link Here

(-)b/lang/ccl/files/patch-lisp-kernel_freebsdx8664_Makefile (-10 / +10 lines)
1	--- lisp-kernel/freebsdx8664/Makefile.orig 2015-11-06 20:10:02 UTC	1	--- lisp-kernel/freebsdx8664/Makefile.orig 2020-04-19 21:32:56 UTC
2	+++ lisp-kernel/freebsdx8664/Makefile	2	+++ lisp-kernel/freebsdx8664/Makefile
3	@@ -21,7 +21,7 @@ AS = as	3	@@ -13,7 +13,7 @@
4	M4 = m4	4	# See the License for the specific language governing permissions and
5	ASFLAGS = --64	5	# limitations under the License.
6	M4FLAGS = -DFREEBSD -DX86 -DX8664 -DHAVE_TLS	6
7	-CDEFINES = -DFREEBSD -D_REENTRANT -DX86 -DX8664 -D_GNU_SOURCE -DHAVE_TLS -DSVN_REVISION=$(SVN_REVISION)	7	-VC_REVISION != sh -c "git describe --dirty 2>/dev/null \|\| echo unknown"
8	+CDEFINES = -DFREEBSD -D_REENTRANT -DX86 -DX8664 -D_GNU_SOURCE -DHAVE_TLS	8	+VC_REVISION:= %%TAG%%
9	CDEBUG = -g	9
10	COPT = #-O2	10	VPATH = ..
11	# Once in a while, -Wformat says something useful. The odds are against that,	11	RM = /bin/rm




--- lisp-kernel/memory.c.orig	2015-11-06 20:10:03 UTC
+++ lisp-kernel/memory.c
@@ -89,7 +89,7 @@ ReserveMemoryForHeap(LogicalAddress want
   start = mmap((void *)want,
 	       totalsize + heap_segment_size,
 	       PROT_NONE,
-	       MAP_PRIVATE | MAP_ANON | MAP_NORESERVE,
+	       MAP_PRIVATE | MAP_ANON,
 	       -1,
 	       0);
   if (start == MAP_FAILED) {
@@ -99,7 +99,7 @@ ReserveMemoryForHeap(LogicalAddress want
   if (start != want) {
     munmap(start, totalsize+heap_segment_size);
     start = (void *)((((natural)start)+heap_segment_size-1) & ~(heap_segment_size-1));
-    if(mmap(start, totalsize, PROT_NONE, MAP_PRIVATE | MAP_ANON | MAP_FIXED | MAP_NORESERVE, -1, 0) != start) {
+    if(mmap(start, totalsize, PROT_NONE, MAP_PRIVATE | MAP_ANON | MAP_FIXED, -1, 0) != start) {
       return NULL;
     }
   }
@@ -907,7 +907,7 @@ ReserveMemory(natural size)
                    PAGE_NOACCESS);
   return p;
 #else
-  p = mmap(NULL,size,PROT_NONE,MAP_PRIVATE|MAP_ANON|MAP_NORESERVE,-1,0);
+  p = mmap(NULL,size,PROT_NONE,MAP_PRIVATE|MAP_ANON,-1,0);
   if (p == MAP_FAILED) {
     return NULL;
   }




--- lisp-kernel/platform-freebsdx8632.h.orig   2018-03-20 12:24:58.894882000 -0700
+++ lisp-kernel/platform-freebsdx8632.h        2018-03-20 12:26:51.327100000 -0700
@@ -42,6 +42,7 @@ typedef struct __ucontext ExceptionInfor
 
 #include <sys/types.h>
 #include <machine/npx.h>
+#include <machine/trap.h>
 #define xpGPRvector(x) ((natural *)(&((x)->uc_mcontext)))
 #define xpGPR(x,gprno) (xpGPRvector(x)[gprno])
 #define set_xpGPR(x,gpr,new) xpGPR((x),(gpr)) = (natural)(new)
@@ -56,7 +57,7 @@ extern void freebsd_sigreturn(ExceptionI
 #define IS_PAGE_FAULT(info,xp) (xp->uc_mcontext.mc_trapno == T_PAGEFLT)
 #define SIGRETURN(context) freebsd_sigreturn(context)
 
-#define AVX_CONTEXT_PRESENT(xp) ((xp)->uc_mcontext.mc_trapno & 4)
+#define AVX_CONTEXT_PRESENT(xp) ((xp)->uc_mcontext.mc_flags & 4)
 #define AVX_CONTEXT_PTR(xp) (((xp)->uc_mcontext.mc_fpstate[130]))
 #define AVX_CONTEXT_SIZE(xp) ((natural)((xp)->uc_mcontext.mc_fpstate[131]))
 




--- lisp-kernel/platform-freebsdx8664.h.orig   2018-03-20 12:25:05.151015000 -0700
+++ lisp-kernel/platform-freebsdx8664.h        2018-03-20 12:26:36.751044000 -0700
@@ -47,6 +47,7 @@ typedef struct __ucontext ExceptionInfor
 #define REG_RSP 23
 
 #include <machine/fpu.h>
+#include <machine/trap.h>
 #define xpGPRvector(x) ((natural *)(&((x)->uc_mcontext)))
 #define xpGPR(x,gprno) (xpGPRvector(x)[gprno])
 #define set_xpGPR(x,gpr,new) xpGPR((x),(gpr)) = (natural)(new)
@@ -67,7 +68,7 @@ extern void freebsd_sigreturn(ExceptionI
    fbsd 9.1 headers; if we built on an older OS version, we still need
    to know about this if we run on 9.1+ */
 
-#define AVX_CONTEXT_PRESENT(xp) ((xp)->uc_mcontext.mc_trapno & 4)
+#define AVX_CONTEXT_PRESENT(xp) ((xp)->uc_mcontext.mc_flags & 4)
 #define AVX_CONTEXT_PTR(xp) (((xp)->uc_mcontext.mc_fpstate[66]))
 #define AVX_CONTEXT_SIZE(xp) ((natural)((xp)->uc_mcontext.mc_fpstate[67]))
 

Return to bug 245941

Lines 1-22 Link Here

(-)b/lang/ccl/Makefile (-8 / +14 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= ccl	3	PORTNAME= ccl
4	PORTVERSION= 1.11	4	PORTVERSION= 1.12
5	PORTREVISION= 1	5	PORTREVISION= 1
6	CATEGORIES= lang lisp	6	CATEGORIES= lang lisp
7	MASTER_SITES= ftp://ftp.clozure.com/pub/release/${PORTVERSION}/	7
8	DISTNAME= ${PORTNAME}-${PORTVERSION}-freebsdx86	8	USE_GITHUB= nodefault
		9	GH_ACCOUNT= Clozure
		10	GH_TAGNAME= v${PORTVERSION}
		11	DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:DEFAULT freebsdx86.tar.gz:bootstrap
		12	DIST_SUBDIR= ${PORTNAME}/v${PORTVERSION}
		13	MASTER_SITES+= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${PORTVERSION}/:bootstrap
		14	EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
9		15
10	MAINTAINER= olgeni@FreeBSD.org	16	MAINTAINER= olgeni@FreeBSD.org
11	COMMENT= Clozure CL is a free Common Lisp implementation	17	COMMENT= Clozure CL is a free Common Lisp implementation
12		18
13	LICENSE= LGPL21	19	LICENSE= LGPL21
14		20
15	WRKSRC= ${WRKDIR}/ccl	21	ONLY_FOR_ARCHS= amd64
16
17	BROKEN_FreeBSD_12= SHF_MERGE section size must be a multiple of sh_entsize
18	BROKEN_FreeBSD_13= SHF_MERGE section size must be a multiple of sh_entsize
19	ONLY_FOR_ARCHS= i386 amd64
20		22
21	CCL_DIRECTORY= ${PREFIX}/lib/ccl	23	CCL_DIRECTORY= ${PREFIX}/lib/ccl
22	CCL_PLIST= ${WRKDIR}/pkg-plist	24	CCL_PLIST= ${WRKDIR}/pkg-plist
Lines 42-49 EXCLUDE+= fx86cl fx86cl.image Link Here
42	SUB_LIST+= FX86CL="${FX86CL}" CCL_DIRECTORY="${CCL_DIRECTORY}"	44	SUB_LIST+= FX86CL="${FX86CL}" CCL_DIRECTORY="${CCL_DIRECTORY}"
43	SUB_FILES= ccl.sh	45	SUB_FILES= ccl.sh
44		46
		47	post-extract: .EXEC
		48	@cd ${WRKSRC} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/freebsdx86.tar.gz
		49
45	post-patch:	50	post-patch:
46	@${SED} -i '' -e 's\|%%LOCALBASE%%\|${LOCALBASE}\|' ${WRKSRC}/tools/asdf.lisp	51	@${SED} -i '' -e 's\|%%LOCALBASE%%\|${LOCALBASE}\|' ${WRKSRC}/tools/asdf.lisp
		52	@${SED} -i '' -e 's\|%%TAG%%\|v${PORTVERSION}\|' ${WRKSRC}/lisp-kernel/freebsdx86*/Makefile
47	@${FIND} ${WRKSRC} -name .svn -or -name .cvsignore -or -name "*.orig" \	53	@${FIND} ${WRKSRC} -name .svn -or -name .cvsignore -or -name "*.orig" \
48	\| ${XARGS} ${RM} -r	54	\| ${XARGS} ${RM} -r
49		55

Removed Link Here

(-)a/lang/ccl/files/patch-lisp-kernel_memory.c (-29 lines)
1	--- lisp-kernel/memory.c.orig 2015-11-06 20:10:03 UTC
2	+++ lisp-kernel/memory.c
3	@@ -89,7 +89,7 @@ ReserveMemoryForHeap(LogicalAddress want
4	start = mmap((void *)want,
5	totalsize + heap_segment_size,
6	PROT_NONE,
7	- MAP_PRIVATE \| MAP_ANON \| MAP_NORESERVE,
8	+ MAP_PRIVATE \| MAP_ANON,
9	-1,
10	0);
11	if (start == MAP_FAILED) {
12	@@ -99,7 +99,7 @@ ReserveMemoryForHeap(LogicalAddress want
13	if (start != want) {
14	munmap(start, totalsize+heap_segment_size);
15	start = (void *)((((natural)start)+heap_segment_size-1) & ~(heap_segment_size-1));
16	- if(mmap(start, totalsize, PROT_NONE, MAP_PRIVATE \| MAP_ANON \| MAP_FIXED \| MAP_NORESERVE, -1, 0) != start) {
17	+ if(mmap(start, totalsize, PROT_NONE, MAP_PRIVATE \| MAP_ANON \| MAP_FIXED, -1, 0) != start) {
18	return NULL;
19	}
20	}
21	@@ -907,7 +907,7 @@ ReserveMemory(natural size)
22	PAGE_NOACCESS);
23	return p;
24	#else
25	- p = mmap(NULL,size,PROT_NONE,MAP_PRIVATE\|MAP_ANON\|MAP_NORESERVE,-1,0);
26	+ p = mmap(NULL,size,PROT_NONE,MAP_PRIVATE\|MAP_ANON,-1,0);
27	if (p == MAP_FAILED) {
28	return NULL;
29	}

Removed Link Here

(-)a/lang/ccl/files/patch-lisp-kernel_platform-freebsdx8632.h (-19 lines)
1	--- lisp-kernel/platform-freebsdx8632.h.orig 2018-03-20 12:24:58.894882000 -0700
2	+++ lisp-kernel/platform-freebsdx8632.h 2018-03-20 12:26:51.327100000 -0700
3	@@ -42,6 +42,7 @@ typedef struct __ucontext ExceptionInfor
4
5	#include <sys/types.h>
6	#include <machine/npx.h>
7	+#include <machine/trap.h>
8	#define xpGPRvector(x) ((natural *)(&((x)->uc_mcontext)))
9	#define xpGPR(x,gprno) (xpGPRvector(x)[gprno])
10	#define set_xpGPR(x,gpr,new) xpGPR((x),(gpr)) = (natural)(new)
11	@@ -56,7 +57,7 @@ extern void freebsd_sigreturn(ExceptionI
12	#define IS_PAGE_FAULT(info,xp) (xp->uc_mcontext.mc_trapno == T_PAGEFLT)
13	#define SIGRETURN(context) freebsd_sigreturn(context)
14
15	-#define AVX_CONTEXT_PRESENT(xp) ((xp)->uc_mcontext.mc_trapno & 4)
16	+#define AVX_CONTEXT_PRESENT(xp) ((xp)->uc_mcontext.mc_flags & 4)
17	#define AVX_CONTEXT_PTR(xp) (((xp)->uc_mcontext.mc_fpstate[130]))
18	#define AVX_CONTEXT_SIZE(xp) ((natural)((xp)->uc_mcontext.mc_fpstate[131]))
19

Removed Link Here

(-)a/lang/ccl/files/patch-lisp-kernel_platform-freebsdx8664.h (-19 lines)
1	--- lisp-kernel/platform-freebsdx8664.h.orig 2018-03-20 12:25:05.151015000 -0700
2	+++ lisp-kernel/platform-freebsdx8664.h 2018-03-20 12:26:36.751044000 -0700
3	@@ -47,6 +47,7 @@ typedef struct __ucontext ExceptionInfor
4	#define REG_RSP 23
5
6	#include <machine/fpu.h>
7	+#include <machine/trap.h>
8	#define xpGPRvector(x) ((natural *)(&((x)->uc_mcontext)))
9	#define xpGPR(x,gprno) (xpGPRvector(x)[gprno])
10	#define set_xpGPR(x,gpr,new) xpGPR((x),(gpr)) = (natural)(new)
11	@@ -67,7 +68,7 @@ extern void freebsd_sigreturn(ExceptionI
12	fbsd 9.1 headers; if we built on an older OS version, we still need
13	to know about this if we run on 9.1+ */
14
15	-#define AVX_CONTEXT_PRESENT(xp) ((xp)->uc_mcontext.mc_trapno & 4)
16	+#define AVX_CONTEXT_PRESENT(xp) ((xp)->uc_mcontext.mc_flags & 4)
17	#define AVX_CONTEXT_PTR(xp) (((xp)->uc_mcontext.mc_fpstate[66]))
18	#define AVX_CONTEXT_SIZE(xp) ((natural)((xp)->uc_mcontext.mc_fpstate[67]))
19