diff options
| author |   Matthew Schultz (mschultz) <mattsch@gmail.com> | 2011-10-13 19:35:29 +0000 |
|---|---|---|
| committer | Matthew Schultz (mschultz) <mattsch@gmail.com> | 2011-10-13 19:35:29 +0000 |
| commit | 34246d7012a36575bce4d93fa17d1717ffdac9f3 (patch) | |
| tree | f253f400ccd5d09f707af0ab63eed277ffe30eea /dev-libs/librets | |
| parent | app-crypt/yyyRSA: New Ebuild for bug 386971 thanks to binki and jlec for the ... (diff) | |
| download | sunrise-reviewed-34246d7012a36575bce4d93fa17d1717ffdac9f3.tar.gz sunrise-reviewed-34246d7012a36575bce4d93fa17d1717ffdac9f3.tar.bz2 sunrise-reviewed-34246d7012a36575bce4d93fa17d1717ffdac9f3.zip | |
dev-libs/librets: Fixed building and linking bug with boost.
svn path=/sunrise/; revision=12461
Diffstat (limited to 'dev-libs/librets')
| -rw-r--r-- | dev-libs/librets/ChangeLog | 4 | ||||
| -rw-r--r-- | dev-libs/librets/Manifest | 4 | ||||
| -rw-r--r-- | dev-libs/librets/librets-1.5.2-r3.ebuild (renamed from dev-libs/librets/librets-1.5.2-r2.ebuild) | 15 |
3 files changed, 15 insertions, 8 deletions
diff --git a/dev-libs/librets/ChangeLog b/dev-libs/librets/ChangeLog index d2da230da..245b69a9a 100644 --- a/dev-libs/librets/ChangeLog +++ b/dev-libs/librets/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 13 Oct 2011; Matthew Schultz (mschultz) <mattsch@gmail.com> + -librets-1.5.2-r2.ebuild, +librets-1.5.2-r3.ebuild: + Fixed building and linking bug with boost. + 24 Aug 2011; Matthew Schultz (mschultz) <mattsch@gmail.com> -librets-1.5.2-r1.ebuild, +librets-1.5.2-r2.ebuild: Fixed problem with boost dependency so that it builds with the latest diff --git a/dev-libs/librets/Manifest b/dev-libs/librets/Manifest index 4650f9b68..5b925cb63 100644 --- a/dev-libs/librets/Manifest +++ b/dev-libs/librets/Manifest @@ -5,6 +5,6 @@ AUX perl.mk.patch 1088 RMD160 7054d8bb712814434e3978c69c36ff267c102a5a SHA1 660f AUX python.mk.patch 501 RMD160 611578ad08ee095d4364e538e6b69e4f5727d401 SHA1 803f4678b974d87008e772115d09034fb31bb8fe SHA256 8ba69a842499dcfeaaba25ac8fb9f4723d7243293b7fba7734510bca47eb89cb AUX swig.m4.patch 462 RMD160 d0e5b1f14b78d514a7bcee9e052e433645a02162 SHA1 6003ea54742da9aff9b9a320643819ad34f1cf7b SHA256 aa217a9442f967196027ef589e114eeca2d5583506b69eeae72dd9107f8594d1 DIST librets-1.5.2.tar.gz 1157546 RMD160 154a4fff9bbf994b739a1d30b3bb5eed9ecdd5d3 SHA1 cc856a41bc8120865937d199c918542bf3d82a95 SHA256 5d9c32eefd1a20b90c58ef117010768d8161c56ee0138efa4dd8b1ab82a433ce -EBUILD librets-1.5.2-r2.ebuild 7771 RMD160 bc55c1e6138076fbbbd9dd6073fb3beac668902f SHA1 b5c579863a1bcc3cddad8b4a6f8d7f18172830a1 SHA256 f53916a88b68329afac30d16dc8e0f078492064d7596a67ea889a96943e1137c -MISC ChangeLog 1931 RMD160 b52d9985fc08ca2cf5added50f78f8b23e16e498 SHA1 0abcee59369f6b033247977134783668d6e78556 SHA256 9af8d93bac06e331e4ed44d54432f9bab84184de5f747e7b0d990c5dd237219f +EBUILD librets-1.5.2-r3.ebuild 8011 RMD160 c3254a7b0d82e8cff727506902c1f8931c52f543 SHA1 4902f7126aa2a5545dd5d1573701325aa04b3452 SHA256 7617d2d515c92dca2ae415180aa02ef54372b54fdf0eaafd734f628262b7ee37 +MISC ChangeLog 2093 RMD160 d3d5113dcf0686f9b9cb0e3c20708f010dc8121f SHA1 8c905e4d42e8f0aeb23fb099fe505a73e47f6906 SHA256 13a585976fd656e1109516d675b6c9017eff42442b2d7f3baca42f7970588880 MISC metadata.xml 830 RMD160 50a58e8cd7c132469fd2b693be4eb9bda93136f1 SHA1 83ab36379a556b91023d0a2b5f15fb2109f4eb3c SHA256 05f6e383376e2d49d18dfd40738f55ba069dee9f697829619ba9a3d0e6693748 diff --git a/dev-libs/librets/librets-1.5.2-r2.ebuild b/dev-libs/librets/librets-1.5.2-r3.ebuild index 812ae9a71..93f572731 100644 --- a/dev-libs/librets/librets-1.5.2-r2.ebuild +++ b/dev-libs/librets/librets-1.5.2-r3.ebuild @@ -98,6 +98,14 @@ src_prepare() { epatch "${FILESDIR}"/swig.m4.patch # Patch to allow dotnet binding to build and set snk key file epatch "${FILESDIR}"/dotnet.patch + local myboostpackage=$(best_version "<dev-libs/boost-1.46") + local myboostpackagever=${myboostpackage/*boost-/} + local myboostver=$(get_version_component_range 1-2 ${myboostpackagever}) + local myboostslot=$(replace_version_separator 1 _ ${myboostver}) + sed -i -e "s|boost_include_dir=\"include\"|boost_include_dir=\"include/boost-${myboostslot}\"|g" project/build/ac-macros/boost.m4 + sed -i -e "s|/lib/libboost|/lib/boost-${myboostslot}/liboost|g" project/build/ac-macros/boost.m4 + sed -i -e "s|-L\${BOOST_PREFIX}/lib|-L\${BOOST_PREFIX}/lib/boost-${myboostslot}|g" project/build/ac-macros/boost.m4 + einfo "Using boost version ${myboostver}" eautoreconf use php && php-ext-source-r2_src_prepare } @@ -161,12 +169,7 @@ src_compile() { _php-replace_config_with_selected_config ${myphpfirstslot} ${myphpconfig} myphpconfig="${PHPCONFIG}" fi - local myboostpackage=$(best_version "<dev-libs/boost-1.46") - local myboostpackagever=${myboostpackage/*boost-/} - local myboostver=$(get_version_component_range 1-2 ${myboostpackagever}) - local myboostslot=$(replace_version_separator 1 _ ${myboostver}) - einfo "Using boost version ${myboostver}" - emake BOOST_CFLAGS="-I/usr/include/boost-${myboostslot}" BOOST_LIBS="-L/usr/$(get_libdir)/boost-${myboostslot}" || die "emake failed" + emake || die "emake failed" if use php; then # Move the current slotted build of php to another dir so other slots can be built _php-move_swig_build_to_modules_dir "${WORKDIR}/${myphpfirstslot}" |