summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2012-12-12 18:27:37 +0000
committerJustin Lecher <jlec@gentoo.org>2012-12-12 18:27:37 +0000
commitfd7f873d8dca5e31d00ca8e965be0c6bcc6a63ef (patch)
treee8df074d3cffc6fca669d8cd211bdae7b18bb5a5
parentAdd ~ppc, wrt bug #413125 (diff)
downloadgentoo-2-fd7f873d8dca5e31d00ca8e965be0c6bcc6a63ef.tar.gz
gentoo-2-fd7f873d8dca5e31d00ca8e965be0c6bcc6a63ef.tar.bz2
gentoo-2-fd7f873d8dca5e31d00ca8e965be0c6bcc6a63ef.zip
sci-biology/primer3: Fix buildsystem patch to respect RANLIB, #447026
(Portage version: 2.2.0_alpha147/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)
-rw-r--r--sci-biology/primer3/ChangeLog6
-rw-r--r--sci-biology/primer3/files/primer3-2.3.4-buildsystem.patch15
2 files changed, 17 insertions, 4 deletions
diff --git a/sci-biology/primer3/ChangeLog b/sci-biology/primer3/ChangeLog
index 8448af12eed4..808daff611cc 100644
--- a/sci-biology/primer3/ChangeLog
+++ b/sci-biology/primer3/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-biology/primer3
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/primer3/ChangeLog,v 1.34 2012/12/12 13:10:00 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/primer3/ChangeLog,v 1.35 2012/12/12 18:27:37 jlec Exp $
+
+ 12 Dec 2012; Justin Lecher <jlec@gentoo.org>
+ files/primer3-2.3.4-buildsystem.patch:
+ Fix buildsystem patch to respect RANLIB, #447026
12 Dec 2012; Justin Lecher <jlec@gentoo.org> primer3-2.3.1.ebuild,
primer3-2.3.4.ebuild, metadata.xml:
diff --git a/sci-biology/primer3/files/primer3-2.3.4-buildsystem.patch b/sci-biology/primer3/files/primer3-2.3.4-buildsystem.patch
index 51ab913b48cf..cf47b35af502 100644
--- a/sci-biology/primer3/files/primer3-2.3.4-buildsystem.patch
+++ b/sci-biology/primer3/files/primer3-2.3.4-buildsystem.patch
@@ -1,8 +1,8 @@
- src/Makefile | 59 ++++++++++++++++++++++++++++++-----------------------------
- 1 file changed, 30 insertions(+), 29 deletions(-)
+ src/Makefile | 61 ++++++++++++++++++++++++++++++------------------------------
+ 1 file changed, 31 insertions(+), 30 deletions(-)
diff --git a/src/Makefile b/src/Makefile
-index 607ab45..b23ec23 100644
+index 607ab45..a88adf4 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -52,15 +52,16 @@ TESTOPTS=
@@ -30,6 +30,15 @@ index 607ab45..b23ec23 100644
# Note, for profiling, use
# make O_OPTS='-pg -O0' LDFLAGS='-g -pg'
+@@ -92,7 +93,7 @@ LIBPRIMER3 = libprimer3.a
+ LIBPRIMER3_DYN = libprimer3.so.1.0.0
+ LIBRARIES = $(LIBPRIMER3) $(LIBDPAL) $(LIBTHAL) $(LIBOLIGOTM)
+ DYNLIBS = $(LIBPRIMER3_DYN) $(LIBDPAL_DYN) $(LIBTHAL_DYN) $(LIBOLIGOTM_DYN)
+-RANLIB = ranlib
++RANLIB ?= ranlib
+
+ PRIMER_OBJECTS1=primer3_boulder_main.o\
+ format_output.o\
@@ -127,85 +128,85 @@ $(LIBOLIGOTM): oligotm.o
$(RANLIB) $@