* [gentoo-commits] gentoo-x86 commit in dev-libs/boost: boost-1.37.0-r1.ebuild ChangeLog
@ 2009-04-14 11:44 Tiziano Mueller (dev-zero)
0 siblings, 0 replies; 3+ messages in thread
From: Tiziano Mueller (dev-zero) @ 2009-04-14 11:44 UTC (permalink / raw
To: gentoo-commits
dev-zero 09/04/14 11:44:10
Modified: boost-1.37.0-r1.ebuild ChangeLog
Log:
Correct non-mt symlink creation for debug libs (bug #256697)
(Portage version: 2.1.6.11/cvs/Linux x86_64)
Revision Changes Path
1.2 dev-libs/boost/boost-1.37.0-r1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/boost/boost-1.37.0-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/boost/boost-1.37.0-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/boost/boost-1.37.0-r1.ebuild?r1=1.1&r2=1.2
Index: boost-1.37.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.37.0-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- boost-1.37.0-r1.ebuild 7 Apr 2009 09:43:13 -0000 1.1
+++ boost-1.37.0-r1.ebuild 14 Apr 2009 11:44:10 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.37.0-r1.ebuild,v 1.1 2009/04/07 09:43:13 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.37.0-r1.ebuild,v 1.2 2009/04/14 11:44:10 dev-zero Exp $
EAPI="2"
@@ -259,17 +259,29 @@
# The threading libs obviously always gets the "-mt" (multithreading) tag
# some packages seem to have a problem with it. Creating symlinks...
- for lib in libboost_thread-mt-${MAJOR_PV}{,-debug}{.a,.so} ; do
+ for lib in libboost_thread-mt-${MAJOR_PV}{.a,.so} ; do
dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})"
done
# The same goes for the mpi libs
if use mpi ; then
- for lib in libboost_mpi-mt-${MAJOR_PV}{,-debug}{.a,.so} ; do
+ for lib in libboost_mpi-mt-${MAJOR_PV}{.a,.so} ; do
dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})"
done
fi
+ if use debug ; then
+ for lib in libboost_thread-mt-${MAJOR_PV}-debug{.a,.so} ; do
+ dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})"
+ done
+
+ if use mpi ; then
+ for lib in libboost_mpi-mt-${MAJOR_PV}-debug{.a,.so} ; do
+ dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})"
+ done
+ fi
+ fi
+
# Create a subdirectory with completely unversioned symlinks
# and store the names in the profiles-file for eselect
dodir /usr/$(get_libdir)/boost-${MAJOR_PV}
1.154 dev-libs/boost/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/boost/ChangeLog?rev=1.154&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/boost/ChangeLog?rev=1.154&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/boost/ChangeLog?r1=1.153&r2=1.154
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- ChangeLog 7 Apr 2009 09:43:13 -0000 1.153
+++ ChangeLog 14 Apr 2009 11:44:10 -0000 1.154
@@ -1,6 +1,9 @@
# ChangeLog for dev-libs/boost
# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.153 2009/04/07 09:43:13 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.154 2009/04/14 11:44:10 dev-zero Exp $
+
+ 14 Apr 2009; Tiziano Müller <dev-zero@gentoo.org> boost-1.37.0-r1.ebuild:
+ Correct non-mt symlink creation for debug libs (bug #256697)
*boost-1.37.0-r1 (07 Apr 2009)
*boost-1.36.0-r1 (07 Apr 2009)
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-libs/boost: boost-1.37.0-r1.ebuild ChangeLog
@ 2009-05-28 17:42 Fabian Groffen (grobian)
0 siblings, 0 replies; 3+ messages in thread
From: Fabian Groffen (grobian) @ 2009-05-28 17:42 UTC (permalink / raw
To: gentoo-commits
grobian 09/05/28 17:42:51
Modified: boost-1.37.0-r1.ebuild ChangeLog
Log:
Merged in Darwin support (backport from Prefix), required get_libname here and there
(Portage version: 2.1.6.11/cvs/Linux x86_64)
Revision Changes Path
1.7 dev-libs/boost/boost-1.37.0-r1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/boost/boost-1.37.0-r1.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/boost/boost-1.37.0-r1.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/boost/boost-1.37.0-r1.ebuild?r1=1.6&r2=1.7
Index: boost-1.37.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.37.0-r1.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- boost-1.37.0-r1.ebuild 24 May 2009 05:42:24 -0000 1.6
+++ boost-1.37.0-r1.ebuild 28 May 2009 17:42:51 -0000 1.7
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.37.0-r1.ebuild,v 1.6 2009/05/24 05:42:24 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.37.0-r1.ebuild,v 1.7 2009/05/28 17:42:51 grobian Exp $
EAPI="2"
@@ -88,12 +88,15 @@
epatch \
"${FILESDIR}/remove_toolset_from_targetname.patch" \
- "${FILESDIR}/buildid-fix.patch"
+ "${FILESDIR}/buildid-fix.patch" \
+ "${FILESDIR}"/${P}-darwin-long-double.patch
# This enables building the boost.random library with /dev/urandom support
- if ! use userland_Darwin ; then
+ if [[ -e /dev/urandom ]] ; then
mkdir -p libs/random/build
cp "${FILESDIR}/random-Jamfile" libs/random/build/Jamfile.v2
+ # yeah, we WANT it to work on non-Linux too
+ sed -i -e 's/#ifdef __linux__/#if 1/' libs/random/random_device.cpp || die
fi
}
@@ -103,9 +106,11 @@
local compiler compilerVersion compilerExecutable mpi
if [[ ${CHOST} == *-darwin* ]] ; then
compiler=darwin
- compilerVersion=$(gcc-version)
+ compilerVersion=$(gcc-fullversion)
compilerExecutable=$(tc-getCXX)
- append-ldflags -ldl
+ # we need to add the prefix, and in two cases this exceeds, so prepare
+ # for the largest possible space allocation
+ append-ldflags -Wl,-headerpad_max_install_names
else
compiler=gcc
compilerVersion=$(gcc-version)
@@ -249,7 +254,7 @@
# Remove (unversioned) symlinks
# And check for what we remove to catch bugs
# got a better idea how to do it? tell me!
- for f in $(ls -1 *.{a,so} | grep -v "${MAJOR_PV}") ; do
+ for f in $(ls -1 *{.a,$(get_libname)} | grep -v "${MAJOR_PV}") ; do
if [ ! -h "${f}" ] ; then
eerror "Ups, tried to remove '${f}' which is a a real file instead of a symlink"
die "slotting/naming of the libs broken!"
@@ -259,24 +264,24 @@
# The threading libs obviously always gets the "-mt" (multithreading) tag
# some packages seem to have a problem with it. Creating symlinks...
- for lib in libboost_thread-mt-${MAJOR_PV}{.a,.so} ; do
+ for lib in libboost_thread-mt-${MAJOR_PV}{.a,$(get_libname)} ; do
dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})"
done
# The same goes for the mpi libs
if use mpi ; then
- for lib in libboost_mpi-mt-${MAJOR_PV}{.a,.so} ; do
+ for lib in libboost_mpi-mt-${MAJOR_PV}{.a,$(get_libname)} ; do
dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})"
done
fi
if use debug ; then
- for lib in libboost_thread-mt-${MAJOR_PV}-debug{.a,.so} ; do
+ for lib in libboost_thread-mt-${MAJOR_PV}-debug{.a,$(get_libname)} ; do
dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})"
done
if use mpi ; then
- for lib in libboost_mpi-mt-${MAJOR_PV}-debug{.a,.so} ; do
+ for lib in libboost_mpi-mt-${MAJOR_PV}-debug{.a,$(get_libname)} ; do
dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})"
done
fi
@@ -287,7 +292,7 @@
dodir /usr/$(get_libdir)/boost-${MAJOR_PV}
_add_line "libs=\"" default
- for f in $(ls -1 *.{a,so} | grep -v debug) ; do
+ for f in $(ls -1 *{.a,$(get_libname)} | grep -v debug) ; do
dosym ../${f} /usr/$(get_libdir)/boost-${MAJOR_PV}/${f/-${MAJOR_PV}}
_add_line "/usr/$(get_libdir)/${f}" default
done
@@ -296,7 +301,7 @@
if use debug ; then
_add_line "libs=\"" debug
dodir /usr/$(get_libdir)/boost-${MAJOR_PV}-debug
- for f in $(ls -1 *.{a,so} | grep debug) ; do
+ for f in $(ls -1 *{.a,$(get_libname)} | grep debug) ; do
dosym ../${f} /usr/$(get_libdir)/boost-${MAJOR_PV}-debug/${f/-${MAJOR_PV}-debug}
_add_line "/usr/$(get_libdir)/${f}" debug
done
@@ -334,6 +339,37 @@
fi
use python && python_need_rebuild
+
+ # boost's build system truely sucks for not having a destdir. Because for
+ # this reason we are forced to build with a prefix that includes the
+ # DESTROOT, dynamic libraries on Darwin end messed up, referencing the
+ # DESTROOT instread of the actual EPREFIX. There is no way out of here
+ # but to do it the dirty way of manually setting the right install_names.
+ [[ -z ${ED+set} ]] && local ED=${D%/}${EPREFIX}/
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ einfo "Working around completely broken build-system(tm)"
+ for d in "${ED}"usr/lib/*.dylib ; do
+ if [[ -f ${d} ]] ; then
+ # fix the "soname"
+ ebegin " correcting install_name of ${d#${ED}}"
+ install_name_tool -id "/${d#${D}}" "${d}"
+ eend $?
+ # fix references to other libs
+ refs=$(otool -XL "${d}" | \
+ sed -e '1d' -e 's/^\t//' | \
+ grep "^libboost_" | \
+ cut -f1 -d' ')
+ for r in ${refs} ; do
+ ebegin " correcting reference to ${r}"
+ install_name_tool -change \
+ "${r}" \
+ "${EPREFIX}/usr/lib/${r}" \
+ "${d}"
+ eend $?
+ done
+ fi
+ done
+ fi
}
src_test() {
1.161 dev-libs/boost/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/boost/ChangeLog?rev=1.161&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/boost/ChangeLog?rev=1.161&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/boost/ChangeLog?r1=1.160&r2=1.161
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- ChangeLog 24 May 2009 05:42:24 -0000 1.160
+++ ChangeLog 28 May 2009 17:42:51 -0000 1.161
@@ -1,6 +1,11 @@
# ChangeLog for dev-libs/boost
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.160 2009/05/24 05:42:24 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.161 2009/05/28 17:42:51 grobian Exp $
+
+ 28 May 2009; Fabian Groffen <grobian@gentoo.org>
+ +files/boost-1.37.0-darwin-long-double.patch, boost-1.37.0-r1.ebuild:
+ Merged in Darwin support (backport from Prefix), required get_libname here
+ and there
24 May 2009; Tiziano Müller <dev-zero@gentoo.org> boost-1.36.0-r1.ebuild,
boost-1.37.0-r1.ebuild:
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-libs/boost: boost-1.37.0-r1.ebuild ChangeLog
@ 2009-06-15 18:31 Diego Petteno (flameeyes)
0 siblings, 0 replies; 3+ messages in thread
From: Diego Petteno (flameeyes) @ 2009-06-15 18:31 UTC (permalink / raw
To: gentoo-commits
flameeyes 09/06/15 18:31:33
Modified: boost-1.37.0-r1.ebuild ChangeLog
Log:
When compiling with gcc 4.4, append -fno-strict-aliasing to allow build, see bug #252287. WARNING! This is just a workaround and not a fix, this _will_ cause reduced optimisation of the library. A proper fix _is_ needed.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Revision Changes Path
1.8 dev-libs/boost/boost-1.37.0-r1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/boost/boost-1.37.0-r1.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/boost/boost-1.37.0-r1.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/boost/boost-1.37.0-r1.ebuild?r1=1.7&r2=1.8
Index: boost-1.37.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.37.0-r1.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- boost-1.37.0-r1.ebuild 28 May 2009 17:42:51 -0000 1.7
+++ boost-1.37.0-r1.ebuild 15 Jun 2009 18:31:33 -0000 1.8
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.37.0-r1.ebuild,v 1.7 2009/05/28 17:42:51 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.37.0-r1.ebuild,v 1.8 2009/06/15 18:31:33 flameeyes Exp $
EAPI="2"
@@ -117,6 +117,9 @@
compilerExecutable=$(tc-getCXX)
fi
+ # Temporary workaround for bug #252287
+ [[ $(gcc-version) == "4.4" ]] && append-flags -fno-strict-aliasing
+
use mpi && mpi="using mpi ;"
if use python ; then
1.162 dev-libs/boost/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/boost/ChangeLog?rev=1.162&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/boost/ChangeLog?rev=1.162&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/boost/ChangeLog?r1=1.161&r2=1.162
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- ChangeLog 28 May 2009 17:42:51 -0000 1.161
+++ ChangeLog 15 Jun 2009 18:31:33 -0000 1.162
@@ -1,6 +1,13 @@
# ChangeLog for dev-libs/boost
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.161 2009/05/28 17:42:51 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.162 2009/06/15 18:31:33 flameeyes Exp $
+
+ 15 Jun 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+ boost-1.37.0-r1.ebuild:
+ When compiling with gcc 4.4, append -fno-strict-aliasing to allow build,
+ see bug #252287. WARNING! This is just a workaround and not a fix, this
+ _will_ cause reduced optimisation of the library. A proper fix _is_
+ needed.
28 May 2009; Fabian Groffen <grobian@gentoo.org>
+files/boost-1.37.0-darwin-long-double.patch, boost-1.37.0-r1.ebuild:
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-06-15 18:31 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-06-15 18:31 [gentoo-commits] gentoo-x86 commit in dev-libs/boost: boost-1.37.0-r1.ebuild ChangeLog Diego Petteno (flameeyes)
-- strict thread matches above, loose matches on Subject: below --
2009-05-28 17:42 Fabian Groffen (grobian)
2009-04-14 11:44 Tiziano Mueller (dev-zero)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox