On Fri, Dec 02, 2022 at 04:48:41PM +0000, Stuart Henderson wrote:
> On 2022/12/02 09:13, Bjorn Ketelaars wrote:
> > Index: Makefile.inc
> > ===================================================================
> > RCS file: /cvs/ports/sysutils/borgbackup/Makefile.inc,v
> > retrieving revision 1.6
> > diff -u -p -r1.6 Makefile.inc
> > --- Makefile.inc 14 Sep 2022 18:01:36 -0000 1.6
> > +++ Makefile.inc 2 Dec 2022 08:08:38 -0000
> > @@ -13,6 +13,8 @@ PERMIT_PACKAGE = Yes
> >
> > WANTLIB += crypto lz4 xxhash zstd
> >
> > +COMPILER = base-clang ports-gcc
> > +
>
> 1.1 includes ${COMPILER_LIBCXX} in WANTLIB but 1.2 does not, so 1.2
> probably wants COMPILER_LANGS=c if moving this
Right, builds and executes fine (but still hits the error).
Index: Makefile.inc
===================================================================
RCS file: /cvs/ports/sysutils/borgbackup/Makefile.inc,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile.inc
--- Makefile.inc 14 Sep 2022 18:01:36 -0000 1.6
+++ Makefile.inc 2 Dec 2022 16:55:57 -0000
@@ -13,6 +13,8 @@ PERMIT_PACKAGE = Yes
WANTLIB += crypto lz4 xxhash zstd
+COMPILER = base-clang ports-gcc
+
MODULES = lang/python
MODPY_PYBUILD = setuptools_scm
MODPY_PI = Yes
Index: 1.1/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/borgbackup/1.1/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- 1.1/Makefile 13 Nov 2022 15:29:45 -0000 1.6
+++ 1.1/Makefile 2 Dec 2022 16:56:05 -0000
@@ -1,11 +1,9 @@
PORTROACH = limit:^1\.1\.
MODPY_EGG_VERSION = 1.1.18
-REVISION = 1
+REVISION = 2
WANTLIB = ${COMPILER_LIBCXX} b2 m
-
-COMPILER = base-clang ports-gcc base-gcc
LIB_DEPENDS = security/libb2
Index: 1.1/patches/patch-src_borg__endian_h
===================================================================
RCS file: 1.1/patches/patch-src_borg__endian_h
diff -N 1.1/patches/patch-src_borg__endian_h
--- 1.1/patches/patch-src_borg__endian_h 8 Mar 2022 08:53:52 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,24 +0,0 @@
-__builtin_bswap32 unavailable at least on sparc64
-
-Index: src/borg/_endian.h
---- src/borg/_endian.h.orig
-+++ src/borg/_endian.h
-@@ -1,6 +1,7 @@
- #include <unistd.h>
- #include <stdlib.h>
- #include <stdint.h>
-+#include <endian.h>
-
- #if defined (__SVR4) && defined (__sun)
- #include <sys/isa_defs.h>
-@@ -19,8 +20,8 @@
- #endif
-
- #if BORG_BIG_ENDIAN
--#define _le32toh(x) __builtin_bswap32(x)
--#define _htole32(x) __builtin_bswap32(x)
-+#define _le32toh(x) letoh32(x)
-+#define _htole32(x) htole32(x)
- #else
- #define _le32toh(x) (x)
- #define _htole32(x) (x)
Index: 1.2/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/borgbackup/1.2/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- 1.2/Makefile 13 Nov 2022 15:29:45 -0000 1.7
+++ 1.2/Makefile 2 Dec 2022 16:55:37 -0000
@@ -1,5 +1,7 @@
MODPY_EGG_VERSION = 1.2.2
-REVISION = 1
+REVISION = 2
+
+COMPILER_LANGS = c
BUILD_DEPENDS = devel/py-pkgconfig${MODPY_FLAVOR} \
lang/cython${MODPY_FLAVOR}
Index: 1.2/patches/patch-src_borg__endian_h
===================================================================
RCS file: 1.2/patches/patch-src_borg__endian_h
diff -N 1.2/patches/patch-src_borg__endian_h
--- 1.2/patches/patch-src_borg__endian_h 8 Mar 2022 08:53:52 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,24 +0,0 @@
-__builtin_bswap32 unavailable at least on sparc64
-
-Index: src/borg/_endian.h
---- src/borg/_endian.h.orig
-+++ src/borg/_endian.h
-@@ -3,6 +3,7 @@
- #endif
- #include <stdlib.h>
- #include <stdint.h>
-+#include <endian.h>
-
- #if defined (__SVR4) && defined (__sun)
- #include <sys/isa_defs.h>
-@@ -22,8 +23,8 @@
- #endif
-
- #if BORG_BIG_ENDIAN
--#define _le32toh(x) __builtin_bswap32(x)
--#define _htole32(x) __builtin_bswap32(x)
-+#define _le32toh(x) letoh32(x)
-+#define _htole32(x) htole32(x)
- #else
- #define _le32toh(x) (x)
- #define _htole32(x) (x)
