From: Miguel Landaeta Subject: [MAINTAINER UPDATE] misc/libcpucycles (20230115 -> 20240114) To: ports@openbsd.org Date: Sun, 4 Feb 2024 14:00:25 +0000 Hi, There is a new upstream release for libcpucycles. Changelog: - Add arm32-1176 counter. - Allow slop 0.2 rather than 0.1 for FINDMULTIPLIER. - Improve platform detection. - Port to FreeBSD. - Use blue boldface during compilation for "skipping option that did not compile". - doc/install.md: headings, note manual pages. - Add doc/license.md - Update HTML style for better tt visibility and copy-paste. Thanks! -- Miguel Landaeta, miguel at miguel.cc secure email with PGP 0x6E608B637D8967E9 available at http://miguel.cc/key. "Faith means not wanting to know what is true." -- Nietzsche Index: Makefile =================================================================== RCS file: /home/cvs/ports/misc/libcpucycles/Makefile,v diff -u -p -u -p -r1.2 Makefile --- Makefile 27 Sep 2023 09:52:11 -0000 1.2 +++ Makefile 4 Feb 2024 12:05:59 -0000 @@ -1,6 +1,6 @@ COMMENT= library for counting CPU cycles -V= 20230115 +V= 20240114 DISTNAME= libcpucycles-${V} SHARED_LIBS+= cpucycles 0.0 # 1.0 CATEGORIES= misc Index: distinfo =================================================================== RCS file: /home/cvs/ports/misc/libcpucycles/distinfo,v diff -u -p -u -p -r1.1.1.1 distinfo --- distinfo 14 Aug 2023 08:01:46 -0000 1.1.1.1 +++ distinfo 4 Feb 2024 12:06:19 -0000 @@ -1,2 +1,2 @@ -SHA256 (libcpucycles-20230115.tar.gz) = 3TjBIgVVAha5Jgfw9CcnxSoBCaFq8uqnoTg11T67wiU= -SIZE (libcpucycles-20230115.tar.gz) = 34852 +SHA256 (libcpucycles-20240114.tar.gz) = 49MkYqU7oyOwO4tjVEvK3KihFRT7Mj4TVmHiI2gxbwI= +SIZE (libcpucycles-20240114.tar.gz) = 41463 Index: patches/patch-configure_fix_soname =================================================================== RCS file: /home/cvs/ports/misc/libcpucycles/patches/patch-configure_fix_soname,v diff -u -p -u -p -r1.1.1.1 patch-configure_fix_soname --- patches/patch-configure_fix_soname 14 Aug 2023 08:01:46 -0000 1.1.1.1 +++ patches/patch-configure_fix_soname 4 Feb 2024 12:22:35 -0000 @@ -9,11 +9,11 @@ Index: configure linktype = 'so' +soversion = '0.0' - host = platform.machine() - host = ''.join(c for c in host if c in '_0123456789abcdefghijklmnopqrstuvwxyz') + def hostsanitize(host): + host = host.split('-')[0] @@ -43,6 +44,9 @@ - host = arg[7:] - host = host.split('-')[0] + if arg.startswith('--host='): + host = hostsanitize(arg[7:]) continue + if arg.startswith('--soversion='): + soversion = arg[12:] Index: patches/patch-configure_translate_host_arch =================================================================== RCS file: /home/cvs/ports/misc/libcpucycles/patches/patch-configure_translate_host_arch,v diff -u -p -u -p -r1.1.1.1 patch-configure_translate_host_arch --- patches/patch-configure_translate_host_arch 14 Aug 2023 08:01:46 -0000 1.1.1.1 +++ patches/patch-configure_translate_host_arch 4 Feb 2024 13:19:56 -0000 @@ -3,35 +3,19 @@ Translate OpenBSD architecture name to t Index: configure --- configure.orig +++ configure -@@ -36,13 +36,30 @@ if host.startswith('sparc') or host.startswith('sun'): - - makefile = '' - -+ -+# Some OpenBSD architecture names don't match the -+# architecture name used by upstream, so they require to -+# be translated, so they can be recognized by build scripts. -+# -+def translate_arch(openbsd_arch): -+ archs = { -+ 'arm': 'arm32', -+ 'armv7': 'arm32', -+ 'i386': 'x86', -+ 'powerpc64': 'ppc64', -+ 'macppc': 'ppc32', -+ 'powerpc': 'ppc32', -+ } -+ return archs.get(openbsd_arch, openbsd_arch) -+ -+ - for arg in sys.argv[1:]: - if arg.startswith('--prefix='): - prefix = arg[9:] - continue - if arg.startswith('--host='): - host = arg[7:] -- host = host.split('-')[0] -+ host = translate_arch(host.split('-')[0]) - continue - if arg.startswith('--soversion='): - soversion = arg[12:] +@@ -19,6 +19,7 @@ + ('amd64','amd64'), ('x86_64','amd64'), + ('x86','x86'), ('i386','x86'), ('i686','x86'), + ('arm64','arm64'), ('armv8','arm64'), ('aarch64','arm64'), ++ ('armv7','arm32'), + ('arm','arm32'), + ('riscv64','riscv64'), + ('riscv','riscv32'), +@@ -27,6 +28,7 @@ + ('ppc64','ppc64'), ('powerpc64','ppc64'), + ('powerpc','ppc32'), + ('ppc','ppc32'), ++ ('macppc','ppc32'), + ('sparc64','sparc64'), ('sparcv9','sparc64'), ('sun4u','sparc64'), + ('sparc','sparc32'), ('sun','sparc32'), + ):