kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* Fix building with GCC (PR#48388).

Browse source 
* Build long double math libraries on NetBSD and FreeBSD.
* Removed obsolete patches.
This commit is contained in:
adam 2013-11-20 19:17:55 +00:00
parent c8f285ab3e
commit 671be35122
16 changed files with 84 additions and 159 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
devel/boost-build/toolset.mk
View file

@ -1,11 +1,11 @@
# $NetBSD: toolset.mk,v 1.5 2011/02/24 11:05:34 adam Exp $
# $NetBSD: toolset.mk,v 1.6 2013/11/20 19:17:55 adam Exp $
.if !empty(PKGSRC_COMPILER:Mgcc)
. if ${OPSYS} == "Darwin"
BOOST_TOOLSET= darwin
. else
#. if ${OPSYS} == "Darwin"
#BOOST_TOOLSET= darwin
#. else
BOOST_TOOLSET= gcc
. endif
#. endif
.elif !empty(PKGSRC_COMPILER:Mclang)
BOOST_TOOLSET= clang
.elif !empty(PKGSRC_COMPILER:Mmipspro*)

18
devel/boost-jam/bjam.mk
View file

@ -1,4 +1,4 @@
# $NetBSD: bjam.mk,v 1.14 2013/11/12 16:49:07 adam Exp $
# $NetBSD: bjam.mk,v 1.15 2013/11/20 19:17:55 adam Exp $
.include "../../devel/boost-jam/buildlink3.mk"
@ -15,20 +15,28 @@ BJAM_ARGS+= --layout=system
BJAM_ARGS+= --toolset=${BOOST_TOOLSET}
BJAM_ARGS+= --disable-long-double
BJAM_ARGS+= ${BJAM_BUILD}
# GCC 4.4 and above needs this
.include "../../mk/compiler.mk"
.if !empty(PKGSRC_COMPILER:Mgcc) && !empty(CC_VERSION:Mgcc-4.[4-9]*)
.if !empty(PKGSRC_COMPILER:Mgcc)
. if !empty(CC_VERSION:Mgcc-4.[4-7]*)
BJAM_ARGS+= cxxflags=-std=c++0x
CXXFLAGS+= -std=c++0x
. elif !empty(CC_VERSION:Mgcc-4.[89]*)
BJAM_ARGS+= cxxflags=-std=c++11
CXXFLAGS+= -std=c++11
. endif
.endif
#
.if !empty(PKGSRC_COMPILER:Mclang)
BJAM_ARGS+= cxxflags=-std=c++11
CXXFLAGS+= -std=c++11
. if !empty(OPSYS:MDarwin)
BJAM_ARGS+= cxxflags=-stdlib=libc++ linkflags=-stdlib=libc++
. endif
.endif
BJAM_BUILD+= release
BJAM_BUILD+= variant=release
BJAM_BUILD+= threading=multi
BJAM_BUILD+= link=shared,static

11
devel/boost-libs/PLIST
View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.22 2013/11/12 16:49:07 adam Exp $
@comment $NetBSD: PLIST,v 1.23 2013/11/20 19:17:55 adam Exp $
lib/libboost_atomic.a
lib/libboost_atomic.so
lib/libboost_atomic.so.${BOOST_VERSION}
@ -24,6 +24,9 @@ lib/libboost_graph.so.${BOOST_VERSION}
lib/libboost_iostreams.a
lib/libboost_iostreams.so
lib/libboost_iostreams.so.${BOOST_VERSION}
lib/libboost_locale.a
lib/libboost_locale.so
lib/libboost_locale.so.${BOOST_VERSION}
lib/libboost_log.a
lib/libboost_log.so
lib/libboost_log.so.${BOOST_VERSION}
@ -36,12 +39,18 @@ lib/libboost_math_c99.so.${BOOST_VERSION}
lib/libboost_math_c99f.a
lib/libboost_math_c99f.so
lib/libboost_math_c99f.so.${BOOST_VERSION}
lib/libboost_math_c99l.a
lib/libboost_math_c99l.so
lib/libboost_math_c99l.so.${BOOST_VERSION}
lib/libboost_math_tr1.a
lib/libboost_math_tr1.so
lib/libboost_math_tr1.so.${BOOST_VERSION}
lib/libboost_math_tr1f.a
lib/libboost_math_tr1f.so
lib/libboost_math_tr1f.so.${BOOST_VERSION}
lib/libboost_math_tr1l.a
lib/libboost_math_tr1l.so
lib/libboost_math_tr1l.so.${BOOST_VERSION}
lib/libboost_prg_exec_monitor.a
lib/libboost_prg_exec_monitor.so
lib/libboost_prg_exec_monitor.so.${BOOST_VERSION}

10
devel/boost-libs/PLIST.Darwin
View file

@ -1,10 +0,0 @@
@comment $NetBSD: PLIST.Darwin,v 1.3 2013/02/19 16:39:46 adam Exp $
lib/libboost_locale.a
lib/libboost_locale.so
lib/libboost_locale.so.${BOOST_VERSION}
lib/libboost_math_c99l.a
lib/libboost_math_c99l.so
lib/libboost_math_c99l.so.${BOOST_VERSION}
lib/libboost_math_tr1l.a
lib/libboost_math_tr1l.so
lib/libboost_math_tr1l.so.${BOOST_VERSION}

10
devel/boost-libs/PLIST.DragonFly
View file

@ -1,10 +0,0 @@
@comment $NetBSD: PLIST.DragonFly,v 1.2 2012/01/29 00:10:55 marino Exp $
lib/libboost_locale.a
lib/libboost_locale.so
lib/libboost_locale.so.${BOOST_VERSION}
lib/libboost_math_c99l.a
lib/libboost_math_c99l.so
lib/libboost_math_c99l.so.${BOOST_VERSION}
lib/libboost_math_tr1l.a
lib/libboost_math_tr1l.so
lib/libboost_math_tr1l.so.${BOOST_VERSION}

10
devel/boost-libs/PLIST.Linux
View file

@ -1,10 +0,0 @@
@comment $NetBSD: PLIST.Linux,v 1.2 2012/01/17 03:25:35 sbd Exp $
lib/libboost_locale.a
lib/libboost_locale.so
lib/libboost_locale.so.${BOOST_VERSION}
lib/libboost_math_c99l.a
lib/libboost_math_c99l.so
lib/libboost_math_c99l.so.${BOOST_VERSION}
lib/libboost_math_tr1l.a
lib/libboost_math_tr1l.so
lib/libboost_math_tr1l.so.${BOOST_VERSION}

4
devel/boost-libs/PLIST.NetBSD
View file

@ -1,4 +0,0 @@
@comment $NetBSD: PLIST.NetBSD,v 1.1 2012/01/09 14:40:36 adam Exp $
lib/libboost_locale.a
lib/libboost_locale.so
lib/libboost_locale.so.${BOOST_VERSION}

7
devel/boost-libs/PLIST.SunOS
View file

@ -1,7 +0,0 @@
@comment $NetBSD: PLIST.SunOS,v 1.1 2011/09/14 18:13:37 hans Exp $
lib/libboost_math_c99l.a
lib/libboost_math_c99l.so
lib/libboost_math_c99l.so.${BOOST_VERSION}
lib/libboost_math_tr1l.a
lib/libboost_math_tr1l.so
lib/libboost_math_tr1l.so.${BOOST_VERSION}

3
meta-pkgs/boost/Makefile.common
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile.common,v 1.41 2013/11/12 16:49:07 adam Exp $
# $NetBSD: Makefile.common,v 1.42 2013/11/20 19:17:55 adam Exp $
#
# used by devel/boost-build/Makefile
# used by devel/boost-docs/Makefile
@ -19,6 +19,7 @@ CATEGORIES= devel
PKGNAME= boost-${BOOST_VERSION}
.else # ${BOOST_PACKAGE} != "meta-pkg"
PKGNAME= boost-${BOOST_PACKAGE}-${BOOST_VERSION}
PKGREVISION= 1
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=boost/}
EXTRACT_SUFX= .tar.bz2

8
meta-pkgs/boost/distinfo
View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.60 2013/11/12 16:49:07 adam Exp $
$NetBSD: distinfo,v 1.61 2013/11/20 19:17:55 adam Exp $
SHA1 (boost_1_55_0.tar.bz2) = cef9a0cc7084b1d639e06cd3bc34e4251524c840
RMD160 (boost_1_55_0.tar.bz2) = de8ef647933a005119425326b59723aad4a6fd4f
@ -9,11 +9,11 @@ SHA1 (patch-ac) = 32d14b50682dae1950ed927ecb9318ad6b07687a
SHA1 (patch-ad) = 0e5dc31c3425de94444f97a9b7dec97ed5967733
SHA1 (patch-ae) = 2fb49c90bbb3fd797ccdfaaf44c93494a5988f52
SHA1 (patch-ag) = c406e9beb9260db7861b13a6eb4c386f23346eb1
SHA1 (patch-ai) = 231db48819aa563b2082d95bb91d662b5d6cf779
SHA1 (patch-aq) = e5c7b72ffa2942ce401f3d9bf05498fd761df17a
SHA1 (patch-ar) = 2fec2c51272cc4ee376e6538d8f1fd8561a7f0a3
SHA1 (patch-boost_archive_iterators_transform__width.hpp) = 5c08bac63fcc259997a8cf6fac1684f45ef7cd1a
SHA1 (patch-boost_foreach.hpp) = 7cd26c4983873bcac284ad400950e341c559f9a8
SHA1 (patch-boost_foreach_fwd.hpp) = 5accd68d559213a9677f7d1204e72dd082a42a41
SHA1 (patch-boost_asio_detail_config.hpp) = b95ca6b0bb6c805624cb81c91c3f1b691a7425ca
SHA1 (patch-boost_math_tools_config.hpp) = 81402bc38dc858d0818ed91e204966c8382be4ff
SHA1 (patch-boost_noncopyable.hpp) = 6567b5932c6bb48e8b2fcae48ff47e0f230fc1b9
SHA1 (patch-libs_config_configure) = e2f204d4fa4f1bd9b4131d28f9be0a1ac22bf711
SHA1 (patch-libs_filesystem_src_unique_path.cpp) = 4693ea11cf464d82168cecaa143b48affa94563b

30
meta-pkgs/boost/patches/patch-ai
View file

@ -1,30 +0,0 @@
$NetBSD: patch-ai,v 1.5 2012/07/02 07:02:26 adam Exp $
https://svn.boost.org/trac/boost/ticket/6098
--- boost/asio/detail/impl/kqueue_reactor.ipp.orig 2011-11-06 17:01:14.000000000 +0000
+++ boost/asio/detail/impl/kqueue_reactor.ipp
@@ -290,9 +290,9 @@ void kqueue_reactor::deregister_descript
{
struct kevent events[2];
BOOST_ASIO_KQUEUE_EV_SET(&events[0], descriptor,
- EVFILT_READ, EV_DELETE, 0, 0, 0);
+ EVFILT_READ, EV_DELETE, 0, 0, (void*)0);
BOOST_ASIO_KQUEUE_EV_SET(&events[1], descriptor,
- EVFILT_WRITE, EV_DELETE, 0, 0, 0);
+ EVFILT_WRITE, EV_DELETE, 0, 0, (void*)0);
::kevent(kqueue_fd_, events, 2, 0, 0, 0);
}
@@ -331,9 +331,9 @@ void kqueue_reactor::deregister_internal
{
struct kevent events[2];
BOOST_ASIO_KQUEUE_EV_SET(&events[0], descriptor,
- EVFILT_READ, EV_DELETE, 0, 0, 0);
+ EVFILT_READ, EV_DELETE, 0, 0, (void*)0);
BOOST_ASIO_KQUEUE_EV_SET(&events[1], descriptor,
- EVFILT_WRITE, EV_DELETE, 0, 0, 0);
+ EVFILT_WRITE, EV_DELETE, 0, 0, (void*)0);
::kevent(kqueue_fd_, events, 2, 0, 0, 0);
op_queue<operation> ops;

20
meta-pkgs/boost/patches/patch-boost_asio_detail_config.hpp Normal file
View file

@ -0,0 +1,20 @@
$NetBSD: patch-boost_asio_detail_config.hpp,v 1.1 2013/11/20 19:17:55 adam Exp $
GCC 4.5.x does not have std:addressof.
--- boost/asio/detail/config.hpp.orig 2013-11-20 17:59:30.000000000 +0000
+++ boost/asio/detail/config.hpp
@@ -333,11 +333,11 @@
# define BOOST_ASIO_HAS_STD_ADDRESSOF 1
# endif // defined(BOOST_ASIO_HAS_CLANG_LIBCXX)
# if defined(__GNUC__)
-# if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 5)) || (__GNUC__ > 4)
+# if ((__GNUC__ == 4) && (__GNUC_MINOR__ > 5)) || (__GNUC__ > 4)
# if defined(__GXX_EXPERIMENTAL_CXX0X__)
# define BOOST_ASIO_HAS_STD_ADDRESSOF 1
# endif // defined(__GXX_EXPERIMENTAL_CXX0X__)
-# endif // ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 5)) || (__GNUC__ > 4)
+# endif // ((__GNUC__ == 4) && (__GNUC_MINOR__ > 5)) || (__GNUC__ > 4)
# endif // defined(__GNUC__)
# if defined(BOOST_ASIO_MSVC)
# if (_MSC_VER >= 1700)

24
meta-pkgs/boost/patches/patch-boost_foreach.hpp
View file

@ -1,24 +0,0 @@
$NetBSD: patch-boost_foreach.hpp,v 1.3 2012/07/03 19:46:30 adam Exp $
https://svn.boost.org/trac/boost/ticket/6131
--- boost/foreach.hpp.orig 2012-01-09 15:55:10.000000000 +0000
+++ boost/foreach.hpp
@@ -165,7 +165,7 @@ namespace foreach
// this one works on legacy compilers. Overload boost_foreach_is_lightweight_proxy
// at the global namespace for your type.
template<typename T>
-inline boost::foreach::is_lightweight_proxy<T> *
+inline boost::BOOST_FOREACH::is_lightweight_proxy<T> *
boost_foreach_is_lightweight_proxy(T *&, BOOST_FOREACH_TAG_DEFAULT) { return 0; }
template<typename T>
@@ -190,7 +190,7 @@ boost_foreach_is_lightweight_proxy(T **&
// this one works on legacy compilers. Overload boost_foreach_is_noncopyable
// at the global namespace for your type.
template<typename T>
-inline boost::foreach::is_noncopyable<T> *
+inline boost::BOOST_FOREACH::is_noncopyable<T> *
boost_foreach_is_noncopyable(T *&, BOOST_FOREACH_TAG_DEFAULT) { return 0; }
namespace boost

48
meta-pkgs/boost/patches/patch-boost_foreach_fwd.hpp
View file

@ -1,48 +0,0 @@
$NetBSD: patch-boost_foreach_fwd.hpp,v 1.3 2012/07/03 19:46:30 adam Exp $
https://svn.boost.org/trac/boost/ticket/6131
--- boost/foreach_fwd.hpp.orig 2012-01-09 15:58:44.000000000 +0000
+++ boost/foreach_fwd.hpp
@@ -14,6 +14,8 @@
#ifndef BOOST_FOREACH_FWD_HPP
#define BOOST_FOREACH_FWD_HPP
+#include <utility> // for std::pair
+
// This must be at global scope, hence the uglified name
enum boost_foreach_argument_dependent_lookup_hack
{
@@ -25,6 +27,9 @@ namespace boost
namespace foreach
{
+ template<typename T>
+ std::pair<T, T> in_range(T begin, T end);
+
///////////////////////////////////////////////////////////////////////////////
// boost::foreach::tag
//
@@ -46,6 +51,22 @@ namespace foreach
} // namespace foreach
+namespace BOOST_FOREACH
+{
+ using foreach::in_range;
+ using foreach::tag;
+
+ template<typename T>
+ struct is_lightweight_proxy
+ : foreach::is_lightweight_proxy<T>
+ {};
+
+ template<typename T>
+ struct is_noncopyable
+ : foreach::is_noncopyable<T>
+ {};
+} // namespace BOOST_FOREACH
+
} // namespace boost
#endif

15
meta-pkgs/boost/patches/patch-boost_math_tools_config.hpp Normal file
View file

@ -0,0 +1,15 @@
$NetBSD: patch-boost_math_tools_config.hpp,v 1.1 2013/11/20 19:17:55 adam Exp $
Enable long double math functions on FreeBSD and NetBSD.
--- boost/math/tools/config.hpp.orig 2013-11-20 18:40:34.000000000 +0000
+++ boost/math/tools/config.hpp
@@ -23,7 +23,7 @@
#include <boost/math/tools/user.hpp>
-#if (defined(__CYGWIN__) || defined(__FreeBSD__) || defined(__NetBSD__) \
+#if (defined(__CYGWIN__) \
|| (defined(__hppa) && !defined(__OpenBSD__)) || (defined(__NO_LONG_DOUBLE_MATH) && (DBL_MANT_DIG != LDBL_MANT_DIG))) \
&& !defined(BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS)
# define BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS

15
meta-pkgs/boost/patches/patch-boost_noncopyable.hpp Normal file
View file

@ -0,0 +1,15 @@
$NetBSD: patch-boost_noncopyable.hpp,v 1.1 2013/11/20 19:17:55 adam Exp $
https://svn.boost.org/trac/boost/ticket/6578
--- boost/noncopyable.hpp.orig 2013-11-20 14:20:55.000000000 +0000
+++ boost/noncopyable.hpp
@@ -22,7 +22,7 @@ namespace noncopyable_ // protection fr
{
class noncopyable
{
- protected:
+ public:
#ifndef BOOST_NO_DEFAULTED_FUNCTIONS
BOOST_CONSTEXPR noncopyable() = default;
~noncopyable() = default;