[Update] databases/py-peewee: Update to 3.13.3
Hi, ports@:
Here is a patch for databases/py-peewee:
i) Update to 3.13.3
ii) Add py-psycopg2 as TEST_DEPENDS
It build well and run well and pass the tests on amd64-current system,
both with py2 and py3.
No other ports depends on it.
Cheers !
wen
Index: Makefile
===
RCS file: /cvs/ports/databases/py-peewee/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile3 Jul 2020 21:12:37 - 1.17
+++ Makefile4 Aug 2020 04:19:52 -
@@ -2,10 +2,9 @@
COMMENT= small expressive ORM
-MODPY_EGG_VERSION= 2.8.3
+MODPY_EGG_VERSION= 3.13.3
DISTNAME= peewee-${MODPY_EGG_VERSION}
PKGNAME= py-${DISTNAME}
-REVISION= 2
GH_ACCOUNT=coleifer
GH_PROJECT=peewee
@@ -20,6 +19,8 @@ PERMIT_PACKAGE= Yes
BUILD_DEPENDS= textproc/py-sphinx${MODPY_FLAVOR}
+TEST_DEPENDS= databases/py-psycopg2${MODPY_FLAVOR}
+
FLAVORS= python3
FLAVOR?=
@@ -41,6 +42,6 @@ post-install:
mv ${PREFIX}/bin/pwiz.py ${PREFIX}/bin/pwiz${MODPY_BIN_SUFFIX}
do-test:
- cd ${WRKSRC} && ${MODPY_BIN} tests.py
+ cd ${WRKSRC} && ${MODPY_BIN} runtests.py
.include
Index: distinfo
===
RCS file: /cvs/ports/databases/py-peewee/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo17 Sep 2016 15:33:39 - 1.7
+++ distinfo4 Aug 2020 04:19:52 -
@@ -1,2 +1,2 @@
-SHA256 (peewee-2.8.3.tar.gz) = NW3QQbn6Ztbny8T/ROyHhFq/fXRxQn13vvD4+jye2dw=
-SIZE (peewee-2.8.3.tar.gz) = 639529
+SHA256 (peewee-3.13.3.tar.gz) = z/hraQp0asQ7mYMwMQol/rklEGYvRCOD1yiSfA1q6lg=
+SIZE (peewee-3.13.3.tar.gz) = 872007
Index: patches/patch-setup_py
===
RCS file: /cvs/ports/databases/py-peewee/patches/patch-setup_py,v
retrieving revision 1.2
diff -u -p -r1.2 patch-setup_py
--- patches/patch-setup_py 17 Sep 2016 15:33:39 - 1.2
+++ patches/patch-setup_py 4 Aug 2020 04:19:52 -
@@ -1,25 +1,37 @@
-$OpenBSD: patch-setup_py,v 1.2 2016/09/17 15:33:39 danj Exp $
+$OpenBSD$
+- disable cython
-1. For option --single-version-externally-managed
-2. Disable cython
-
setup.py.orig Thu Aug 25 20:17:54 2016
-+++ setup.py Sun Aug 28 10:12:56 2016
-@@ -1,7 +1,7 @@
- import os
- import sys
- import warnings
--from distutils.core import setup
-+from setuptools import setup
- from distutils.extension import Extension
- from distutils.version import StrictVersion
-
-@@ -28,7 +28,7 @@ else:
- 'C extensions, install Cython >=' + cython_min_version +
- '.')
- else:
+Index: setup.py
+--- setup.py.orig
setup.py
+@@ -19,18 +19,18 @@ extension_support = True # Assume we are building C e
+ # Check if Cython is available and use it to generate extension modules. If
+ # Cython is not installed, we will fall back to using the pre-generated C
files
+ # (so long as we're running on CPython).
+-try:
+-from Cython.Build import cythonize
+-from Cython.Distutils import build_ext
+-from Cython.Distutils.extension import Extension
+-except ImportError:
+-cython_installed = False
+-else:
+-if platform.python_implementation() != 'CPython':
+-cython_installed = extension_support = False
+-warnings.warn('C extensions disabled as you are not using CPython.')
+-else:
-cython_installed = True
-+cython_installed = False
++#try:
++#from Cython.Build import cythonize
++#from Cython.Distutils import build_ext
++#from Cython.Distutils.extension import Extension
++#except ImportError:
++#cython_installed = False
++#else:
++#if platform.python_implementation() != 'CPython':
++#cython_installed = extension_support = False
++#warnings.warn('C extensions disabled as you are not using CPython.')
++#else:
++cython_installed = False
- speedups_ext_module = Extension(
- 'playhouse._speedups',
+ if 'sdist' in sys.argv and not cython_installed:
+ raise Exception('Building sdist requires that Cython be installed.')
Index: pkg/PLIST
===
RCS file: /cvs/ports/databases/py-peewee/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST
--- pkg/PLIST 17 Sep 2016 15:33:39 - 1.9
+++ pkg/PLIST 4 Aug 2020 04:19:52 -
@@ -6,6 +6,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/peewee-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/peewee-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/peewee-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
Re: Update lang/ecl to 20.4.24
On Fri, 31 Jul 2020 19:07:07 -0700
Josh Elsasser wrote:
> I applied the diff directly from gitlab and was able to build ecl on
> sparc64 and mips64. When I tried to run the tests, sparc64 hung (not
> spinning) on test CMP.0009.FINALIZATION and mips64 segfaulted almost
> immediately:
>
> Running test ATOMIC-INCF/DECF
> ;;;
> ;;; Detected access to protected memory, also known as 'bus or segmentation
> fault'.
> ;;; Jumping to the outermost toplevel prompt
I rechecked powerpc64 (and amd64, macppc) and can't reproduce the hang
or segfault. In my opinion, we should package ecl-20.4.24 for mips64
and sparc64, even if we can't fix these problems. I resent my gc diff
in "devel/boehm-gc: use mmap; fix powerpc64, sparc64" to ask for OK.
Who will commit the ecl update? I want the update with these changes:
1. remove the BROKEN-mips64
2. add patch-src_c_package_d so I can run ecl on powerpc64
This is the patch-src_c_package_d; I have trimmed it to remove the
part that only reformatted a comment:
Index: patches/patch-src_c_package_d
===
RCS file: patches/patch-src_c_package_d
diff -N patches/patch-src_c_package_d
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_c_package_d 3 Aug 2020 16:11:28 -
@@ -0,0 +1,26 @@
+$OpenBSD$
+
+Work around a SIGSEGV on 64-bit big-endian platforms
+(mips64, powerpc64, sparc64), from Daniel Kochmaski,
+https://gitlab.com/embeddable-common-lisp/ecl/-/issues/604#note_388147381
+
+Index: src/c/package.d
+--- src/c/package.d.orig
src/c/package.d
+@@ -327,10 +327,12 @@ ecl_find_package_nolock(cl_object name)
+ return name;
+ name = cl_string(name);
+
+- p = ecl_symbol_value(@'*package*');
+- if (ECL_PACKAGEP(p)) {
+-p = ecl_assoc(name, p->pack.local_nicknames);
+-if (!Null(p)) return ECL_CONS_CDR(p);
++ if (ecl_option_values[ECL_OPT_BOOTED]) {
++p = ecl_symbol_value(@'*package*');
++if (ECL_PACKAGEP(p)) {
++ p = ecl_assoc(name, p->pack.local_nicknames);
++ if (!Null(p)) return ECL_CONS_CDR(p);
++}
+ }
+
+ l = cl_core.packages;
devel/boehm-gc: use mmap; fix powerpc64, sparc64
Hello, OpenBSD ports list!
I would like to make 3 changes to devel/boehm-gc, a garbage collector.
This is the same diff that I sent as "Re: Update lang/ecl to 20.4.24"
last week (Wed 29 Jul). The 3 changes are,
1. switch from sbrk() to mmap()
2. fix powerpc64
3. add AO_fetch_compare_and_swap for sparc64
sparc64 got an #error in ecl 20.4.24 when AO_fetch_compare_and_swap
was missing. With this diff, Josh Elsasser built ecl on sparc64, but
ecl "hung (not spinning)" in ecl's tests. I don't know why they hung,
so I'm not sure whether this AO_fetch_compare_and_swap is correct.
This diff passes boehm-gc's "make test" on amd64, macppc, powerpc64;
and works for me with lang/ecl 20.4.24 on those 3 platforms, and with
lang/crystal on amd64. We have boehm-gc 7.6.0, libatomic_ops 7.6.6;
latest are gc 8.0.4, ops 7.6.10, but I would like to commit this diff
without updating the versions.
OK to commit?
Index: Makefile
===
RCS file: /cvs/ports/devel/boehm-gc/Makefile,v
retrieving revision 1.74
diff -u -p -r1.74 Makefile
--- Makefile4 Apr 2020 20:59:41 - 1.74
+++ Makefile30 Jul 2020 02:37:28 -
@@ -12,7 +12,7 @@ DISTNAME= gc-${VERSION}
PKGNAME-atomic=libatomic_ops-${LIBAO_VERSION}
PKGNAME-main= boehm-gc-${VERSION}
-REVISION= 5
+REVISION= 6
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
libatomic_ops-${LIBAO_VERSION}${EXTRACT_SUFX}
Index: patches/patch-include_private_gcconfig_h
===
RCS file: /cvs/ports/devel/boehm-gc/patches/patch-include_private_gcconfig_h,v
retrieving revision 1.22
diff -u -p -r1.22 patch-include_private_gcconfig_h
--- patches/patch-include_private_gcconfig_h15 Apr 2017 14:02:46 -
1.22
+++ patches/patch-include_private_gcconfig_h30 Jul 2020 02:37:28 -
@@ -1,12 +1,25 @@
$OpenBSD: patch-include_private_gcconfig_h,v 1.22 2017/04/15 14:02:46 naddy
Exp $
+- use mmap, not sbrk, on OpenBSD
- All OpenBSD mips platforms are 64-bit, so correct the wordsize and alignment
- use __data_start instead of _fdata on OpenBSD/mips64
-- add support for OpenBSD/aarch64
+- add support for OpenBSD/aarch64 and powerpc64
include/private/gcconfig.h.origTue Aug 2 21:36:14 2016
-+++ include/private/gcconfig.h Fri Apr 14 17:44:40 2017
-@@ -102,7 +102,8 @@
+Index: include/private/gcconfig.h
+--- include/private/gcconfig.h.orig
include/private/gcconfig.h
+@@ -76,6 +76,10 @@
+ /* And one for OpenBSD: */
+ # if defined(__OpenBSD__)
+ #define OPENBSD
++#ifndef USE_MMAP
++# define USE_MMAP
++#endif
++#define USE_MMAP_ANON
+ # endif
+
+ /* And one for FreeBSD: */
+@@ -102,7 +106,8 @@
# endif
# if defined(__aarch64__)
#define AARCH64
@@ -16,7 +29,7 @@ $OpenBSD: patch-include_private_gcconfig
# define NOSYS
# define mach_type_known
#endif
-@@ -137,6 +138,10 @@
+@@ -137,6 +142,10 @@
#define ARM32
#define mach_type_known
# endif
@@ -27,7 +40,21 @@ $OpenBSD: patch-include_private_gcconfig
# if defined(OPENBSD) && defined(__sh__)
#define SH
#define mach_type_known
-@@ -1712,14 +1717,15 @@
+@@ -962,7 +971,12 @@
+ # endif
+ # ifdef OPENBSD
+ # define OS_TYPE "OPENBSD"
+-# define ALIGNMENT 4
++# if defined(__powerpc64__)
++# define ALIGNMENT 8
++# define CPP_WORDSZ 64
++# else
++# define ALIGNMENT 4
++# endif
+ # ifndef GC_OPENBSD_THREADS
+ # include
+ # include
+@@ -1712,14 +1726,15 @@
# endif
# ifdef OPENBSD
#define OS_TYPE "OPENBSD"
@@ -46,7 +73,7 @@ $OpenBSD: patch-include_private_gcconfig
extern int _end[];
#define DATAEND ((ptr_t)(&_end))
#define DYNAMIC_LOADING
-@@ -2165,6 +2171,19 @@
+@@ -2165,6 +2180,19 @@
extern char etext[];
# define DATASTART GC_FreeBSDGetDataStart(0x1000, (ptr_t)etext)
# define DATASTART_USES_BSDGETDATASTART
Index: patches/patch-libatomic_ops_src_atomic_ops_sysdeps_gcc_sparc_h
===
RCS file:
/cvs/ports/devel/boehm-gc/patches/patch-libatomic_ops_src_atomic_ops_sysdeps_gcc_sparc_h,v
retrieving revision 1.3
diff -u -p -r1.3 patch-libatomic_ops_src_atomic_ops_sysdeps_gcc_sparc_h
--- patches/patch-libatomic_ops_src_atomic_ops_sysdeps_gcc_sparc_h 4 Apr
2020 20:59:41 - 1.3
+++ patches/patch-libatomic_ops_src_atomic_ops_sysdeps_gcc_sparc_h 30 Jul
2020 02:37:28 -
@@ -2,6 +2,8 @@ $OpenBSD: patch-libatomic_ops_src_atomic
Use the same type for input and output inline asm operands.
+Provide AO_fetch_compare_and_swap, needed by lang/ecl 20.4.24.
+
Index: libatomic_ops/src/atomic_ops/sysdeps/gcc/sparc.h
--- libatomic_ops/src/atomic_ops/sysdeps/gcc/sparc.h.orig
+++ libatomic_ops/src/atomic_ops/sysdeps/gcc/sparc.h
@@ -14,3 +16,26 @@ Index: libatomic_ops/src/atomic_ops/sysd
__asm__ __volatile__
[Update] devel/p5-File-Flat : Update to 1.06
Hi, ports@: Here is a patch for devel/p5-File-Flat to update to 1.06. It build well and pass all tests on amd64-current system. One port depends on it, p5-Test-Inline, build well and pass all tests on amd64-current system too. Cheers ! wen Index: Makefile === RCS file: /cvs/ports/devel/p5-File-Flat/Makefile,v retrieving revision 1.14 diff -u -p -r1.14 Makefile --- Makefile3 Jul 2020 21:44:53 - 1.14 +++ Makefile3 Aug 2020 23:35:57 - @@ -5,9 +5,8 @@ COMMENT=implements a flat filesystem MODULES= cpan PKG_ARCH= * -DISTNAME= File-Flat-1.05 +DISTNAME= File-Flat-1.06 CATEGORIES=devel -REVISION= 0 FIX_EXTRACT_PERMISSIONS= Yes Index: distinfo === RCS file: /cvs/ports/devel/p5-File-Flat/distinfo,v retrieving revision 1.4 diff -u -p -r1.4 distinfo --- distinfo5 May 2019 22:18:49 - 1.4 +++ distinfo3 Aug 2020 23:35:57 - @@ -1,2 +1,2 @@ -SHA256 (File-Flat-1.05.tar.gz) = BwMss+um6bdS315GBSyZUpwNg+D9CaeMu6PXDbjIXxc= -SIZE (File-Flat-1.05.tar.gz) = 48576 +SHA256 (File-Flat-1.06.tar.gz) = lUKGfXozIi3VCxe36sp9Tvzk2hJUWD3f01+L0kXlS0E= +SIZE (File-Flat-1.06.tar.gz) = 49541
[Update] www/p5-CGI-Compile : Update to 0.25
Hi, ports@: Here is a patch for www/p5-CGI-Compile to update to 0.25. It build well and pass all tests on amd64-current system. One port depends on it, p5-Plack, build well and pass all tests on amd64-current system too. Cheers ! wen Index: Makefile === RCS file: /cvs/ports/www/p5-CGI-Compile/Makefile,v retrieving revision 1.10 diff -u -p -r1.10 Makefile --- Makefile3 Jul 2020 21:45:55 - 1.10 +++ Makefile3 Aug 2020 23:23:08 - @@ -2,8 +2,7 @@ COMMENT = compile .cgi scripts to a code reference -DISTNAME = CGI-Compile-0.23 -REVISION = 0 +DISTNAME = CGI-Compile-0.25 CATEGORIES = www Index: distinfo === RCS file: /cvs/ports/www/p5-CGI-Compile/distinfo,v retrieving revision 1.6 diff -u -p -r1.6 distinfo --- distinfo10 Feb 2020 00:57:06 - 1.6 +++ distinfo3 Aug 2020 23:23:08 - @@ -1,2 +1,2 @@ -SHA256 (CGI-Compile-0.23.tar.gz) = gDmGyDmhDAFJu5+Mr2/V5ECKqebTNyLH2cWY/N8ymY0= -SIZE (CGI-Compile-0.23.tar.gz) = 21667 +SHA256 (CGI-Compile-0.25.tar.gz) = 9Et07t+9Hrjw+WiPndrhVCLl+kiueL4hsK/LnjJJDqU= +SIZE (CGI-Compile-0.25.tar.gz) = 22479
Update: lang/jruby 9.2.13.0
Simple update to the latest version of JRuby. Release notes at
https://www.jruby.org/2020/08/03/jruby-9-2-13-0.html
Tested on amd64, the only supported arch. Will commit in a couple days
unless I hear objections.
Thanks,
Jeremy
Index: Makefile
===
RCS file: /cvs/ports/lang/jruby/Makefile,v
retrieving revision 1.87
diff -u -p -r1.87 Makefile
--- Makefile3 Jul 2020 21:05:26 - 1.87
+++ Makefile3 Aug 2020 20:48:32 -
@@ -5,7 +5,7 @@ ONLY_FOR_ARCHS = amd64
COMMENT = pure-Java implementation of the Ruby language
-V =9.2.12.0
+V =9.2.13.0
DISTNAME = jruby-dist-${V}-bin
PKGNAME = jruby-${V}
CATEGORIES = lang lang/ruby
Index: distinfo
===
RCS file: /cvs/ports/lang/jruby/distinfo,v
retrieving revision 1.55
diff -u -p -r1.55 distinfo
--- distinfo3 Jul 2020 21:05:26 - 1.55
+++ distinfo3 Aug 2020 20:48:39 -
@@ -1,6 +1,6 @@
SHA256 (jffi-1.2.18.tar.gz) = BTJsmFFT5MhkSblzLLqjnHVw8HnNDxJ2wvXfQOusvZI=
-SHA256 (jruby-dist-9.2.12.0-bin.tar.gz) =
MH9hJMQwHXI+LQ/0wBBfqe7olQw/mXHhS76IYgMObAQ=
+SHA256 (jruby-dist-9.2.13.0-bin.tar.gz) =
c6jCQaFi5kTIfoZMNIXFWt7euCpv2A+jy1OP2s2nr1g=
SHA256 (jruby-launcher-1.1.9-java.gem) =
9prnUcy0VqolcmXSsZR5HWWWrFr2cNZVZyH3DHQcEdU=
SIZE (jffi-1.2.18.tar.gz) = 2210133
-SIZE (jruby-dist-9.2.12.0-bin.tar.gz) = 25552942
+SIZE (jruby-dist-9.2.13.0-bin.tar.gz) = 25562097
SIZE (jruby-launcher-1.1.9-java.gem) = 65024
Index: pkg/PLIST
===
RCS file: /cvs/ports/lang/jruby/pkg/PLIST,v
retrieving revision 1.48
diff -u -p -r1.48 PLIST
--- pkg/PLIST 3 Jul 2020 21:05:26 - 1.48
+++ pkg/PLIST 3 Aug 2020 21:28:27 -
@@ -418,7 +418,7 @@ jruby/lib/ruby/gems/1.8/specifications/d
jruby/lib/ruby/gems/1.8/specifications/default/jruby-openssl-0.10.4-java.gemspec
jruby/lib/ruby/gems/1.8/specifications/default/jruby-readline-1.3.7-java.gemspec
jruby/lib/ruby/gems/1.8/specifications/default/json-2.2.0-java.gemspec
-jruby/lib/ruby/gems/1.8/specifications/default/psych-3.1.0-java.gemspec
+jruby/lib/ruby/gems/1.8/specifications/default/psych-3.2.0-java.gemspec
jruby/lib/ruby/gems/1.8/specifications/default/rake-ant-1.0.4.gemspec
jruby/lib/ruby/gems/1.8/specifications/default/rdoc-6.1.2.gemspec
jruby/lib/ruby/gems/1.8/specifications/default/scanf-1.0.0.gemspec
@@ -825,8 +825,8 @@ jruby/lib/ruby/stdlib/org/bouncycastle/b
jruby/lib/ruby/stdlib/org/bouncycastle/bctls-jdk15on/1.62/bctls-jdk15on-1.62.jar
jruby/lib/ruby/stdlib/org/yaml/
jruby/lib/ruby/stdlib/org/yaml/snakeyaml/
-jruby/lib/ruby/stdlib/org/yaml/snakeyaml/1.23/
-jruby/lib/ruby/stdlib/org/yaml/snakeyaml/1.23/snakeyaml-1.23.jar
+jruby/lib/ruby/stdlib/org/yaml/snakeyaml/1.26/
+jruby/lib/ruby/stdlib/org/yaml/snakeyaml/1.26/snakeyaml-1.26.jar
jruby/lib/ruby/stdlib/org/yaml/snakeyaml/maven-metadata-local.xml
jruby/lib/ruby/stdlib/ostruct.rb
jruby/lib/ruby/stdlib/pathname.rb
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2020/08/03 15:35:36 Modified files: net/rsync : Makefile distinfo net/rsync/patches: patch-authenticate_c patch-configure_sh patch-rsync_1 patch-rsyncd_conf_5 net/rsync/pkg : PLIST Removed files: net/rsync/patches: patch-zlib_crc32_c patch-zlib_inffast_c patch-zlib_inflate_c patch-zlib_inftrees_c Log message: Update to rsync 3.2.2 https://download.samba.org/pub/rsync/NEWS#3.2.2 This adds support for LZ4 and zstd compression as well as xxhash hashing. Positive feedback sthen ajacoutot OK kmos espie
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2020/08/03 15:30:56 Modified files: net/mattermost-server: Makefile distinfo net/mattermost-server/pkg: PLIST Log message: Update mattermost-server 5.25.1 -> 5.25.2 Changelog: https://docs.mattermost.com/administration/changelog.html
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: gkoeh...@cvs.openbsd.org2020/08/03 14:36:29 Modified files: lang/crystal : Makefile Log message: Use llvm-config from ports, not from base Base has /usr/bin/llvm-config after the switch to LLVM 10, so crystal would run the wrong llvm-config and fail to build (with a linker error). The bootstrap crystal.o needs LLVM 8. Using llvm-config from ports works for now, because ports devel/llvm is still LLVM 8. ok sthen@
Re: LLVM 10: lang/crystal
Providing a new bootstrap won't be a problem (if needed).
It would be great to also bump to the latest crystal version (
https://marc.info/?l=openbsd-ports=159344614726528=2)
-- W
On Mon, Aug 3, 2020 at 5:09 AM Stuart Henderson wrote:
> On 2020/08/02 20:25, George Koehler wrote:
> > Hi. This is about OpenBSD ports/lang/crystal.
> >
> > When OpenBSD switches base-clang to LLVM 10, it will add
> > /usr/bin/llvm-config to base. This will break crystal, because it
> > will run the wrong llvm-config and get a linker error:
> >
> http://build-failures.rhaalovely.net/amd64-clang/2020-08-01/lang/crystal.log
> >
> > This diff fixes crystal for me on amd64, by pointing to the correct
> > llvm-config. (I don't set REVISION = 0 because both new and old
> > packages use the same llvm-config from ports.) OK to commit?
>
> OK
>
> > But this only works as long as ports-clang stays at LLVM 8, because
> > the bootstrap crystal.o needs libLLVM-8.so, but we use the libLLVM
> > from llvm-config. When we update devel/llvm to LLVM 10, then crystal
> > will break, unless someone will provide a new bootstrap.--George
>
> AFAIK base and ports LLVM should be kept in sync, so it will
> likely run into problems again soon.
>
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/lang/crystal/Makefile,v
> > retrieving revision 1.8
> > diff -u -p -r1.8 Makefile
> > --- Makefile 7 Sep 2019 08:46:41 - 1.8
> > +++ Makefile 2 Aug 2020 23:48:14 -
> > @@ -29,8 +29,9 @@ DISTFILES = crystal-${V}{${V}}.tar.gz \
> > crystal-${V}-OpenBSD6.5.tar.gz:0 \
> > shards-${V}{v${V_SHARDS}}.tar.gz:1
> >
> > -# Build requires llvm-config which only exists in ports-clang
> > +# Build requires llvm-config from ports, not from base
> > COMPILER = ports-clang
> > +LLVM_CONFIG =${LOCALBASE}/bin/llvm-config
> >
> > BUILD_DEPENDS = devel/llvm
> > RUN_DEPENDS =devel/llvm,-main
> > @@ -49,13 +50,14 @@ NO_TEST = Yes
> > do-build:
> > mkdir -p ${WRKSRC}/.build
> > # Link the compiler from the pre-built bootstrap object
> > - cd ${WRKSRC} && CXX=${CXX} ${MAKE_PROGRAM} llvm_ext libcrystal
> > + cd ${WRKSRC} && CXX=${CXX} LLVM_CONFIG=${LLVM_CONFIG} \
> > + ${MAKE_PROGRAM} llvm_ext libcrystal
> > cd ${WRKSRC} && ${CXX} -rdynamic -o ${WRKBUILD}/.build/crystal \
> > ${WRKSRC}/../crystal.o \
> > ${WRKSRC}/src/llvm/ext/llvm_ext.o \
> > ${WRKSRC}/src/ext/sigfault.o \
> > -L${LOCALBASE}/lib \
> > - `(llvm-config --libs --system-libs --ldflags 2>
> /dev/null)` \
> > + `(${LLVM_CONFIG} --libs --system-libs --ldflags 2>
> /dev/null)` \
> > -lz -lpcre -lgc -lpthread -levent_core -levent_extra -lssl
> \
> > -lcrypto -liconv
> > # Use the compiler to re-compile the compiler
> > @@ -63,7 +65,8 @@ do-build:
> > cd ${WRKSRC}; \
> > ulimit -s 5120 -d 4096000 && \
> > CRYSTAL_CONFIG_PATH="lib:${TRUEPREFIX}/lib/crystal" \
> > - CXX=${CXX} ${MAKE_PROGRAM} ${ALL_TARGET}
> > + CXX=${CXX} LLVM_CONFIG=${LLVM_CONFIG} \
> > + ${MAKE_PROGRAM} ${ALL_TARGET}
> > cd ${WRKSRC}/../shards-${V_SHARDS} && \
> > ${MAKE_PROGRAM} CRYSTAL=${WRKSRC}/.build/crystal \
> > CRYSTAL_PATH=${WRKSRC}/src CRFLAGS=--release
> >
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2020/08/03 12:55:34 Modified files: games : Makefile Log message: +fnaify-extralibs
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2020/08/03 12:54:31 Log message: import fnaify-extralibs ok solene@ DESCR: Set of libraries for running various fnaify games, including Celeste, MidBoss, and Atom Zombie Smasher. Status: Vendor Tag: thfr Release Tags: thfr_20200803 N ports/games/fnaify-extralibs/Makefile N ports/games/fnaify-extralibs/distinfo N ports/games/fnaify-extralibs/pkg/README N ports/games/fnaify-extralibs/pkg/DESCR N ports/games/fnaify-extralibs/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2020/08/03 12:51:51 Modified files: misc : Makefile Log message: +libstubborn
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2020/08/03 12:50:48 Log message: import libstubborn ok solene@ DESCR: Header-only library to provide generic and some application-specific stub functions. Status: Vendor Tag: thfr Release Tags: thfr_20200803 N ports/misc/libstubborn/Makefile N ports/misc/libstubborn/distinfo N ports/misc/libstubborn/pkg/DESCR N ports/misc/libstubborn/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2020/08/03 12:44:25 Modified files: audio/faudio : Makefile distinfo Log message: update to FAudio 20.08 WMA support is now via gstreamer; enable it bump minor as symbol additions (mostly gstreamer related)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2020/08/03 12:41:08 Modified files: games/godot: Makefile Added files: games/godot/patches: patch-core_ustring_h Log message: fix build with clang 10 Implicit copy ctor have been deprecated since C++11 https://github.com/godotengine/godot/pull/35762 tested by me with clang 8 (no breakage) and by naddy@ with clang 10 - successfully. Thanks!
Re: Switch to LLVM 10 imminent
Keep note that our base libc++ and libc++abi are still from version 8.0.1. This means that it's very possible that version 10 is not yet correctly patched to support OpenBSD. Or maybe they added something that is incompatible to us. On Mon, Aug 03, 2020 at 08:58:44AM +0100, Julian Smith wrote: > I'd like to try llvm-10 (latest git master), but when i try to build on > OpenBSD-6.7 (amd64), but i get build failures such as: > > llvm-project/libcxxabi/../libcxx/include/__config:1150:6: error: "No thread > API"). > > Is there a set of patches somewhere that i can use? > > [ports/lang/clang/ doesn't seem to have anything relevant.] > > Thanks, > > - Jules > > > On Sat, 1 Aug 2020 22:14:03 +0200 > Christian Weisgerber wrote: > > > I don't think there was any public announcement, but most will have > > surmised it by now: The base compiler will soon switch from LLVM 8 > > to LLVM 10 on all CLANG_ARCHS. This also concerns the linker on > > LLD_ARCHS. > > > > This will cause a certain amount of breakage in the ports tree. > > We are working on it now. > > > > I have uploaded the failure logs from early builds at > > http://build-failures.rhaalovely.net/amd64-clang/ > > > > Note that the devel/pango failure prevented GTK and Qt and thus a > > huge chunk of the tree from building. More meaningful logs should > > appear within 24 hours. > > > > Principal sources of build failures: > > * C++ incompatibilities, as always. > > * Use of -Werror breaking on new warnings. > > * Linking errors. > > > > There are also silly problems such as configure scripts misrecognizing > > LLVM 10 due to changes in the output of "cc -v" or "cc -dumpversion". > > > > Anyway, I would like to encourage more people to join into the effort. > > (And yes, I'm aware that there's no publically available snapshot > > or patchset with LLVM 10...) > > > > > > -- > http://op59.net > >
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2020/08/03 10:10:25 Modified files: devel/jdk/1.8 : Makefile distinfo Log message: Update to 8u265 GA
Re: Switch to LLVM 10 imminent
On Mon, Aug 03, 2020 at 08:58:44AM +0100, Julian Smith wrote: > I'd like to try llvm-10 (latest git master), but when i try to build on > OpenBSD-6.7 (amd64), but i get build failures such as: > llvm-project/libcxxabi/../libcxx/include/__config:1150:6: error: "No thread > API"). > Is there a set of patches somewhere that i can use? > [ports/lang/clang/ doesn't seem to have anything relevant.] It's in tree today. So you can either try compiling it from in-tree, or await a snapshot with it. --Kurt
NEW: net/i2p
I2P software bundle, includes the standard I2P implementation. https://geti2p.net/ About: *I2P is an anonymous overlay network - a network within a network. *It is intended to protect communication from dragnet surveillance and monitoring by third parties such as ISPs. *Is decentralised completely unlike tor. Each client routes anonymous and encrypted traffic from other clients by default. No central directory for routing. *I2P incorporates applications in the form of webapps. *Webapps plugins (*.su3) can be loaded easily through the console. *Includes a ready mail(smtp pop3) client, i2psnark (bittorrent) client, and Jetty (webserver). Or host with your own webserver. *Allows anonymous chats through IRC tunnel service. *Plugins for blogging, chatting, file sharing have already been written. *Every service(plugin) works within the i2p network itself(Except mail). *Not supposed to be used as an outproxy, still an outproxy is included. *I2P source code includes a java-service-wrapper compiled for specific targets but is not compatible with OpenBSD. So I've included a new port tanukiwrapper, and configured I2P to use it. *Very exhaustive(functionality) but easy to use router console. Testing: *Run the rc service, point browser to localhost:7657. *Set HTTP proxy to localhost: to view eepsites. https://geti2p.net/en/about/browser-config *Been running the router for a week now, with no problems. *Personally tested the default and external plugins(e.g muwire). *Test dependencies not present in ports, will add to it. *Mount separate partition for /var/i2p if you do heavy transfers. Index: user.list === RCS file: /cvs/ports/infrastructure/db/user.list,v retrieving revision 1.371 diff -u -p -r1.371 user.list --- user.list 12 Jun 2020 11:27:08 - 1.371 +++ user.list 2 Aug 2020 18:16:51 - @@ -366,3 +366,4 @@ id usergroup port 855 _repro _repro telephony/resiprocate 856 _return_return telephony/resiprocate 857 _web2ldap _web2ldap sysutils/web2ldap +858 _i2p _i2pnet/i2p Any comments? i2p.tar.gz Description: application/gzip tanukiwrapper.tar.gz Description: application/gzip diff Description: Binary data
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2020/08/03 09:00:01 Modified files: sysutils/diffoscope: Makefile distinfo Log message: Update to diffoscope-154
Re: Hidden dependency for print/ptouch-driver
On Mon, Aug 03, 2020 at 10:17:23AM +0200, Antoine Jacoutot wrote: > > > > Did you 'make port-lib-depends-check'? > > superhell$ make port-lib-depends-check > > superhell$ > > make lib-depends-check does question if it is needed in LIB_DEPENDS. So is > > it > > a BUILD_DEPENDS only? > Thanks, I added the BDEP with an explanation. Cool. Thanks. --Kurt
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/08/03 07:30:06 Modified files: sysutils/salt : Makefile Added files: sysutils/salt/patches: patch-salt_grains_core_py Log message: unbreak grains gathering on minions without swap configured
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2020/08/03 06:38:15 Modified files: x11/i3status : Makefile x11/i3status/patches: patch-include_i3status_h patch-src_print_volume_c patch-src_sndio_c Log message: fix the volume module's format_muted with sndio ok jasper
Re: LLVM 10: lang/crystal
On 2020/08/02 20:25, George Koehler wrote:
> Hi. This is about OpenBSD ports/lang/crystal.
>
> When OpenBSD switches base-clang to LLVM 10, it will add
> /usr/bin/llvm-config to base. This will break crystal, because it
> will run the wrong llvm-config and get a linker error:
> http://build-failures.rhaalovely.net/amd64-clang/2020-08-01/lang/crystal.log
>
> This diff fixes crystal for me on amd64, by pointing to the correct
> llvm-config. (I don't set REVISION = 0 because both new and old
> packages use the same llvm-config from ports.) OK to commit?
OK
> But this only works as long as ports-clang stays at LLVM 8, because
> the bootstrap crystal.o needs libLLVM-8.so, but we use the libLLVM
> from llvm-config. When we update devel/llvm to LLVM 10, then crystal
> will break, unless someone will provide a new bootstrap.--George
AFAIK base and ports LLVM should be kept in sync, so it will
likely run into problems again soon.
> Index: Makefile
> ===
> RCS file: /cvs/ports/lang/crystal/Makefile,v
> retrieving revision 1.8
> diff -u -p -r1.8 Makefile
> --- Makefile 7 Sep 2019 08:46:41 - 1.8
> +++ Makefile 2 Aug 2020 23:48:14 -
> @@ -29,8 +29,9 @@ DISTFILES = crystal-${V}{${V}}.tar.gz \
> crystal-${V}-OpenBSD6.5.tar.gz:0 \
> shards-${V}{v${V_SHARDS}}.tar.gz:1
>
> -# Build requires llvm-config which only exists in ports-clang
> +# Build requires llvm-config from ports, not from base
> COMPILER = ports-clang
> +LLVM_CONFIG =${LOCALBASE}/bin/llvm-config
>
> BUILD_DEPENDS = devel/llvm
> RUN_DEPENDS =devel/llvm,-main
> @@ -49,13 +50,14 @@ NO_TEST = Yes
> do-build:
> mkdir -p ${WRKSRC}/.build
> # Link the compiler from the pre-built bootstrap object
> - cd ${WRKSRC} && CXX=${CXX} ${MAKE_PROGRAM} llvm_ext libcrystal
> + cd ${WRKSRC} && CXX=${CXX} LLVM_CONFIG=${LLVM_CONFIG} \
> + ${MAKE_PROGRAM} llvm_ext libcrystal
> cd ${WRKSRC} && ${CXX} -rdynamic -o ${WRKBUILD}/.build/crystal \
> ${WRKSRC}/../crystal.o \
> ${WRKSRC}/src/llvm/ext/llvm_ext.o \
> ${WRKSRC}/src/ext/sigfault.o \
> -L${LOCALBASE}/lib \
> - `(llvm-config --libs --system-libs --ldflags 2> /dev/null)` \
> + `(${LLVM_CONFIG} --libs --system-libs --ldflags 2> /dev/null)` \
> -lz -lpcre -lgc -lpthread -levent_core -levent_extra -lssl \
> -lcrypto -liconv
> # Use the compiler to re-compile the compiler
> @@ -63,7 +65,8 @@ do-build:
> cd ${WRKSRC}; \
> ulimit -s 5120 -d 4096000 && \
> CRYSTAL_CONFIG_PATH="lib:${TRUEPREFIX}/lib/crystal" \
> - CXX=${CXX} ${MAKE_PROGRAM} ${ALL_TARGET}
> + CXX=${CXX} LLVM_CONFIG=${LLVM_CONFIG} \
> + ${MAKE_PROGRAM} ${ALL_TARGET}
> cd ${WRKSRC}/../shards-${V_SHARDS} && \
> ${MAKE_PROGRAM} CRYSTAL=${WRKSRC}/.build/crystal \
> CRYSTAL_PATH=${WRKSRC}/src CRFLAGS=--release
>
Re: Hidden dependency for print/ptouch-driver
On 2020/08/02 19:33, Antoine Jacoutot wrote: > On Sun, Aug 02, 2020 at 07:25:08PM +0200, Antoine Jacoutot wrote: > > On Sun, Aug 02, 2020 at 01:05:51PM -0400, Kurt Mosiejczuk wrote: > > > Had a failure of print/ptouch-driver on the current sparc64 build. > > > > > > ptexplain.c: In function 'main': > > > ptexplain.c:813: error: 'HAVE_LIBPNG' undeclared (first use in this > > > function) > > > ptexplain.c:813: error: (Each undeclared identifier is reported only once > > > ptexplain.c:813: error: for each function it appears in.) > > > gmake[1]: *** [Makefile:531: ptexplain.o] Error 1 > > > > > > Adding graphics/png to LIB_DEPENDS fixes it. > > > > > > ok? > > > > Not quite: LIB_DEPENDS without a corresponding is wrong. > > corresponding *WANTLIB* "make package" will complain too (something something "not needed")
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/08/03 02:50:41 Modified files: sysutils/libvirt-python: Makefile distinfo Log message: Update to py3-libvirt-6.6.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/08/03 02:50:15 Modified files: sysutils/libvirt: Makefile distinfo sysutils/libvirt/patches: patch-configure sysutils/libvirt/pkg: PLIST Log message: Update to libvirt-6.6.0.
Re: Hidden dependency for print/ptouch-driver
On Sun, Aug 02, 2020 at 01:35:09PM -0400, Kurt Mosiejczuk wrote: > On Sun, Aug 02, 2020 at 07:33:32PM +0200, Antoine Jacoutot wrote: > > > > > Adding graphics/png to LIB_DEPENDS fixes it. > > > > > ok? > > > > Not quite: LIB_DEPENDS without a corresponding is wrong. > > > corresponding *WANTLIB* > > > > Did you 'make port-lib-depends-check'? > > superhell$ make port-lib-depends-check > superhell$ > > make lib-depends-check does question if it is needed in LIB_DEPENDS. So is it > a BUILD_DEPENDS only? Thanks, I added the BDEP with an explanation. -- Antoine
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/08/03 02:14:56 Modified files: print/ptouch-driver: Makefile Log message: Missing BDEP on graphics/png needed to build ptexplain which is not installed (hence no LDEP). reported by kmos@
Re: Switch to LLVM 10 imminent
I'd like to try llvm-10 (latest git master), but when i try to build on OpenBSD-6.7 (amd64), but i get build failures such as: llvm-project/libcxxabi/../libcxx/include/__config:1150:6: error: "No thread API"). Is there a set of patches somewhere that i can use? [ports/lang/clang/ doesn't seem to have anything relevant.] Thanks, - Jules On Sat, 1 Aug 2020 22:14:03 +0200 Christian Weisgerber wrote: > I don't think there was any public announcement, but most will have > surmised it by now: The base compiler will soon switch from LLVM 8 > to LLVM 10 on all CLANG_ARCHS. This also concerns the linker on > LLD_ARCHS. > > This will cause a certain amount of breakage in the ports tree. > We are working on it now. > > I have uploaded the failure logs from early builds at > http://build-failures.rhaalovely.net/amd64-clang/ > > Note that the devel/pango failure prevented GTK and Qt and thus a > huge chunk of the tree from building. More meaningful logs should > appear within 24 hours. > > Principal sources of build failures: > * C++ incompatibilities, as always. > * Use of -Werror breaking on new warnings. > * Linking errors. > > There are also silly problems such as configure scripts misrecognizing > LLVM 10 due to changes in the output of "cc -v" or "cc -dumpversion". > > Anyway, I would like to encourage more people to join into the effort. > (And yes, I'm aware that there's no publically available snapshot > or patchset with LLVM 10...) > -- http://op59.net
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/08/03 02:01:48 Modified files: graphics/babl : Makefile distinfo Log message: Update to babl-0.1.80.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/08/03 01:27:46 Modified files: lang/guile2: Makefile distinfo Log message: update to guile-2.2.7
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/08/03 00:38:01 Modified files: lang/myhdl : Makefile distinfo lang/myhdl/patches: patch-myhdl_test_core_test_Cosimulation_py lang/myhdl/pkg : PLIST Added files: lang/myhdl/patches: patch-myhdl_test_core_Makefile Log message: - update to myhdl-0.11 - switch to python 3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2020/08/03 00:20:18 Modified files: net/dnscontrol : Makefile distinfo net/dnscontrol/pkg: PLIST Log message: Update dnscontrol 3.1.1 -> 3.2.0 Release notes: https://github.com/StackExchange/dnscontrol/releases/tag/v3.2.0
