From 5617c7c2134d4db05bae8adcc5fb6f4863a618618ee6dfec4e1ded8575296855 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Sat, 2 Jul 2016 16:50:46 +0000 Subject: [PATCH 1/3] - Update to latest mercurial snapshot (4.2.2+hg.20120726) * lots of small changes OBS-URL: https://build.opensuse.org/package/show/benchmark/libmicro?expand=0&rev=11 --- _service | 13 +++++++++++++ find_binary.patch | 9 +++++---- fix-link.diff | 12 ++++++------ libmicro-0.4.0.tar.bz2 | 3 --- libmicro-0.4.2+hg.20120726.tar.xz | 3 +++ libmicro.changes | 6 ++++++ libmicro.spec | 10 +++++----- removed_undefined_warning.patch | 6 ++++-- 8 files changed, 42 insertions(+), 20 deletions(-) create mode 100644 _service delete mode 100644 libmicro-0.4.0.tar.bz2 create mode 100644 libmicro-0.4.2+hg.20120726.tar.xz diff --git a/_service b/_service new file mode 100644 index 0000000..69c9231 --- /dev/null +++ b/_service @@ -0,0 +1,13 @@ + + + https://hg.java.net/hg/libmicro~hg-repo + hg + libmicro + 0.4.2+hg.20120726 + + + *.tar + xz + + + diff --git a/find_binary.patch b/find_binary.patch index 39caa43..b54c6b1 100644 --- a/find_binary.patch +++ b/find_binary.patch @@ -1,12 +1,13 @@ -diff -pur libmicro-0.4.0/bench.sh libmicro-0.4.0-fixed/bench.sh ---- libmicro-0.4.0/bench.sh 2007-07-02 23:17:45.000000000 +0200 -+++ libmicro-0.4.0-fixed/bench.sh 2008-03-17 12:25:00.000000000 +0100 +Index: bench.sh +=================================================================== +--- bench.sh.orig ++++ bench.sh @@ -30,8 +30,9 @@ # Use is subject to license terms. # +BIN="/usr/lib/libMicro/bin" - bench_version=0.4.0 + bench_version=0.4.2 -libmicro_version=`bin/tattle -V` +libmicro_version=`$BIN/tattle -V` diff --git a/fix-link.diff b/fix-link.diff index 6627d66..0ee1e34 100644 --- a/fix-link.diff +++ b/fix-link.diff @@ -1,11 +1,11 @@ -Index: libmicro-0.4.0/Makefile.com +Index: Makefile.com =================================================================== ---- libmicro-0.4.0.orig/Makefile.com 2007-07-02 23:17:45.000000000 +0200 -+++ libmicro-0.4.0/Makefile.com 2011-09-10 09:48:27.047968747 +0200 +--- Makefile.com.orig ++++ Makefile.com @@ -107,7 +107,7 @@ tattle: ../tattle.c libmicro.a - echo "char * compiler_version = \""`$(COMPILER_VERSION_CMD)`"\";" > tattle.h - echo "char * CC = \""$(CC)"\";" >> tattle.h - echo "char * extra_compiler_flags = \""$(extra_CFLAGS)"\";" >> tattle.h + echo "char compiler_version[] = \""`$(COMPILER_VERSION_CMD)`"\";" > tattle.h + echo "char CC[] = \""$(CC)"\";" >> tattle.h + echo "char extra_compiler_flags[] = \""$(extra_CFLAGS)"\";" >> tattle.h - $(CC) -o tattle $(CFLAGS) -I. ../tattle.c libmicro.a -lrt -lm + $(CC) -o tattle $(CFLAGS) -I. ../tattle.c libmicro.a -lrt -lm -lpthread diff --git a/libmicro-0.4.0.tar.bz2 b/libmicro-0.4.0.tar.bz2 deleted file mode 100644 index 909ccf4..0000000 --- a/libmicro-0.4.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cbb93215ff634142ae69578d9c1a2daa48020e3a9f56738f59c6a76989a987dc -size 78791 diff --git a/libmicro-0.4.2+hg.20120726.tar.xz b/libmicro-0.4.2+hg.20120726.tar.xz new file mode 100644 index 0000000..a9619bb --- /dev/null +++ b/libmicro-0.4.2+hg.20120726.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:340c2c0c7c5a6dfeb89e5f1627fc993aa8f2ebd56b4a6a42a178e38ffe5e9204 +size 41396 diff --git a/libmicro.changes b/libmicro.changes index 5baa6b1..d4524db 100644 --- a/libmicro.changes +++ b/libmicro.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Jul 2 16:33:07 UTC 2016 - mpluskal@suse.com + +- Update to latest mercurial snapshot (4.2.2+hg.20120726) + * lots of small changes + ------------------------------------------------------------------- Sat Feb 14 17:04:27 UTC 2015 - mpluskal@suse.com diff --git a/libmicro.spec b/libmicro.spec index 98a72db..a9fa88f 100644 --- a/libmicro.spec +++ b/libmicro.spec @@ -1,7 +1,7 @@ # # spec file for package libmicro # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,13 +17,13 @@ Name: libmicro -Version: 0.4.0 +Version: 0.4.2+hg.20120726 Release: 0 Summary: LibMicro is a portable set of microbenchmarks License: CDDL-1.0 Group: System/Benchmark Url: https://java.net/projects/libmicro -Source0: %{name}-%{version}.tar.bz2 +Source0: %{name}-%{version}.tar.xz Patch0: find_binary.patch Patch1: removed_undefined_warning.patch Patch2: fix-link.diff @@ -37,9 +37,9 @@ performance of various system and library calls. %prep %setup -q -%patch0 -p1 +%patch0 %patch1 -%patch2 -p1 +%patch2 %build make %{?_smp_mflags} diff --git a/removed_undefined_warning.patch b/removed_undefined_warning.patch index 924f0c3..9f04332 100644 --- a/removed_undefined_warning.patch +++ b/removed_undefined_warning.patch @@ -1,6 +1,8 @@ ---- malloc.c +Index: malloc.c +=================================================================== +--- malloc.c.orig +++ malloc.c -@@ -77,7 +77,7 @@ +@@ -77,7 +77,7 @@ benchmark_optswitch(int opt, char *optar break; case 's': opts[optscnt] = sizetoint(optarg); From 0d69feea95def5c7c4874d353e7fe88f890b06a2ae89ed4ec78f3eb12e6f6b8b Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Sat, 2 Jul 2016 16:59:45 +0000 Subject: [PATCH 2/3] - Build with optflags - Refresh patches - Add libmicro-implicit-fortify-decl.patch OBS-URL: https://build.opensuse.org/package/show/benchmark/libmicro?expand=0&rev=12 --- libmicro-implicit-fortify-decl.patch | 36 ++++++++++++++++++++++++++++ libmicro.changes | 3 +++ libmicro.spec | 4 +++- 3 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 libmicro-implicit-fortify-decl.patch diff --git a/libmicro-implicit-fortify-decl.patch b/libmicro-implicit-fortify-decl.patch new file mode 100644 index 0000000..ab2ed5a --- /dev/null +++ b/libmicro-implicit-fortify-decl.patch @@ -0,0 +1,36 @@ +Index: mmap.c +=================================================================== +--- mmap.c.orig ++++ mmap.c +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + + #include "libmicro.h" + +Index: mprotect.c +=================================================================== +--- mprotect.c.orig ++++ mprotect.c +@@ -34,6 +34,7 @@ + #include + #include + #include ++#include + + #include "libmicro.h" + +Index: munmap.c +=================================================================== +--- munmap.c.orig ++++ munmap.c +@@ -34,6 +34,7 @@ + #include + #include + #include ++#include + + #include "libmicro.h" + diff --git a/libmicro.changes b/libmicro.changes index d4524db..92aabf1 100644 --- a/libmicro.changes +++ b/libmicro.changes @@ -3,6 +3,9 @@ Sat Jul 2 16:33:07 UTC 2016 - mpluskal@suse.com - Update to latest mercurial snapshot (4.2.2+hg.20120726) * lots of small changes +- Build with optflags +- Refresh patches +- Add libmicro-implicit-fortify-decl.patch ------------------------------------------------------------------- Sat Feb 14 17:04:27 UTC 2015 - mpluskal@suse.com diff --git a/libmicro.spec b/libmicro.spec index a9fa88f..426de8c 100644 --- a/libmicro.spec +++ b/libmicro.spec @@ -27,6 +27,7 @@ Source0: %{name}-%{version}.tar.xz Patch0: find_binary.patch Patch1: removed_undefined_warning.patch Patch2: fix-link.diff +Patch3: libmicro-implicit-fortify-decl.patch Requires: gcc BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -40,9 +41,10 @@ performance of various system and library calls. %patch0 %patch1 %patch2 +%patch3 %build -make %{?_smp_mflags} +make %{?_smp_mflags} CFLAGS="%{optflags}" %install rm bin-*/*.a From 0a342527da6e3954291cce7aa3cb76a287c3c585961ebb4795b6b0486a7d97fc Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Sat, 2 Jul 2016 17:03:40 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/benchmark/libmicro?expand=0&rev=13 --- libmicro.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libmicro.spec b/libmicro.spec index 426de8c..48fdec4 100644 --- a/libmicro.spec +++ b/libmicro.spec @@ -28,7 +28,7 @@ Patch0: find_binary.patch Patch1: removed_undefined_warning.patch Patch2: fix-link.diff Patch3: libmicro-implicit-fortify-decl.patch -Requires: gcc +BuildRequires: xz BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -44,7 +44,7 @@ performance of various system and library calls. %patch3 %build -make %{?_smp_mflags} CFLAGS="%{optflags}" +make CFLAGS="%{optflags}" %install rm bin-*/*.a