diff options
author | Lars Wendler <polynomial-c@gentoo.org> | 2014-10-06 13:10:31 +0000 |
---|---|---|
committer | Lars Wendler <polynomial-c@gentoo.org> | 2014-10-06 13:10:31 +0000 |
commit | 959d524dfa3e79e316570dc0cf3698b98fb65807 (patch) | |
tree | cd8fabdb859f1a61606e1e20b9cd5b55c9bbbfb6 /sys-process | |
parent | Remove me from metadata.xml (diff) | |
download | gentoo-2-959d524dfa3e79e316570dc0cf3698b98fb65807.tar.gz gentoo-2-959d524dfa3e79e316570dc0cf3698b98fb65807.tar.bz2 gentoo-2-959d524dfa3e79e316570dc0cf3698b98fb65807.zip |
Version bump. Removed old
(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
Diffstat (limited to 'sys-process')
-rw-r--r-- | sys-process/numactl/ChangeLog | 9 | ||||
-rw-r--r-- | sys-process/numactl/files/numactl-2.0.7-static_libs.patch | 79 | ||||
-rw-r--r-- | sys-process/numactl/numactl-2.0.10.ebuild (renamed from sys-process/numactl/numactl-2.0.8-r1.ebuild) | 34 | ||||
-rw-r--r-- | sys-process/numactl/numactl-2.0.7-r2.ebuild | 50 |
4 files changed, 18 insertions, 154 deletions
diff --git a/sys-process/numactl/ChangeLog b/sys-process/numactl/ChangeLog index e604a421a8c7..1de54419718a 100644 --- a/sys-process/numactl/ChangeLog +++ b/sys-process/numactl/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-process/numactl # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-process/numactl/ChangeLog,v 1.35 2014/06/25 17:46:25 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-process/numactl/ChangeLog,v 1.36 2014/10/06 13:10:31 polynomial-c Exp $ + +*numactl-2.0.10 (06 Oct 2014) + + 06 Oct 2014; Lars Wendler <polynomial-c@gentoo.org> -numactl-2.0.7-r2.ebuild, + -numactl-2.0.8-r1.ebuild, +numactl-2.0.10.ebuild, + -files/numactl-2.0.7-static_libs.patch: + Version bump. Removed old. 25 Jun 2014; Mike Frysinger <vapier@gentoo.org> numactl-2.0.9.ebuild: Explicitly mask arm platforms. diff --git a/sys-process/numactl/files/numactl-2.0.7-static_libs.patch b/sys-process/numactl/files/numactl-2.0.7-static_libs.patch deleted file mode 100644 index 27bd9b61ab9d..000000000000 --- a/sys-process/numactl/files/numactl-2.0.7-static_libs.patch +++ /dev/null @@ -1,79 +0,0 @@ -Build static libs without -fPIC and only if BUILD_STATIC=yes - -https://bugs.gentoo.org/show_bug.cgi?id=379849 - -Patch written by Kacper Kowalik <xarthisius@gentoo.org> ---- a/Makefile -+++ b/Makefile -@@ -7,6 +7,8 @@ - # for compatibility with old releases - CFLAGS += ${OPT_CFLAGS} - override CFLAGS += -I. -+# build static libraries by default -+BUILD_STATIC ?= yes - - # find out if compiler supports __thread - THREAD_SUPPORT := $(shell if $(CC) $(CFLAGS) threadtest.c -o threadtest \ -@@ -24,6 +26,7 @@ - - CLEANFILES := numactl.o libnuma.o numactl numademo numademo.o distance.o \ - memhog libnuma.so libnuma.so.1 numamon numamon.o syscall.o bitops.o \ -+ distance.pic.o libnuma.pic.o syscall.pic.o \ - memhog.o util.o stream_main.o stream_lib.o shm.o stream clearcache.o \ - test/pagesize test/tshared test/mynode.o test/tshared.o mt.o empty.o empty.c \ - test/mynode test/ftok test/prefered test/randmap \ -@@ -40,10 +43,15 @@ - libdir := ${prefix}/$(shell ./getlibdir) - docdir := ${prefix}/share/doc - -+NUMA_LIBS = libnuma.so -+ifeq ($(BUILD_STATIC),yes) -+NUMA_LIBS+= libnuma.a -+endif -+ - all: numactl migratepages migspeed libnuma.so numademo numamon memhog \ - test/tshared stream test/mynode test/pagesize test/ftok test/prefered \ - test/randmap test/nodemap test/distance test/tbitmap test/move_pages \ -- test/mbind_mig_pages test/migrate_pages test/realloc_test libnuma.a -+ test/mbind_mig_pages test/migrate_pages test/realloc_test ${NUMA_LIBS} - - numactl: numactl.o util.o shm.o bitops.o libnuma.so - -@@ -81,13 +89,14 @@ - - libnuma.so.1: versions.ldscript - --libnuma.so.1: libnuma.o syscall.o distance.o -+libnuma.so.1: libnuma.pic.o syscall.pic.o distance.pic.o - ${CC} ${LDFLAGS} -shared -Wl,-soname=libnuma.so.1 -Wl,--version-script,versions.ldscript -Wl,-init,numa_init -Wl,-fini,numa_fini -o libnuma.so.1 $(filter-out versions.ldscript,$^) - - libnuma.so: libnuma.so.1 - ln -sf libnuma.so.1 libnuma.so - --libnuma.o : CFLAGS += -fPIC -+%.pic.o: %.c -+ ${CC} -fPIC ${CPPFLAGS} ${CFLAGS} -c $< -o $@ - - AR ?= ar - RANLIB ?= ranlib -@@ -95,10 +104,6 @@ - $(AR) rc $@ $^ - $(RANLIB) $@ - --distance.o : CFLAGS += -fPIC -- --syscall.o : CFLAGS += -fPIC -- - test/tshared: test/tshared.o libnuma.so - - test/mynode: test/mynode.o libnuma.so -@@ -143,7 +148,9 @@ - mkdir -p ${libdir} - install -m 0755 libnuma.so.1 ${libdir} - cd ${libdir} ; ln -sf libnuma.so.1 libnuma.so -+ifeq ($(BUILD_STATIC),yes) - install -m 0644 libnuma.a ${libdir} -+endif - mkdir -p ${prefix}/include - install -m 0644 numa.h numaif.h numacompat1.h ${prefix}/include - install -m 0755 numastat ${prefix}/bin diff --git a/sys-process/numactl/numactl-2.0.8-r1.ebuild b/sys-process/numactl/numactl-2.0.10.ebuild index 1633f0496608..d326152f39af 100644 --- a/sys-process/numactl/numactl-2.0.8-r1.ebuild +++ b/sys-process/numactl/numactl-2.0.10.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-process/numactl/numactl-2.0.8-r1.ebuild,v 1.1 2013/04/20 04:15:52 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-process/numactl/numactl-2.0.10.ebuild,v 1.1 2014/10/06 13:10:31 polynomial-c Exp $ EAPI="4" -inherit eutils toolchain-funcs multilib +inherit autotools eutils toolchain-funcs multilib DESCRIPTION="Utilities and libraries for NUMA systems" HOMEPAGE="http://oss.sgi.com/projects/libnuma/" @@ -12,42 +12,28 @@ SRC_URI="ftp://oss.sgi.com/www/projects/libnuma/download/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux" -IUSE="static-libs" +# ARM lacks the __NR_migrate_pages syscall. +KEYWORDS="~amd64 -arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux" +IUSE="" src_prepare() { - echo "printf $(get_libdir)" > getlibdir - epatch "${FILESDIR}"/${PN}-2.0.8-static_libs.patch + eautoreconf epatch "${FILESDIR}"/${PN}-2.0.8-cpuid-pic.patch #456238 - rm numastat || die #466108 -} - -src_compile() { - emake \ - AR="$(tc-getAR)" \ - CC="$(tc-getCC)" \ - RANLIB="$(tc-getRANLIB)" \ - CFLAGS="${CFLAGS}" \ - BENCH_CFLAGS="" \ - THREAD_SUPPORT=$(tc-has-tls && echo yes || echo no) \ - BUILD_STATIC=$(usex static-libs) } src_test() { if [ -d /sys/devices/system/node ]; then einfo "The only generically safe test is regress2." einfo "The other test cases require 2 NUMA nodes." - cd test - ./regress2 || die + emake regress2 else ewarn "You do not have baseline NUMA support in your kernel, skipping tests." fi } src_install() { - emake install prefix="${ED}/usr" BUILD_STATIC=$(usex static-libs) + emake DESTDIR="${ED}" install # delete man pages provided by the man-pages package #238805 - rm -rf "${ED}"/usr/share/man/man[25] - doman *.8 # makefile doesnt get them all + rm -r "${ED}"/usr/share/man/man[25] || die dodoc README TODO CHANGES DESIGN } diff --git a/sys-process/numactl/numactl-2.0.7-r2.ebuild b/sys-process/numactl/numactl-2.0.7-r2.ebuild deleted file mode 100644 index 61991c942ecb..000000000000 --- a/sys-process/numactl/numactl-2.0.7-r2.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-process/numactl/numactl-2.0.7-r2.ebuild,v 1.5 2013/02/23 22:05:06 ago Exp $ - -EAPI="4" - -inherit eutils toolchain-funcs multilib - -DESCRIPTION="Utilities and libraries for NUMA systems" -HOMEPAGE="http://oss.sgi.com/projects/libnuma/" -SRC_URI="ftp://oss.sgi.com/www/projects/libnuma/download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux" -IUSE="perl static-libs" - -RDEPEND="perl? ( dev-lang/perl )" - -src_prepare() { - echo "printf $(get_libdir)" > getlibdir - epatch "${FILESDIR}"/${P}-static_libs.patch -} - -src_compile() { - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" BENCH_CFLAGS="" \ - BUILD_STATIC=$(usex static-libs) -} - -src_test() { - if [ -d /sys/devices/system/node ]; then - einfo "The only generically safe test is regress2." - einfo "The other test cases require 2 NUMA nodes." - cd test - ./regress2 || die "regress2 failed!" - else - ewarn "You do not have baseline NUMA support in your kernel, skipping tests." - fi -} - -src_install() { - emake install prefix="${ED}/usr" BUILD_STATIC=$(usex static-libs) - # delete man pages provided by the man-pages package #238805 - rm -rf "${ED}"/usr/share/man/man[25] - doman *.8 # makefile doesnt get them all - dodoc README TODO CHANGES DESIGN - if ! use perl ; then - rm "${ED}"/usr/bin/numastat "${ED}"/usr/share/man/man8/numastat.8 || die - fi -} |