Hi,
I would like to remove the 'threads' FLAVOR of lang/sbcl and avoid providing
two
differents versions of sbcl (with and without sb-thread).
The following diff merges both lang/sbcl, and lang/sbcl,threads .
Only i386 and arm will be compiled without sb-thread.
x11/stumpwm and lang/Makefile would be adjusted accordingly.
I would be interested about drawbacks if we have only one version.
Comments or OK ?
--
Sebastien Marie
diff /home/semarie/repos/openbsd/ports/mystuff/lang/sbcl
commit - edf880de9cb97c0d6dbb95a67deb3bc1ea612ea5
path + /home/semarie/repos/openbsd/ports/mystuff/lang/sbcl
blob - 99a8e7ea544bcdb0dcae1487928a6941983c0733
file + Makefile
--- Makefile
+++ Makefile
@@ -7,6 +7,7 @@ PKGNAME = sbcl-${V}
V = 2.3.7
DISTNAME = sbcl-${V}-source
PKGNAME = sbcl-${V}
+REVISION = 0
CATEGORIES = lang
@@ -28,7 +29,6 @@ FLAVORS = threads
WRKDIST = ${WRKDIR}/sbcl-${V}
PSEUDO_FLAVORS = native_bootstrap
-FLAVORS = threads
FLAVOR ?=
# Supported bootstrap methods:
@@ -66,22 +66,16 @@ ERRORS += "Fatal: unknown BOOTSTRAP_METHOD"
ERRORS += "Fatal: unknown BOOTSTRAP_METHOD"
.endif
-# sb-thread is available only on some architectures and required on others
-.if ${FLAVOR:Mthreads}
+# sb-thread is not available everywhere
+SB_THREAD-${MACHINE_ARCH} ?= Yes
+SB_THREAD-arm = No
+SB_THREAD-i386 = No
+
+.if ${SB_THREAD-${MACHINE_ARCH}:MYes}
EXTRA_PARAMS += --with-sb-thread
WANTLIB += pthread
-
-# sb-thread on i386 requires i386_set_ldt()
-NOT_FOR_ARCHS += i386
-
-# no support for sb-thread
-NOT_FOR_ARCHS += arm
-
.else
EXTRA_PARAMS += --without-sb-thread
-
-# no support without sb-thread
-NOT_FOR_ARCHS += aarch64 powerpc64
.endif
# sb-simd is available on amd64 only
blob - 5dcb95273231ce3040729fafb6f7855ffcd33770
file + pkg/PLIST
--- pkg/PLIST
+++ pkg/PLIST
@@ -1,3 +1,4 @@
+@pkgpath lang/sbcl,threads
@bin bin/sbcl
@info info/asdf.info
@info info/sbcl.info
