From b65257f75abad2caa9aea1df8ef5e49c0497a27c Mon Sep 17 00:00:00 2001 From: Qianqian Fang Date: Aug 15 2022 15:22:39 +0000 Subject: patch makefile to fix #2046780 --- diff --git a/.gitignore b/.gitignore index 841ceea..df79b1a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /easylzma-0.0.7.tar.gz /zmat-0.9.tar.gz /zmat-0.9.8.tar.gz +/zmat-0.9.8-Octave7.patch diff --git a/octave-zmat.spec b/octave-zmat.spec index 6c776a0..73222fe 100644 --- a/octave-zmat.spec +++ b/octave-zmat.spec @@ -2,12 +2,13 @@ Name: octave-%{octpkg} Version: 0.9.8 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A portable data compression/decompression toolbox for MATLAB/Octave License: GPLv3+ or BSD URL: https://github.com/fangq/zmat Source0: https://github.com/fangq/zmat/archive/v%{version}/%{octpkg}-%{version}.tar.gz -BuildRequires: make +Patch0: zmat-0.9.8-Octave7.patch +BuildRequires: make BuildRequires: octave-devel zlib gcc-c++ Requires: octave zlib @@ -59,8 +60,8 @@ mv *.m inst/ %build cd src -make clean -make oct +make clean +make oct CFLAGS="%{optflags}" cd ../ mv *.mex inst/ rm -rf src @@ -95,6 +96,9 @@ rm -rf src %{octpkgdir}/packinfo %changelog +* Mon Aug 15 2022 Qianqian Fang - 0.9.8-6 +- Avoid Octave 7 mkoctfile infinite loop, fix #2046780 + * Thu Jan 20 2022 Fedora Release Engineering - 0.9.8-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 462b99c..abcd894 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zmat-0.9.8.tar.gz) = b738ffa0d0e5b3a9efc8bd9899157480c7e0e99e23e89763df006977b9ba27d08fa69a209a36d7b1a62346d07000a585d22f89b1e6f7c5aaca532d169542b48a +SHA512 (zmat-0.9.8-Octave7.patch) = a0a421d966612206001c405fe64aa1e3046f9dcd25fc3dcbb775d41c8da3cac683a9fd0dbfacffad31b6e79184de638b70fd8384f2c63152e9946144ab3f98e3 diff --git a/zmat-0.9.8-Octave7.patch b/zmat-0.9.8-Octave7.patch new file mode 100644 index 0000000..c0e5386 --- /dev/null +++ b/zmat-0.9.8-Octave7.patch @@ -0,0 +1,30 @@ +--- zmat-0.9.8/src/Makefile_orig 2022-08-15 11:04:27.531961978 -0400 ++++ zmat-0.9.8/src/Makefile 2022-08-15 11:03:31.298329901 -0400 +@@ -107,16 +107,15 @@ + dll: CPPOPT +=$(DLLFLAG) + dll: AR :=gcc + dll: ARFLAGS ?=-shared -Wl,-soname,$(BINARY).1 +-dll: LINKOPT := ++dll: LINKOPT :=$(LDFLAGS) + dll: AROUTPUT :=-o + + oct mex: CPPOPT+= $(DLLFLAG) + oct: OUTPUT_DIR=.. +-oct: AR= CXXFLAGS='-O3' LFLAGS='$(-lz)' LDFLAGS='$(LFLAGS)' mkoctfile zmat.cpp ++oct: AR= CXXFLAGS='-O3' mkoctfile zmat.cpp + oct: BINARY=zmat.mex + oct: ARFLAGS := + oct: LINKOPT+=--mex $(INCLUDEDIRS) +-oct: CXX=mkoctfile + + mex: CXX=$(MEX) + mex: OUTPUTFLAG:=-output +@@ -152,7 +151,7 @@ + + %$(OBJSUFFIX): %.c + @$(ECHO) Building $@ +- $(CC) $(INCLUDEDIRS) $(CPPOPT) -c -o $@ $< ++ $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDEDIRS) $(CPPOPT) -c -o $@ $< + + %$(OBJSUFFIX): %.cu + @$(ECHO) Building $@