diff options
| author | Theo Chatzimichos <tampakrap@gentoo.org> | 2009-08-28 01:53:00 +0300 |
|---|---|---|
| committer | Theo Chatzimichos <tampakrap@gentoo.org> | 2009-08-28 01:53:00 +0300 |
| commit | 45ce86f87dfe217ff012079473ae17d508d0dc87 (patch) | |
| tree | 89547238e8dedcf8ff9fa1b1fbb8d3398278f722 /dev-util | |
| parent | 7be8c47ba6ed6b40251f301d00d1e66f1d661956 (diff) | |
| download | kde-45ce86f87dfe217ff012079473ae17d508d0dc87.tar.gz kde-45ce86f87dfe217ff012079473ae17d508d0dc87.tar.bz2 kde-45ce86f87dfe217ff012079473ae17d508d0dc87.zip | |
[dev-util/krazy2] fix multilib issues (only the cmake part), needs more work
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/krazy2/Manifest | 3 | ||||
| -rw-r--r-- | dev-util/krazy2/files/multilib.patch | 13 | ||||
| -rw-r--r-- | dev-util/krazy2/krazy2-9999.ebuild | 33 |
3 files changed, 33 insertions, 16 deletions
diff --git a/dev-util/krazy2/Manifest b/dev-util/krazy2/Manifest index 4ca4f09aa5e..ae24f825c8c 100644 --- a/dev-util/krazy2/Manifest +++ b/dev-util/krazy2/Manifest @@ -1,3 +1,4 @@ AUX install.sh.patch 682 RMD160 d769cda583cb6ccccc61e9d04b2b28b089044e82 SHA1 82f85c35262278d3cff6f1098466b21432278239 SHA256 502a2bb517f74b77fb48aa96d381a9e519dabac8ad8c02992065ecc29159fb5c -EBUILD krazy2-9999.ebuild 1377 RMD160 904f0884463d3d3ec936072d536944f28f8a6870 SHA1 4f8af08b99545822efcb90381843322366f0f740 SHA256 4fbfe64ff623f8a83cfc6c5cf728e4ffa9c5d518c587cdfbdea502c57bb59ce2 +AUX multilib.patch 568 RMD160 405ffcd847464f3067c722619bb37548aa8e1e34 SHA1 72dfaef0fb5dbdfa7218d94a3cfedb0d9f897cf3 SHA256 3eda473e507236f3deb387f5a53c491f11546b20f41b24c5a7a1927e16fcaef7 +EBUILD krazy2-9999.ebuild 1725 RMD160 ed7ce35069867b31654f72c6da9da033268e6ade SHA1 fb6101d880a3ab941ec72d86590915e18b041a87 SHA256 d1f9be4aec6e3168149163d0e23e2834ca3da4205d1b5a6326a6261ea144037e MISC metadata.xml 253 RMD160 6f3b635ef1f334259f2a01981e9d7002f7dc0228 SHA1 3e6ea98753ec98896382980588708246940da86a SHA256 229135009db5d9ed373cccf9d1b7888f9b52cb840675141bc113f4e413a98056 diff --git a/dev-util/krazy2/files/multilib.patch b/dev-util/krazy2/files/multilib.patch new file mode 100644 index 00000000000..2900caaa559 --- /dev/null +++ b/dev-util/krazy2/files/multilib.patch @@ -0,0 +1,13 @@ +Index: CMakeLists.txt +=================================================================== +--- cppchecks/CMakeLists.txt (revision 1016456) ++++ cppchecks/CMakeLists.txt (working copy) +@@ -6,7 +6,7 @@ + set(QT_MIN_VERSION "4.5.0") + find_package(Qt4 REQUIRED) + +-set(CMAKE_INSTALL_RPATH ${CMAKE_PREFIX_PATH}/lib) ++set(CMAKE_INSTALL_RPATH ${CMAKE_PREFIX_PATH}/lib${LIB_SUFFIX}) + check_cxx_compiler_flag(-fvisibility=hidden __KRAZY_HAVE_GCC_VISIBILITY) + set( __KRAZY_HAVE_GCC_VISIBILITY ${__KDE_HAVE_GCC_VISIBILITY} CACHE BOOL "GCC support for hidden visibility") +
\ No newline at end of file diff --git a/dev-util/krazy2/krazy2-9999.ebuild b/dev-util/krazy2/krazy2-9999.ebuild index e1e0de624c7..11b72f2186a 100644 --- a/dev-util/krazy2/krazy2-9999.ebuild +++ b/dev-util/krazy2/krazy2-9999.ebuild @@ -26,44 +26,47 @@ RDEPEND="${DEPEND} dev-util/desktop-file-utils " -PATCHES=( "${FILESDIR}/install.sh.patch" ) +#PATCHES=( "${FILESDIR}/install.sh.patch" +# "${FILESDIR}/multilib.patch" ) -CMAKE_IN_SOURCE_BUILD=1 +CMAKE_USE_DIR="${S}/cppchecks" src_unpack() { subversion_src_unpack } src_prepare() { + epatch "${FILESDIR}/install.sh.patch" + epatch "${FILESDIR}/multilib.patch" + sed -i -e 's/+= ordered/+= ordered nostrip/' \ src/src.pro || die "failed to apply nostrip" + + sed -i "s:$TOP/lib:$TOP/$(get_libdir):" install.sh || die "sed failed" + + sed -i "s:lib\$(LIBSUFFIX):$(get_libdir):" src/passbyvalue/passbyvalue.pro || die "sed failed" base_src_prepare } src_configure() { - cd cppchecks - cmake -DCMAKE_INSTALL_PREFIX="/usr" . - #cmake-utils_src_configure - cd ../src + cmake-utils_src_configure + cd src eqmake4 src.pro - cd .. } src_compile() { - cd cppchecks - emake "$@" || die "Make failed!" - cd ../src - emake "$@" || die "Make failed!" - cd .. + cmake-utils_src_compile + cd src + emake "$@" || die "2nd Make failed!" } src_install() { dodoc README TODO || die "dodoc failed" - cd cppchecks - emake install DESTDIR="${D}" || die "Make cppchecks install failed" - cd ../src + cmake-utils_src_install + + cd src emake install INSTALL_ROOT="${D}/usr" || die "Make src install failed" cd .. |