public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Dongxu Li" <dongxuli2011@gmail.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/sci:master commit in: media-gfx/brlcad/files/, media-gfx/brlcad/
Date: Fri, 15 Jul 2011 15:37:40 +0000 (UTC)	[thread overview]
Message-ID: <59e1dc1f059708654ec4b948e0d933a02d47ce58.dongxuli@gentoo> (raw)

commit:     59e1dc1f059708654ec4b948e0d933a02d47ce58
Author:     Dongxu Li <dongxuli2011 <AT> gmail <DOT> com>
AuthorDate: Fri Jul 15 15:37:30 2011 +0000
Commit:     Dongxu Li <dongxuli2011 <AT> gmail <DOT> com>
CommitDate: Fri Jul 15 15:37:30 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=59e1dc1f

media-gfx/brlcad: Fixed a config time error when building

---
 media-gfx/brlcad/brlcad-7.20.2-r1.ebuild         |    4 ++++
 media-gfx/brlcad/files/brlcad-7.20.2-cmake.patch |   19 +++++++++++++++++++
 2 files changed, 23 insertions(+), 0 deletions(-)

diff --git a/media-gfx/brlcad/brlcad-7.20.2-r1.ebuild b/media-gfx/brlcad/brlcad-7.20.2-r1.ebuild
index 4905ca3..066edbc 100644
--- a/media-gfx/brlcad/brlcad-7.20.2-r1.ebuild
+++ b/media-gfx/brlcad/brlcad-7.20.2-r1.ebuild
@@ -43,6 +43,10 @@ DEPEND="${RDEPEND}
 
 BRLCAD_DIR="${EPREFIX}/usr/${PN}"
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}-cmake.patch"
+}
+
 src_configure() {
 		#waiting for upstream to fix itck/itk issues for cmake
 		#have to enable tcl/tk local build, otherwise cmake won't be able to link for

diff --git a/media-gfx/brlcad/files/brlcad-7.20.2-cmake.patch b/media-gfx/brlcad/files/brlcad-7.20.2-cmake.patch
new file mode 100644
index 0000000..7635211
--- /dev/null
+++ b/media-gfx/brlcad/files/brlcad-7.20.2-cmake.patch
@@ -0,0 +1,19 @@
+--- old/CMakeLists.txt	2011-07-14 16:14:18.053187225 -0400
++++ new/CMakeLists.txt  2011-07-14 16:14:39.073507247 -0400
+@@ -1187,14 +1187,14 @@
+ 	SET(PATH_LABELS CMAKE_INSTALL_PREFIX BIN_DIR MAN_DIR CONF_DIR DATA_DIR)
+ 	SET(PATH_LABEL_LENGTH 0)
+ 	FOREACH(path_label ${PATH_LABELS})
+-		STRING(LENGTH ${${path_label}_LABEL} CURRENT_LENGTH)
++		STRING(LENGTH "${${path_label}_LABEL}" CURRENT_LENGTH)
+ 		if (${CURRENT_LENGTH} GREATER ${PATH_LABEL_LENGTH})
+ 			SET(PATH_LABEL_LENGTH ${CURRENT_LENGTH})
+ 		endif()
+ 	ENDFOREACH()
+ 	FOREACH(path_label ${PATH_LABELS})
+ 		SET(CURRENT_LABEL ${${path_label}_LABEL})
+-		STRING(LENGTH ${CURRENT_LABEL} CURRENT_LENGTH)
++		STRING(LENGTH "${CURRENT_LABEL}" CURRENT_LENGTH)
+ 		WHILE(${PATH_LABEL_LENGTH} GREATER ${CURRENT_LENGTH})
+ 			SET(CURRENT_LABEL " ${CURRENT_LABEL}")
+ 			STRING(LENGTH ${CURRENT_LABEL} CURRENT_LENGTH)
\ No newline at end of file



             reply	other threads:[~2011-07-15 15:37 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-07-15 15:37 Dongxu Li [this message]
  -- strict thread matches above, loose matches on Subject: below --
2011-08-10  0:33 [gentoo-commits] proj/sci:master commit in: media-gfx/brlcad/files/, media-gfx/brlcad/ Dongxu Li
2011-09-26 14:42 Dongxu Li
2012-02-05 15:14 Dongxu Li
2012-02-11 17:14 Dongxu Li
2012-03-27 22:06 Dongxu Li
2012-03-29  9:07 Justin Lecher
2022-01-12 11:46 Andrew Ammerlaan

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=59e1dc1f059708654ec4b948e0d933a02d47ce58.dongxuli@gentoo \
    --to=dongxuli2011@gmail.com \
    --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