pkgsrc-WIP-changes archive

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

blosc: fix build on netbsd by not forcing -std=gnu99



Module Name:	pkgsrc-wip
Committed By:	coypu <coypu%sdf.org@localhost>
Pushed By:	coypu
Date:		Sat Sep 16 04:18:12 2017 +0300
Changeset:	539b9e27c3eaa2075c91f9bfc3462e06b7a36dc3

Modified Files:
	blosc/Makefile
	blosc/PLIST
	blosc/distinfo
Added Files:
	blosc/patches/patch-CMakeLists.txt

Log Message:
blosc: fix build on netbsd by not forcing -std=gnu99

that would make a -std=c11 default not work and so we appear
to lack aligned_alloc.

add a test target, which is failing spectacularly

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

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

diffstat:
 blosc/Makefile                     |  2 ++
 blosc/PLIST                        |  4 ++--
 blosc/distinfo                     |  1 +
 blosc/patches/patch-CMakeLists.txt | 16 ++++++++++++++++
 4 files changed, 21 insertions(+), 2 deletions(-)

diffs:
diff --git a/blosc/Makefile b/blosc/Makefile
index f32f6dac62..30d780c666 100644
--- a/blosc/Makefile
+++ b/blosc/Makefile
@@ -20,6 +20,8 @@ CMAKE_ARGS+=	-DPREFER_EXTERNAL_SNAPPY=ON
 CMAKE_ARGS+=	-DPREFER_EXTERNAL_ZLIB=ON
 CMAKE_ARGS+=	-DPREFER_EXTERNAL_ZSTD=ON
 
+TEST_TARGET=	test
+
 PKGCONFIG_OVERRIDE+=	blosc.pc.in
 
 .include "../../archivers/lz4/buildlink3.mk"
diff --git a/blosc/PLIST b/blosc/PLIST
index 266246953c..f778a070db 100644
--- a/blosc/PLIST
+++ b/blosc/PLIST
@@ -1,8 +1,8 @@
 @comment $NetBSD$
 include/blosc-export.h
 include/blosc.h
-lib/libblosc.${PKGVERSION}.so
-lib/libblosc.1.so
+lib/libblosc.so.${PKGVERSION}
+lib/libblosc.so.1
 lib/libblosc.a
 lib/libblosc.so
 lib/pkgconfig/blosc.pc
diff --git a/blosc/distinfo b/blosc/distinfo
index 563dbab49b..70470f759d 100644
--- a/blosc/distinfo
+++ b/blosc/distinfo
@@ -4,3 +4,4 @@ SHA1 (blosc-1.12.1.tar.gz) = 234ca85e3602cceee4d8b106c27fda526bbd733d
 RMD160 (blosc-1.12.1.tar.gz) = b04b93363b90015b79964dc4615699fa897e5273
 SHA512 (blosc-1.12.1.tar.gz) = f65bbbfce6fc59d0c5a0889d5771dd78cae2796244c6ee69edf15b27c4563c28ce789fded9104a8626d12be3e46418d596dfdb204c43e33abae8dca40debfd92
 Size (blosc-1.12.1.tar.gz) = 683510 bytes
+SHA1 (patch-CMakeLists.txt) = 70dfc44c1541b1fccd200905acbd16e17a9313e1
diff --git a/blosc/patches/patch-CMakeLists.txt b/blosc/patches/patch-CMakeLists.txt
new file mode 100644
index 0000000000..17033b7a89
--- /dev/null
+++ b/blosc/patches/patch-CMakeLists.txt
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Don't force -std=gnu99 if we want to possibly use C11
+for aligned_alloc
+
+--- CMakeLists.txt.orig	2017-07-19 08:08:12.000000000 +0000
++++ CMakeLists.txt
+@@ -201,8 +201,6 @@ if(CMAKE_SYSTEM_PROCESSOR STREQUAL i386 
+    CMAKE_SYSTEM_PROCESSOR STREQUAL amd64 OR
+    CMAKE_SYSTEM_PROCESSOR STREQUAL AMD64)
+     if(CMAKE_C_COMPILER_ID STREQUAL GNU)
+-        # We need C99 (GNU99 more exactly)
+-        SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
+         set(COMPILER_SUPPORT_SSE2 TRUE)
+         if(CMAKE_C_COMPILER_VERSION VERSION_GREATER 4.7 OR CMAKE_C_COMPILER_VERSION VERSION_EQUAL 4.7)
+             set(COMPILER_SUPPORT_AVX2 TRUE)


Home | Main Index | Thread Index | Old Index