[gentoo-commits] proj/kde:master commit in: dev-util/cmake/files/, dev-util/cmake/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Chris Reffett" <geekboy72@gmail.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: dev-util/cmake/files/, dev-util/cmake/
Date: Sat, 27 Apr 2013 21:36:20 +0000 (UTC)	[thread overview]
Message-ID: <1367098540.e19d67fa5e29a9c3e2a143dd3a83fc09ae17276c.creffett@gentoo> (raw)

commit:     e19d67fa5e29a9c3e2a143dd3a83fc09ae17276c
Author:     Chris Reffett <creffett <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 27 21:31:45 2013 +0000
Commit:     Chris Reffett <geekboy72 <AT> gmail <DOT> com>
CommitDate: Sat Apr 27 21:35:40 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=e19d67fa

[dev-util/cmake] Version bump, fix FindBoost-python.patch (credit to Arfrever for fix)

Package-Manager: portage-2.2.0_alpha173

---
 ....8.11_rc2-r1.ebuild => cmake-2.8.11_rc3.ebuild} |    0
 .../files/cmake-2.8.11-FindBoost-python.patch      |   52 +++++++++++++-------
 2 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/dev-util/cmake/cmake-2.8.11_rc2-r1.ebuild b/dev-util/cmake/cmake-2.8.11_rc3.ebuild
similarity index 100%
rename from dev-util/cmake/cmake-2.8.11_rc2-r1.ebuild
rename to dev-util/cmake/cmake-2.8.11_rc3.ebuild

diff --git a/dev-util/cmake/files/cmake-2.8.11-FindBoost-python.patch b/dev-util/cmake/files/cmake-2.8.11-FindBoost-python.patch
index b8c580a..b00b4f7 100644
--- a/dev-util/cmake/files/cmake-2.8.11-FindBoost-python.patch
+++ b/dev-util/cmake/files/cmake-2.8.11-FindBoost-python.patch
@@ -1,12 +1,12 @@
---- a/Modules/FindBoost.cmake
-+++ b/Modules/FindBoost.cmake
+--- Modules/FindBoost.cmake
++++ Modules/FindBoost.cmake
 @@ -903,6 +903,11 @@
  
    set( _boost_docstring_release "Boost ${COMPONENT} library (release)")
    set( _boost_docstring_debug   "Boost ${COMPONENT} library (debug)")
 +  if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
-+    # CPython-specific version of _PYTHON_ABI_EXTRACTION_COMMAND variable from python.eclass.
-+    execute_process(COMMAND python -c "import sys; sys.stdout.write('.'.join(str(x) for x in sys.version_info[:2]))" OUTPUT_VARIABLE _python_abi)
++    # Get version of Python.
++    execute_process(COMMAND python -c "import sys; sys.stdout.write('.'.join(str(x) for x in sys.version_info[:2]))" OUTPUT_VARIABLE _python_version)
 +  endif()
 +
  
@@ -18,11 +18,11 @@
      ${Boost_LIB_PREFIX}boost_${COMPONENT} )
 +    if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
 +      list(APPEND _boost_RELEASE_NAMES
-+        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
-+        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
-+        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
-+        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
-+        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi} )
++        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
++        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
++        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
++        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
++        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} )
 +    endif()
    if(_boost_STATIC_RUNTIME_WORKAROUND)
      set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}")
@@ -33,24 +33,40 @@
        ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
 +      if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
 +        list(APPEND _boost_RELEASE_NAMES
-+          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
-+          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}
-+          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
-+          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
++          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
++          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}
++          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
++          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
 +      endif()
    endif()
    if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
       _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_RELEASE_NAMES ${_boost_RELEASE_NAMES})
-@@ -952,6 +972,13 @@
+@@ -945,6 +965,15 @@
+     ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
+     ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}
+     ${Boost_LIB_PREFIX}boost_${COMPONENT} )
++    if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
++      list(APPEND _boost_DEBUG_NAMES
++        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
++        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
++        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
++        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
++        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}
++        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} )
++    endif()
+   if(_boost_STATIC_RUNTIME_WORKAROUND)
+     set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}")
+     list(APPEND _boost_DEBUG_NAMES
+@@ -952,6 +981,13 @@
        ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
        ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
        ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
 +      if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
 +        list(APPEND _boost_DEBUG_NAMES
-+         ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
-+         ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
-+         ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
-+         ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
++          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
++          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
++          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
++          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
 +      endif()
    endif()
    if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")

next             reply	other threads:[~2013-04-27 21:36 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-27 21:36 Chris Reffett [this message]
  -- strict thread matches above, loose matches on Subject: below --
2015-04-01 13:19 [gentoo-commits] proj/kde:master commit in: dev-util/cmake/files/, dev-util/cmake/ Michael Palimaka
2014-07-27 12:24 Johannes Huber
2014-06-19 15:40 Michael Palimaka
2014-06-18 14:45 Michael Palimaka
2014-05-06 12:24 Johannes Huber
2014-02-25 19:23 Michael Palimaka
2013-10-21  3:28 Chris Reffett
2013-10-13 16:27 Johannes Huber
2013-09-11 18:02 Michael Palimaka
2013-09-01 15:00 Michael Palimaka
2013-06-09 12:09 Johannes Huber
2013-04-14 17:57 Michael Palimaka
2013-04-09 19:25 Chris Reffett
2013-03-11 17:27 Michael Palimaka
2013-02-07 16:11 Michael Palimaka
2013-01-10 14:33 Michael Palimaka
2012-11-18 13:45 Michael Palimaka
2012-11-06 13:10 Michael Palimaka
2012-08-19 12:59 Johannes Huber
2012-08-15 13:33 Johannes Huber
2012-05-02 21:13 Johannes Huber
2012-05-01 22:18 Chris Reffett
2012-04-30  9:04 Johannes Huber
2012-04-22 15:04 Chris Reffett
2012-04-22 14:47 Johannes Huber
2012-01-22 16:35 Johannes Huber
2012-01-13  9:00 Johannes Huber
2011-10-15 15:07 Andreas Hüttel
2011-10-13 12:01 Johannes Huber

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:b8c580a dfblob:b00b4f7 )
 OR (
bs:"[gentoo-commits] proj/kde:master commit in: dev-util/cmake/files/, dev-util/cmake/" )
	(help)

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=1367098540.e19d67fa5e29a9c3e2a143dd3a83fc09ae17276c.creffett@gentoo \
    --to=geekboy72@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