Accepting request 406095 from benchmark

- 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 OBS-URL: https://build.opensuse.org/request/show/406095 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libmicro?expand=0&rev=21
2016-07-05 07:51:54 +00:00 · 2016-07-05 07:51:54 +00:00 · 92013fa64b
commit 92013fa64b
parent 43f8715111 0a342527da
9 changed files with 85 additions and 22 deletions
--- a/13
+++ b/13
@ -0,0 +1,13 @@
+<services>
+  <service mode="disabled" name="tar_scm">
+    <param name="url">https://hg.java.net/hg/libmicro~hg-repo</param>
+    <param name="scm">hg</param>
+    <param name="filename">libmicro</param>
+    <param name="versionformat">0.4.2+hg.20120726</param>
+  </service>
+  <service mode="disabled" name="recompress">
+    <param name="file">*.tar</param>
+    <param name="compression">xz</param>
+  </service>
+  <service mode="disabled" name="set_version"/>
+</services>
--- 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`
 
--- 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
 
--- a/libmicro-0.4.0.tar.bz2
+++ b/libmicro-0.4.0.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cbb93215ff634142ae69578d9c1a2daa48020e3a9f56738f59c6a76989a987dc
-size 78791
--- a/libmicro-0.4.2+hg.20120726.tar.xz
+++ 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
--- a/libmicro-implicit-fortify-decl.patch
+++ b/libmicro-implicit-fortify-decl.patch
@ -0,0 +1,36 @@
+Index: mmap.c
+===================================================================
+--- mmap.c.orig
+++ mmap.c
+@@ -32,6 +32,7 @@
+ #include <stdio.h>
+ #include <fcntl.h>
+ #include <strings.h>
+#include <string.h>
+ 
+ #include "libmicro.h"
+ 
+Index: mprotect.c
+===================================================================
+--- mprotect.c.orig
+++ mprotect.c
+@@ -34,6 +34,7 @@
+ #include <sys/mman.h>
+ #include <fcntl.h>
+ #include <strings.h>
+#include <string.h>
+ 
+ #include "libmicro.h"
+ 
+Index: munmap.c
+===================================================================
+--- munmap.c.orig
+++ munmap.c
+@@ -34,6 +34,7 @@
+ #include <sys/mman.h>
+ #include <fcntl.h>
+ #include <strings.h>
+#include <string.h>
+ 
+ #include "libmicro.h"
+ 
--- a/libmicro.changes
+++ b/libmicro.changes
@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+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

--- 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,17 +17,18 @@


 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
-Requires:       gcc
+Patch3:         libmicro-implicit-fortify-decl.patch
+BuildRequires:  xz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

 %description
@ -37,12 +38,13 @@ performance of various system and library calls.

 %prep
 %setup -q
-%patch0 -p1
+%patch0
 %patch1
-%patch2 -p1
+%patch2
+%patch3

 %build
-make %{?_smp_mflags}
+make CFLAGS="%{optflags}"

 %install
 rm bin-*/*.a
--- 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);