public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "David Seifert" <soap@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/files/, sci-mathematics/octave/
Date: Sun, 11 Sep 2016 21:58:39 +0000 (UTC)	[thread overview]
Message-ID: <1473631111.8070e24f0d096ad0c4df319f87f6550bd4ee7388.soap@gentoo> (raw)

commit:     8070e24f0d096ad0c4df319f87f6550bd4ee7388
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 11 21:58:12 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Sep 11 21:58:31 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8070e24f

sci-mathematics/octave: Remove left-over 'use jit' calls

* https://github.com/gentoo/gentoo/pull/2288

Package-Manager: portage-2.3.0

 sci-mathematics/octave/files/octave-3.8.0-fix-compile.patch | 11 -----------
 sci-mathematics/octave/octave-4.0.0-r1.ebuild               |  2 +-
 sci-mathematics/octave/octave-4.0.0.ebuild                  |  2 +-
 sci-mathematics/octave/octave-4.0.1-r1.ebuild               |  2 +-
 sci-mathematics/octave/octave-4.0.1.ebuild                  |  2 +-
 sci-mathematics/octave/octave-4.0.2-r2.ebuild               |  2 +-
 sci-mathematics/octave/octave-4.0.3.ebuild                  |  2 +-
 7 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/sci-mathematics/octave/files/octave-3.8.0-fix-compile.patch b/sci-mathematics/octave/files/octave-3.8.0-fix-compile.patch
deleted file mode 100644
index 72931ee..00000000
--- a/sci-mathematics/octave/files/octave-3.8.0-fix-compile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- octave-3.8.0-orig/libinterp/corefcn/jit-typeinfo.cc	2013-12-28 08:57:41.000000000 +1100
-+++ octave-3.8.0/libinterp/corefcn/jit-typeinfo.cc	2014-02-14 15:45:47.388031654 +1100
-@@ -872,7 +872,7 @@
- jit_operation::to_idx (const std::vector<jit_type*>& types) const
- {
-   octave_idx_type numel = types.size ();
--  numel = std::max (2, numel);
-+  numel = std::max (static_cast<octave_idx_type>(2), numel);
- 
-   Array<octave_idx_type> idx (dim_vector (1, numel));
-   for (octave_idx_type i = 0; i < static_cast<octave_idx_type> (types.size ());

diff --git a/sci-mathematics/octave/octave-4.0.0-r1.ebuild b/sci-mathematics/octave/octave-4.0.0-r1.ebuild
index 52f52e8..d3b1bf3 100644
--- a/sci-mathematics/octave/octave-4.0.0-r1.ebuild
+++ b/sci-mathematics/octave/octave-4.0.0-r1.ebuild
@@ -147,7 +147,7 @@ src_configure() {
 
 src_compile() {
 	emake
-	if use java || use jit ; then
+	if use java; then
 		pax-mark m "${S}/src/.libs/octave-cli"
 	fi
 }

diff --git a/sci-mathematics/octave/octave-4.0.0.ebuild b/sci-mathematics/octave/octave-4.0.0.ebuild
index d846668..813c601 100644
--- a/sci-mathematics/octave/octave-4.0.0.ebuild
+++ b/sci-mathematics/octave/octave-4.0.0.ebuild
@@ -142,7 +142,7 @@ src_configure() {
 
 src_compile() {
 	emake
-	if use java || use jit ; then
+	if use java; then
 		pax-mark m "${S}/src/.libs/octave-cli"
 	fi
 }

diff --git a/sci-mathematics/octave/octave-4.0.1-r1.ebuild b/sci-mathematics/octave/octave-4.0.1-r1.ebuild
index 666ac67..ab22a98 100644
--- a/sci-mathematics/octave/octave-4.0.1-r1.ebuild
+++ b/sci-mathematics/octave/octave-4.0.1-r1.ebuild
@@ -142,7 +142,7 @@ src_configure() {
 
 src_compile() {
 	emake
-	if use java || use jit ; then
+	if use java; then
 		pax-mark m "${S}/src/.libs/octave-cli"
 	fi
 }

diff --git a/sci-mathematics/octave/octave-4.0.1.ebuild b/sci-mathematics/octave/octave-4.0.1.ebuild
index d846668..813c601 100644
--- a/sci-mathematics/octave/octave-4.0.1.ebuild
+++ b/sci-mathematics/octave/octave-4.0.1.ebuild
@@ -142,7 +142,7 @@ src_configure() {
 
 src_compile() {
 	emake
-	if use java || use jit ; then
+	if use java; then
 		pax-mark m "${S}/src/.libs/octave-cli"
 	fi
 }

diff --git a/sci-mathematics/octave/octave-4.0.2-r2.ebuild b/sci-mathematics/octave/octave-4.0.2-r2.ebuild
index 666ac67..ab22a98 100644
--- a/sci-mathematics/octave/octave-4.0.2-r2.ebuild
+++ b/sci-mathematics/octave/octave-4.0.2-r2.ebuild
@@ -142,7 +142,7 @@ src_configure() {
 
 src_compile() {
 	emake
-	if use java || use jit ; then
+	if use java; then
 		pax-mark m "${S}/src/.libs/octave-cli"
 	fi
 }

diff --git a/sci-mathematics/octave/octave-4.0.3.ebuild b/sci-mathematics/octave/octave-4.0.3.ebuild
index 117d917..408fc9e 100644
--- a/sci-mathematics/octave/octave-4.0.3.ebuild
+++ b/sci-mathematics/octave/octave-4.0.3.ebuild
@@ -144,7 +144,7 @@ src_configure() {
 
 src_compile() {
 	default
-	if use java || use jit ; then
+	if use java; then
 		pax-mark m "${S}/src/.libs/octave-cli"
 	fi
 }


             reply	other threads:[~2016-09-11 21:58 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-09-11 21:58 David Seifert [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-01-25 13:27 [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/files/, sci-mathematics/octave/ Andreas Sturmlechner
2024-03-15 10:08 Andreas Sturmlechner
2022-11-23 21:18 Andreas Sturmlechner
2022-11-15  4:58 Sam James
2022-05-05  0:11 Sam James
2018-07-03 12:47 Mark Wright
2017-10-08 16:43 Andreas Sturmlechner
2017-06-11 21:44 David Seifert
2016-11-20 20:38 David Seifert
2016-09-24 12:44 David Seifert
2016-06-05 11:47 Michał Górny

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1473631111.8070e24f0d096ad0c4df319f87f6550bd4ee7388.soap@gentoo \
    --to=soap@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox