cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch 1.2 to ports-gcc like 1.1 does, remove then unneeded patch

Browse Source 
Found while debugging runtime breakage on sparc64.
Feedback bket sthen
This commit is contained in:
kn 2022-12-02 20:37:18 +00:00
parent 608be559e4
commit b44b2203b5
5 changed files with 6 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sysutils/borgbackup/1.1/Makefile
View File

@ -1,12 +1,10 @@
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
.include <bsd.port.mk>

24
sysutils/borgbackup/1.1/patches/patch-src_borg__endian_h
View File

@ -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)

4
sysutils/borgbackup/1.2/Makefile
View File

@ -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}

24
sysutils/borgbackup/1.2/patches/patch-src_borg__endian_h
View File

@ -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)

2
sysutils/borgbackup/Makefile.inc
View File

@ -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