diff options
author | riz <riz> | 2013-01-24 22:54:49 +0000 |
---|---|---|
committer | riz <riz> | 2013-01-24 22:54:49 +0000 |
commit | 5f06866980f6e39262538440c4ca390d15cdf374 (patch) | |
tree | 5cb779f7eb46bae593a32c3c8cfe2b99327ad509 | |
parent | e2895e34b3bc85c94a96077dfc5ed067a7c04b43 (diff) | |
download | pkgsrc-5f06866980f6e39262538440c4ca390d15cdf374.tar.gz |
Use <sys/endian.h> on BSD systems to determine endianness. Fixes a problem
on NetBSD/arm where boost could not determine the endianness.
(patch has been submitted upstream)
-rw-r--r-- | meta-pkgs/boost/Makefile.common | 4 | ||||
-rw-r--r-- | meta-pkgs/boost/distinfo | 3 | ||||
-rw-r--r-- | meta-pkgs/boost/patches/patch-boost_detail_endian.hpp | 28 |
3 files changed, 32 insertions, 3 deletions
diff --git a/meta-pkgs/boost/Makefile.common b/meta-pkgs/boost/Makefile.common index 7b47067eef3..71a7925624d 100644 --- a/meta-pkgs/boost/Makefile.common +++ b/meta-pkgs/boost/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.38 2013/01/20 09:06:58 martin Exp $ +# $NetBSD: Makefile.common,v 1.39 2013/01/24 22:54:49 riz Exp $ # # used by devel/boost-build/Makefile # used by devel/boost-docs/Makefile @@ -19,7 +19,7 @@ CATEGORIES= devel PKGNAME= boost-${BOOST_VERSION} .else # ${BOOST_PACKAGE} != "meta-pkg" PKGNAME= boost-${BOOST_PACKAGE}-${BOOST_VERSION} -PKGREVISION= 1 +PKGREVISION= 2 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=boost/} EXTRACT_SUFX= .tar.bz2 diff --git a/meta-pkgs/boost/distinfo b/meta-pkgs/boost/distinfo index d7bc67ebd39..2ee9f5413da 100644 --- a/meta-pkgs/boost/distinfo +++ b/meta-pkgs/boost/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.54 2013/01/20 09:41:40 martin Exp $ +$NetBSD: distinfo,v 1.55 2013/01/24 22:54:49 riz Exp $ SHA1 (boost_1_52_0.tar.bz2) = cddd6b4526a09152ddc5db856463eaa1dc29c5d9 RMD160 (boost_1_52_0.tar.bz2) = 94f72f4553a88495f2052029fb2e90cf8366e75d @@ -14,6 +14,7 @@ SHA1 (patch-aq) = e5c7b72ffa2942ce401f3d9bf05498fd761df17a SHA1 (patch-ar) = 2fec2c51272cc4ee376e6538d8f1fd8561a7f0a3 SHA1 (patch-boost_context_detail_fcontext__sparc.hpp) = 1f9cd1292669c13a8560817dec9632f21e6760e3 SHA1 (patch-boost_context_fcontext.hpp) = 5b7738e335410dfb922c023313c096ae7d454953 +SHA1 (patch-boost_detail_endian.hpp) = ebd8d512ded732bfbf1f6ddd328612e95839f381 SHA1 (patch-boost_foreach.hpp) = 7cd26c4983873bcac284ad400950e341c559f9a8 SHA1 (patch-boost_foreach_fwd.hpp) = 5accd68d559213a9677f7d1204e72dd082a42a41 SHA1 (patch-libs_context_build_Jamfile.v2) = 649ec4d3c38291d8145a1170e8cb42466fc280dd diff --git a/meta-pkgs/boost/patches/patch-boost_detail_endian.hpp b/meta-pkgs/boost/patches/patch-boost_detail_endian.hpp new file mode 100644 index 00000000000..ee40cdcc98f --- /dev/null +++ b/meta-pkgs/boost/patches/patch-boost_detail_endian.hpp @@ -0,0 +1,28 @@ +$NetBSD: patch-boost_detail_endian.hpp,v 1.1 2013/01/24 22:54:49 riz Exp $ + +--- boost/detail/endian.hpp.orig 2011-03-29 14:58:48.000000000 -0700 ++++ boost/detail/endian.hpp 2013-01-24 14:24:28.000000000 -0800 +@@ -43,6 +43,23 @@ + # error Unknown machine endianness detected. + # endif + # define BOOST_BYTE_ORDER __BYTE_ORDER ++#elif defined(__NetBSD__) || defined(__FreeBSD__) || \ ++ defined(__OpenBSD__) || (__DragonFly__) ++# if defined(__OpenBSD__) ++# include <machine/endian.h> ++# else ++# include <sys/endian.h> ++# endif ++# if (_BYTE_ORDER == _LITTLE_ENDIAN) ++# define BOOST_LITTLE_ENDIAN ++# elif (_BYTE_ORDER == _BIG_ENDIAN) ++# define BOOST_BIG_ENDIAN ++# elif (_BYTE_ORDER == _PDP_ENDIAN) ++# define BOOST_PDP_ENDIAN ++# else ++# error Unknown machine endianness detected. ++# endif ++# define BOOST_BYTE_ORDER __BYTE_ORDER + #elif defined(_BIG_ENDIAN) && !defined(_LITTLE_ENDIAN) || \ + defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__) || \ + defined(_STLP_BIG_ENDIAN) && !defined(_STLP_LITTLE_ENDIAN) |