summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2011-05-09 15:07:22 +0000
committerJustin Lecher <jlec@gentoo.org>2011-05-09 15:07:22 +0000
commit9f42e2b8758b246ae838e8919736c654b204a255 (patch)
tree9703e583ff87daaa8a6f12470c9f79e40a443350
parentVersion bump. (diff)
downloadgentoo-2-9f42e2b8758b246ae838e8919736c654b204a255.tar.gz
gentoo-2-9f42e2b8758b246ae838e8919736c654b204a255.tar.bz2
gentoo-2-9f42e2b8758b246ae838e8919736c654b204a255.zip
Do not test during installation patch
(Portage version: 2.2.0_alpha32/cvs/Linux x86_64)
-rw-r--r--sci-libs/neartree/ChangeLog6
-rw-r--r--sci-libs/neartree/files/2.3.2-notest.patch22
-rw-r--r--sci-libs/neartree/neartree-2.3.2.ebuild5
3 files changed, 30 insertions, 3 deletions
diff --git a/sci-libs/neartree/ChangeLog b/sci-libs/neartree/ChangeLog
index 05f1eb8394ab..63d1a7bd09ec 100644
--- a/sci-libs/neartree/ChangeLog
+++ b/sci-libs/neartree/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-libs/neartree
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/neartree/ChangeLog,v 1.11 2011/05/05 16:17:48 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/neartree/ChangeLog,v 1.12 2011/05/09 15:07:22 jlec Exp $
+
+ 09 May 2011; Justin Lecher <jlec@gentoo.org> +files/2.3.2-notest.patch,
+ neartree-2.3.2.ebuild:
+ Do not test during installation patch
*neartree-2.3.2 (05 May 2011)
diff --git a/sci-libs/neartree/files/2.3.2-notest.patch b/sci-libs/neartree/files/2.3.2-notest.patch
new file mode 100644
index 000000000000..f49d1d7edad7
--- /dev/null
+++ b/sci-libs/neartree/files/2.3.2-notest.patch
@@ -0,0 +1,22 @@
+ Makefile | 8 --------
+ 1 files changed, 0 insertions(+), 8 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 2a5c626..cab4102 100644
+--- a/Makefile
++++ b/Makefile
+@@ -238,14 +238,6 @@ install: all $(INSTALL_PREFIX) $(INSTALL_PREFIX)/lib $(INSTALL_PREFIX)/include
+ chmod 644 $(INSTALL_PREFIX)/include/CNearTree.h
+ chmod 644 $(INSTALL_PREFIX)/include/rhrand.h
+ chmod 644 $(INSTALL_PREFIX)/include/triple.h
+- echo "Testing final install dynamic"
+- $(BUILD_COMMAND_DYNAMIC) $(INCLUDES) $(EXAMPLES)/CNearTreeTest.c \
+- -L$(INSTALL_PREFIX)/lib -lCNearTree $(CLIBRARIES) -o $(BIN)/CNearTreeTest_dynamic
+- $(BIN)/CNearTreeTest_dynamic
+- echo "Testing final install static"
+- $(BUILD_COMMAND_STATIC) $(INCLUDES) $(EXAMPLES)/CNearTreeTest.c \
+- -L$(INSTALL_PREFIX)/lib -lCNearTree $(CLIBRARIES) -o $(BIN)/CNearTreeTest_static
+- $(BIN)/CNearTreeTest_static
+
+
+
diff --git a/sci-libs/neartree/neartree-2.3.2.ebuild b/sci-libs/neartree/neartree-2.3.2.ebuild
index de8084d7a787..5ea35609b8a8 100644
--- a/sci-libs/neartree/neartree-2.3.2.ebuild
+++ b/sci-libs/neartree/neartree-2.3.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/neartree/neartree-2.3.2.ebuild,v 1.1 2011/05/05 16:17:48 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/neartree/neartree-2.3.2.ebuild,v 1.2 2011/05/09 15:07:22 jlec Exp $
EAPI=4
@@ -26,7 +26,8 @@ S="${WORKDIR}"/${MY_P}
src_prepare() {
epatch \
"${FILESDIR}"/2.1.4-test.patch \
- "${FILESDIR}"/${PV}-gentoo.patch
+ "${FILESDIR}"/${PV}-gentoo.patch \
+ "${FILESDIR}"/${PV}-notest.patch
sed \
-e "s:GENTOOLIBDIR:$(get_libdir):g" \