pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

isa-l: Patch for NetBSD bswap, clean up



Module Name:	pkgsrc-wip
Committed By:	Jason W. Bacon <bacon4000%gmail.com@localhost>
Pushed By:	outpaddling
Date:		Wed May 31 11:42:43 2023 -0500
Changeset:	accc9b788bb5546b7050d362142bbaf4b16c8713

Modified Files:
	isa-l/Makefile
	isa-l/PLIST
	isa-l/distinfo
Added Files:
	isa-l/patches/patch-igzip_igzip.c
	isa-l/patches/patch-igzip_igzip__inflate.c

Log Message:
isa-l: Patch for NetBSD bswap, clean up

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=accc9b788bb5546b7050d362142bbaf4b16c8713

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 isa-l/Makefile                             | 18 ++++--------------
 isa-l/PLIST                                | 14 ++++++++++++++
 isa-l/distinfo                             |  3 +++
 isa-l/patches/patch-igzip_igzip.c          | 15 +++++++++++++++
 isa-l/patches/patch-igzip_igzip__inflate.c | 15 +++++++++++++++
 5 files changed, 51 insertions(+), 14 deletions(-)

diffs:
diff --git a/isa-l/Makefile b/isa-l/Makefile
index 760aaec6bc..0d6c2ccee3 100644
--- a/isa-l/Makefile
+++ b/isa-l/Makefile
@@ -5,12 +5,6 @@
 #              Wed May 31 10:55:57 CDT 2023               #
 ###########################################################
 
-###########################################################
-# Unconverted and partially converted FreeBSD port syntax:
-
-# Unknown tool: USE_TOOLS=	libtool:keepla
-#USE_LDCONFIG=	yes
-
 DISTNAME=	isa-l-2.30.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=01org/}
@@ -19,24 +13,20 @@ GITHUB_TAG=	v${PKGVERSION_NOREV}
 OWNER=		bacon%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/01org/isa-l
 COMMENT=	Intel(R) Intelligent Storage Acceleration Libray
-# Check this
 LICENSE=	modified-bsd
 
-ONLY_FOR_PLATFORM=	*-*-x86_64 *-*-powerpc64le *-*-powerpc64 *-*-powerpc
+# From FreeBSD port.  Upstream seems to indicate that it should
+# work on any platform, though.
+# ONLY_FOR_PLATFORM=	*-*-x86_64 *-*-powerpc64 *-*-powerpc
 
 DEPENDS=	yasm>0:../../devel/yasm
 
-# Just assuming C and C++: Adjust this!
-USE_LANGUAGES=	c c++
 USE_TOOLS+=	autoconf automake autoreconf gmake
+USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 
 pre-configure:
 	cd ${WRKSRC} && autoreconf -if
 
-# Convert any _DEPENDS above that have a buildlink3.mk
-# .include "../..///buildlink3.mk"
-# CentOS doesn't have zlib in the base, so uncomment if needed.
-# .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/isa-l/PLIST b/isa-l/PLIST
index 48d96a5493..a4ef3a244d 100644
--- a/isa-l/PLIST
+++ b/isa-l/PLIST
@@ -1 +1,15 @@
 @comment $NetBSD$
+bin/igzip
+include/isa-l.h
+include/isa-l/crc.h
+include/isa-l/crc64.h
+include/isa-l/erasure_code.h
+include/isa-l/gf_vect_mul.h
+include/isa-l/igzip_lib.h
+include/isa-l/mem_routines.h
+include/isa-l/raid.h
+include/isa-l/test.h
+include/isa-l/types.h
+lib/libisal.la
+lib/pkgconfig/libisal.pc
+man/man1/igzip.1
diff --git a/isa-l/distinfo b/isa-l/distinfo
index 5798c9f83e..4cdd67ca9d 100644
--- a/isa-l/distinfo
+++ b/isa-l/distinfo
@@ -3,3 +3,6 @@ $NetBSD$
 BLAKE2s (isa-l-2.30.0.tar.gz) = 5e6b9b199aaa6b8ac2b5b2f812508541057167d31a9b104df7fe2a60df7f58d7
 SHA512 (isa-l-2.30.0.tar.gz) = d3ecfb7326097534b06a74b584100336509525ae7cadc6112d0c27e3d8704f3810e18f583d3cc33fa266bfec96db023607622b22ddbf17988ec4bf1bb3b3b9b2
 Size (isa-l-2.30.0.tar.gz) = 649389 bytes
+SHA1 (patch-igzip_igzip.c) = bccd90c8460ceb3c5c11ac4278e1bb7b26431d0a
+SHA1 (patch-igzip_igzip__inflate.c) = 8c1b0bc4711d4a2be63d8c063e917b50c1237a5f
+SHA1 (patch-make.inc) = 6f7ca4206f26633a46fd974c7ffea39d3fba1f0e
diff --git a/isa-l/patches/patch-igzip_igzip.c b/isa-l/patches/patch-igzip_igzip.c
new file mode 100644
index 0000000000..990daa2d2a
--- /dev/null
+++ b/isa-l/patches/patch-igzip_igzip.c
@@ -0,0 +1,15 @@
+$NetBSD$
+
+# NetBSD bswap hack
+
+--- igzip/igzip.c.orig	2023-05-31 16:16:39.867982257 +0000
++++ igzip/igzip.c
+@@ -54,7 +54,7 @@
+ #include "igzip_wrapper.h"
+ #include "unaligned.h"
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__NetBSD__)
+ #include <sys/types.h>
+ #include <sys/endian.h>
+ # define to_be32(x) bswap32(x)
diff --git a/isa-l/patches/patch-igzip_igzip__inflate.c b/isa-l/patches/patch-igzip_igzip__inflate.c
new file mode 100644
index 0000000000..8c40279d4a
--- /dev/null
+++ b/isa-l/patches/patch-igzip_igzip__inflate.c
@@ -0,0 +1,15 @@
+$NetBSD$
+
+# NetBSD bswap hack
+
+--- igzip/igzip_inflate.c.orig	2023-05-31 16:18:23.382475799 +0000
++++ igzip/igzip_inflate.c
+@@ -39,7 +39,7 @@
+ #include "static_inflate.h"
+ #endif
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__NetBSD__)
+ #include <sys/types.h>
+ #include <sys/endian.h>
+ # define bswap_32(x) bswap32(x)


Home | Main Index | Thread Index | Old Index