[packages/crcutil] add patches as local
glen
glen at pld-linux.org
Mon Jul 4 09:19:44 CEST 2016
commit 09e75b8197d3bec4cce3050c1b1c4d6786bb476f
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Mon Jul 4 10:19:04 2016 +0300
add patches as local
someone will definately make local changes to patch and forget distfiles
upload
automake.patch | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++
build-fix-tests.patch | 33 ++++++++++++++++++++++++++
crcutil.spec | 6 ++---
3 files changed, 101 insertions(+), 4 deletions(-)
---
diff --git a/crcutil.spec b/crcutil.spec
index 3534e00..02b4064 100644
--- a/crcutil.spec
+++ b/crcutil.spec
@@ -12,10 +12,8 @@ Group: Libraries
Source0: https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/crcutil/%{name}-%{version}.tar.gz
# Source0-md5: 94cb7014d4078c138d3c9646fcf1fec5
Patch0: detect-mcrc32.patch
-Patch1: http://storage.googleapis.com/google-code-attachments/crcutil/issue-9/comment-0/build-fix-tests.patch
-# Patch1-md5: 6b88d4eeef7e418c1eb6fc0ab729dca2
-Patch2: http://storage.googleapis.com/google-code-attachments/crcutil/issue-3/comment-0/automake.patch
-# Patch2-md5: b2c82d3ac05fc206944479aae2e17d8d
+Patch1: build-fix-tests.patch
+Patch2: automake.patch
Patch3: library.patch
URL: https://code.google.com/archive/p/crcutil/
BuildRequires: autoconf
diff --git a/automake.patch b/automake.patch
new file mode 100644
index 0000000..884c56e
--- /dev/null
+++ b/automake.patch
@@ -0,0 +1,66 @@
+https://code.google.com/archive/p/crcutil/issues/3
+
+Last-Update: 2014-12-07
+Forwarded: no
+Author: Dmitry Smirnov <onlyjob at member.fsf.org>
+Description: modernise automake
+ Recent automake defaults to running tests in parallel which redirects
+ `make check` output to log. Setting "serial-tests" restores old behaviour.
+~~~~
+ configure.ac:6: warning: AM_INIT_AUTOMAKE: two- and three-arguments forms are deprecated. For more info, see:
+ configure.ac:6: http://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_005fINIT_005fAUTOMAKE-invocation
+
+ Makefile.am:5: warning: source file 'code/crc32c_sse4.cc' is in a subdirectory,
+ Makefile.am:5: but option 'subdir-objects' is disabled
+ automake: warning: possible forward-incompatibility.
+ automake: At least a source file is in a subdirectory, but the 'subdir-objects'
+ automake: automake option hasn't been enabled. For now, the corresponding output
+ automake: object file(s) will be placed in the top-level directory. However,
+ automake: this behaviour will change in future Automake versions: they will
+ automake: unconditionally cause object files to be placed in the same subdirectory
+ automake: of the corresponding sources.
+ automake: You are advised to start using 'subdir-objects' option throughout your
+ automake: project, to avoid future incompatibilities.
+ Makefile.am:5: warning: source file 'code/multiword_128_64_gcc_amd64_sse2.cc' is in a subdirectory,
+ Makefile.am:5: but option 'subdir-objects' is disabled
+ Makefile.am:5: warning: source file 'code/multiword_64_64_cl_i386_mmx.cc' is in a subdirectory,
+ Makefile.am:5: but option 'subdir-objects' is disabled
+ Makefile.am:5: warning: source file 'code/multiword_64_64_gcc_amd64_asm.cc' is in a subdirectory,
+ Makefile.am:5: but option 'subdir-objects' is disabled
+ Makefile.am:5: warning: source file 'code/multiword_64_64_gcc_i386_mmx.cc' is in a subdirectory,
+ Makefile.am:5: but option 'subdir-objects' is disabled
+ Makefile.am:5: warning: source file 'tests/set_hi_pri.c' is in a subdirectory,
+ Makefile.am:5: but option 'subdir-objects' is disabled
+ Makefile.am:5: warning: source file 'tests/unittest.cc' is in a subdirectory,
+ Makefile.am:5: but option 'subdir-objects' is disabled
+ Makefile.am:9: warning: source file 'code/crc32c_sse4.cc' is in a subdirectory,
+ Makefile.am:9: but option 'subdir-objects' is disabled
+ Makefile.am:9: warning: source file 'code/multiword_128_64_gcc_amd64_sse2.cc' is in a subdirectory,
+ Makefile.am:9: but option 'subdir-objects' is disabled
+ Makefile.am:9: warning: source file 'code/multiword_64_64_cl_i386_mmx.cc' is in a subdirectory,
+ Makefile.am:9: but option 'subdir-objects' is disabled
+ Makefile.am:9: warning: source file 'code/multiword_64_64_gcc_amd64_asm.cc' is in a subdirectory,
+ Makefile.am:9: but option 'subdir-objects' is disabled
+ Makefile.am:9: warning: source file 'code/multiword_64_64_gcc_i386_mmx.cc' is in a subdirectory,
+ Makefile.am:9: but option 'subdir-objects' is disabled
+ Makefile.am:9: warning: source file 'examples/interface.cc' is in a subdirectory,
+ Makefile.am:9: but option 'subdir-objects' is disabled
+ Makefile.am:9: warning: source file 'examples/usage.cc' is in a subdirectory,
+ Makefile.am:9: but option 'subdir-objects' is disabled
+~~~~
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,10 +1,10 @@
+ # -*- Autoconf -*-
+ # Process this file with autoconf to produce a configure script.
+
+ AC_PREREQ([2.65])
+-AC_INIT(crcutil, 1.0, crcutil at googlegroups.com)
+-AM_INIT_AUTOMAKE(crcutil, 1.0)
++AC_INIT([crcutil], [1.0], [crcutil at googlegroups.com], [crcutil])
++AM_INIT_AUTOMAKE([subdir-objects serial-tests])
+ AC_CONFIG_FILES([Makefile])
+ AC_OUTPUT()
+ AC_CONFIG_SRCDIR([tests/aligned_alloc.h])
+ AC_CONFIG_HEADERS([config.h])
diff --git a/build-fix-tests.patch b/build-fix-tests.patch
new file mode 100644
index 0000000..5badc77
--- /dev/null
+++ b/build-fix-tests.patch
@@ -0,0 +1,33 @@
+Last-Update: 2015-02-27
+Forwarded: https://code.google.com/p/crcutil/issues/detail?id=9
+Author: Dmitry Smirnov <onlyjob at member.fsf.org>
+Description: fix tests on non-x86
+
+--- a/tests/unittest.h
++++ b/tests/unittest.h
+@@ -110,9 +110,9 @@
+ ~GenericCrcTest() {}
+ void InitWithCrc32c(const Crc &generating_polynomial,
+ size_t degree,
+ bool constant) {
+- Init(generating_polynomial, degree, constant);
++ this->Init(generating_polynomial, degree, constant);
+ }
+
+ bool HaveCrc32c() const {
+ return false;
+@@ -615,12 +615,14 @@
+ "Functional test of %s (size=%u bytes",
+ class_title,
+ static_cast<int>(
+ sizeof(GenericCrc<Crc, TableEntry, Word, kStride>)));
++#if HAVE_AMD64 || HAVE_I386
+ if (this->HaveCrc32c()) {
+ fprintf(stderr, " [generic], %u bytes [CRC32C]",
+ static_cast<int>(sizeof(Crc32cSSE4)));
+ }
++#endif
+ fprintf(stderr, ")\n");
+ fflush(stderr);
+
+ VerifyPow();
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/crcutil.git/commitdiff/09e75b8197d3bec4cce3050c1b1c4d6786bb476f
More information about the pld-cvs-commit
mailing list