On Sat, Feb 19, 2022 at 02:40:24AM -0700, Kurt Mosiejczuk wrote:
> http://build-failures.rhaalovely.net/sparc64/2022-02-16/textproc/link-grammar,,-main.log
Needs the usual compiler dance for this:
> /tmp/print-dict-f43ef2.s:4649: Error: operation combines symbols in different
> segments
> clang-13: error: assembler command failed with exit code 1 (use -v to see
> invocation)
Typofix deps while here.
update-plist still puts the python dir into PLIST-main (see diff) which
is wrong but I don't know how to convince it to account for it in
PLIST-python... by not listing it at all since it belongs to
lang/python-3.9 which is now a proper dependency.
OK for the diff *without the PLIST hunk*?
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/textproc/link-grammar/Makefile,v
retrieving revision 1.65
diff -u -p -r1.65 Makefile
--- Makefile 2 Nov 2021 00:02:36 -0000 1.65
+++ Makefile 21 Feb 2022 01:10:28 -0000
@@ -8,7 +8,8 @@ COMMENT-java = Java bindings for link-g
COMMENT-python = Python bindings for link-grammar
VERSION = 5.10.2
-REVISION-python= 0
+REVISION-main = 0
+REVISION-python = 1
DISTNAME = link-grammar-${VERSION}
PKGNAME-main = ${DISTNAME}
@@ -42,8 +43,8 @@ MODPY_ADJ_FILES = bindings/python-exampl
USE_GMAKE = Yes
-# -std=c++03
-COMPILER = base-clang ports-clang
+# -std=c++03 -std=c11
+COMPILER = base-clang ports-gcc
MULTI_PACKAGES = -main -java -python
PSEUDO_FLAVORS = no_java
@@ -65,7 +66,7 @@ LIB_DEPENDS-python = ${MODPY_LIB_DEPENDS
RUN_DEPENDS-main = # empty
RUN_DEPENDS-java = ${MODJAVA_RUN_DEPENDS}
-RUN_DEPENDS-python = ${MODPYTHON_RUN_DEPENDS}
+RUN_DEPENDS-python = ${MODPY_RUN_DEPENDS}
TEST_DEPENDS = ${BUILD_PKGPATH},-python
Index: pkg/PLIST-main
===================================================================
RCS file: /home/cvs/ports/textproc/link-grammar/pkg/PLIST-main,v
retrieving revision 1.37
diff -u -p -r1.37 PLIST-main
--- pkg/PLIST-main 31 Oct 2021 15:02:58 -0000 1.37
+++ pkg/PLIST-main 21 Feb 2022 01:11:24 -0000
@@ -10,6 +10,7 @@ include/link-grammar/link-includes.h
lib/liblink-grammar.la
@lib lib/liblink-grammar.so.${LIBlink-grammar_VERSION}
lib/pkgconfig/link-grammar.pc
+lib/python${MODPY_VERSION}/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/clinkgrammar.pm
@so libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/clinkgrammar.so
