SHA256
1
0
forked from pool/libmicro

Accepting request 82062 from benchmark

- do not build ctcs for 12.0+

- fix build with newer ld

OBS-URL: https://build.opensuse.org/request/show/82062
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libmicro?expand=0&rev=12
This commit is contained in:
Sascha Peilicke 2011-09-14 12:57:29 +00:00 committed by Git OBS Bridge
parent acad48cd04
commit a3e2eb23ec
3 changed files with 37 additions and 30 deletions

13
fix-link.diff Normal file
View File

@ -0,0 +1,13 @@
Index: libmicro-0.4.0/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
@@ -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
- $(CC) -o tattle $(CFLAGS) -I. ../tattle.c libmicro.a -lrt -lm
+ $(CC) -o tattle $(CFLAGS) -I. ../tattle.c libmicro.a -lrt -lm -lpthread
$(ELIDED_BENCHMARKS): ../elided.c
$(CC) -o $(@) ../elided.c

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Wed Sep 14 07:49:59 UTC 2011 - coolo@suse.com
- do not build ctcs for 12.0+
-------------------------------------------------------------------
Sat Sep 10 07:56:02 UTC 2011 - coolo@suse.com
- fix build with newer ld
-------------------------------------------------------------------
Fri Jun 19 10:35:46 CEST 2009 - coolo@novell.com

View File

@ -1,7 +1,7 @@
#
# spec file for package libmicro (Version 0.4.0)
# spec file for package libmicro
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -31,6 +31,7 @@ Source0: %{name}-%{version}.tar.bz2
Source1: ctcstools-%{version}.tar.bz2
Patch0: find_binary.patch
Patch1: removed_undefined_warning.patch
Patch2: fix-link.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -38,11 +39,7 @@ LibMicro is intended to measure the performance of various system and
library calls. LibMicro was developed by Bart Smaalders and Phil
Harman.
Authors:
--------
Various people from OpenSolaris community
%if %suse_version < 1200
%package ctcs-glue
License: Other uncritical OpenSource License ; CDDL
@ -55,23 +52,16 @@ Requires: libmicro = %{version}
%description ctcs-glue
This package contains the glue for integrating libmicro into the ctcs
testing framework.
Authors:
--------
Patrick Kirsch <pkirsch@suse.de>
%endif
%prep
%setup -a1
%patch0 -p1
%patch1
%patch2 -p1
%build
# This package failed when testing with -Wl,-as-needed being default.
# So we disable it here, if you want to retest, just delete this comment and the line below.
export SUSE_ASNEEDED=0
make
make
%install
mkdir -p $RPM_BUILD_ROOT/usr/lib/libMicro
@ -87,29 +77,23 @@ mkdir -p $RPM_BUILD_ROOT/usr/lib/ctcs2/tools
cp ctcstools/libmicro-run $RPM_BUILD_ROOT/usr/lib/ctcs2/tools
cp ctcstools/libmicro.tcf $RPM_BUILD_ROOT/usr/lib/ctcs2/tcf
%if %suse_version >= 1200
rm -rf $RPM_BUILD_ROOT/usr/lib/ctcs2
%endif
%files
%defattr(-,root,root)
/usr/lib/libMicro
%doc README
%if %suse_version < 1200
%files ctcs-glue
%defattr(-,root,root)
/usr/lib/ctcs2
%endif
%clean
rm -rf $RPM_BUILD_ROOT
%changelog
* Fri Jun 19 2009 coolo@novell.com
- disable as-needed for this package as it fails to build with it
* Fri Jul 04 2008 pkirsch@suse.de
- added libmicro-ctcs-glue package, now the tcf is packaged and
can be run from the SUT without the need of NIS
* Wed May 28 2008 pkirsch@suse.de
- removed warning for bnc#394556,
thanks to David Binderman
* Mon Mar 17 2008 yxu@suse.de
- retrieve the essential test executing file: bench.sh
- clarify the path for binary in bench.sh
* Fri Jul 13 2007 pkirsch@suse.de
- initial package