[PR PATCH] m4ri: add ${makedepends} to m4ri-devel depends

[PR PATCH] m4ri: add ${makedepends} to m4ri-devel depends

[tornaria]

[-- Attachment #1: Type: text/plain, Size: 570 bytes --]

There is a new pull request by tornaria against master on the void-packages repository

https://github.com/tornaria/void-packages m4ri
https://github.com/void-linux/void-packages/pull/34004

m4ri: add ${makedepends} to m4ri-devel depends
@leahneukirchen we missed this, and now m4rie is not building without libgomp-devel.

I think the proper fix is to add libgomp-devel to depends for m4ri-devel, rather than add it to makedepends for m4rie, which is what this PR implements.

A patch file from https://github.com/void-linux/void-packages/pull/34004.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-m4ri-34004.patch --]
[-- Type: text/x-diff, Size: 1172 bytes --]

From b3e536a85c4e014029d85720640ee082cc32fac8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 9 Nov 2021 22:16:10 -0300
Subject: [PATCH] m4ri: add ${makedepends} to m4ri-devel depends

For instance, building m4rie fails without this, since libgomp-devel is
missing but it is needed to compile with m4ri-devel.
---
 srcpkgs/m4ri/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/m4ri/template b/srcpkgs/m4ri/template
index 54a8981e5176..56e60ed16f59 100644
--- a/srcpkgs/m4ri/template
+++ b/srcpkgs/m4ri/template
@@ -1,7 +1,7 @@
 # Template file for 'm4ri'
 pkgname=m4ri
 version=20200125
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-openmp ax_cv_have_sse3_ext=no ax_cv_have_ssse3_ext=no"
 hostmakedepends="pkg-config"
@@ -15,7 +15,7 @@ checksum=0dfb34aed351882a0f2281535ea6f81c690a5efeb14edab131d9ba0dffe44863
 
 m4ri-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"

Re: m4ri: add ${makedepends} to m4ri-devel depends

[tornaria]

[-- Attachment #1: Type: text/plain, Size: 338 bytes --]

New comment by tornaria on void-packages repository

https://github.com/void-linux/void-packages/pull/34004#issuecomment-964705194

Comment:
Oh, well... for i686 the build succeeds, but then running make check fails because compiling tests doesn't use the same flags (in particular it doesn't use `-msse2` which then causes the failure).

Re: [PR PATCH] [Updated] m4ri: add ${makedepends} to m4ri-devel depends

[tornaria]

[-- Attachment #1: Type: text/plain, Size: 575 bytes --]

There is an updated pull request by tornaria against master on the void-packages repository

https://github.com/tornaria/void-packages m4ri
https://github.com/void-linux/void-packages/pull/34004

m4ri: add ${makedepends} to m4ri-devel depends
@leahneukirchen we missed this, and now m4rie is not building without libgomp-devel.

I think the proper fix is to add libgomp-devel to depends for m4ri-devel, rather than add it to makedepends for m4rie, which is what this PR implements.

A patch file from https://github.com/void-linux/void-packages/pull/34004.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-m4ri-34004.patch --]
[-- Type: text/x-diff, Size: 2495 bytes --]

From bbb74b54d32163aa0183a92837073d9226ccdcac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 9 Nov 2021 22:16:10 -0300
Subject: [PATCH] m4ri: fix m4ri-devel depends and i686 check

1.  add ${makedepends} to m4ri-devel depends

For instance, building m4rie fails without this, since libgomp-devel is
missing but it is needed to compile with m4ri-devel.

2. patch tests/Makefile to use SIMD_CFLAGS

Without the patch running make check fails on i686, because the library
is compiled with -msse2 but tests are not.
---
 srcpkgs/m4ri/patches/m4ri-simd_cflags_in_tests.patch | 11 +++++++++++
 srcpkgs/m4ri/template                                |  4 ++--
 2 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/m4ri/patches/m4ri-simd_cflags_in_tests.patch

diff --git a/srcpkgs/m4ri/patches/m4ri-simd_cflags_in_tests.patch b/srcpkgs/m4ri/patches/m4ri-simd_cflags_in_tests.patch
new file mode 100644
index 000000000000..ffa64b120fc2
--- /dev/null
+++ b/srcpkgs/m4ri/patches/m4ri-simd_cflags_in_tests.patch
@@ -0,0 +1,11 @@
+--- a/tests/Makefile.in	2020-01-25 01:34:59.000000000 -0300
++++ b/tests/Makefile.in	2021-11-10 08:13:46.505793446 -0300
+@@ -609,7 +609,7 @@
+ TOPBUILDDIR = $(builddir)/..
+ DEFINES = 
+ # include TOPBUILDIR for m4ri_config.h
+-AM_CFLAGS = -I$(TOPSRCDIR) -I$(TOPBUILDDIR) -D_XOPEN_SOURCE=600 $(DEFINES) @OPENMP_CFLAGS@ @PAPI_CFLAGS@
++AM_CFLAGS = -I$(TOPSRCDIR) -I$(TOPBUILDDIR) -D_XOPEN_SOURCE=600 $(DEFINES) $(SIMD_CFLAGS) $(OPENMP_CFLAGS) $(PAPI_CFLAGS)
+ STAGEDIR := $(realpath -s $(TOPBUILDDIR)/.libs)
+ AM_LDFLAGS = -L$(STAGEDIR) -Wl,-rpath,$(STAGEDIR) -lm4ri $(LIBM) @PAPI_LDFLAGS@ @PAPI_LIBS@ -no-install
+ test_smallops_SOURCES = test_smallops.c testing.c testing.h
diff --git a/srcpkgs/m4ri/template b/srcpkgs/m4ri/template
index 54a8981e5176..56e60ed16f59 100644
--- a/srcpkgs/m4ri/template
+++ b/srcpkgs/m4ri/template
@@ -1,7 +1,7 @@
 # Template file for 'm4ri'
 pkgname=m4ri
 version=20200125
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-openmp ax_cv_have_sse3_ext=no ax_cv_have_ssse3_ext=no"
 hostmakedepends="pkg-config"
@@ -15,7 +15,7 @@ checksum=0dfb34aed351882a0f2281535ea6f81c690a5efeb14edab131d9ba0dffe44863
 
 m4ri-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"

Re: [PR PATCH] [Merged]: m4ri: add ${makedepends} to m4ri-devel depends

[leahneukirchen]

[-- Attachment #1: Type: text/plain, Size: 420 bytes --]

There's a merged pull request on the void-packages repository

m4ri: add ${makedepends} to m4ri-devel depends
https://github.com/void-linux/void-packages/pull/34004

Description:
@leahneukirchen we missed this, and now m4rie is not building without libgomp-devel.

I think the proper fix is to add libgomp-devel to depends for m4ri-devel, rather than add it to makedepends for m4rie, which is what this PR implements.