- unbreak on amd64 by adding -fPIC to the link cmd
tested by sthen@, brad@, eric@ and others, ok brad@ sthen@ - use /dev/urandom (from Brad)
This commit is contained in:
parent
6cf57f0d06
commit
7b1cbc0182
@ -1,8 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.12 2008/04/03 07:44:39 bernd Exp $
|
||||
# $OpenBSD: Makefile,v 1.13 2008/04/06 17:57:43 deanna Exp $
|
||||
|
||||
COMMENT= free peer-reviewed portable C++ source libraries
|
||||
|
||||
PKGNAME= boost-${VERSION}
|
||||
PKGNAME= boost-${VERSION}p0
|
||||
|
||||
VERSION= 1.34.1
|
||||
DISTNAME= boost_${VERSION:S/./_/g}
|
||||
|
21
devel/boost/patches/patch-libs_random_random_device_cpp
Normal file
21
devel/boost/patches/patch-libs_random_random_device_cpp
Normal file
@ -0,0 +1,21 @@
|
||||
$OpenBSD: patch-libs_random_random_device_cpp,v 1.1 2008/04/06 17:57:43 deanna Exp $
|
||||
--- libs/random/random_device.cpp.orig Sat Apr 5 13:36:41 2008
|
||||
+++ libs/random/random_device.cpp Sat Apr 5 13:38:10 2008
|
||||
@@ -22,7 +22,7 @@ const boost::random_device::result_type boost::random_
|
||||
#endif
|
||||
|
||||
|
||||
-#ifdef __linux__
|
||||
+#if defined(__linux__) || defined(__OpenBSD__)
|
||||
|
||||
// the default is the unlimited capacity device, using some secure hash
|
||||
// try "/dev/random" for blocking when the entropy pool has drained
|
||||
@@ -90,7 +90,7 @@ class boost::random_device::impl (private)
|
||||
int fd;
|
||||
};
|
||||
|
||||
-#endif // __linux__
|
||||
+#endif // __linux__ || __OpenBSD__
|
||||
|
||||
|
||||
boost::random_device::random_device(const std::string& token)
|
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-tools_build_v2_tools_gcc_jam,v 1.1 2008/04/03 07:44:40 bernd Exp $
|
||||
$OpenBSD: patch-tools_build_v2_tools_gcc_jam,v 1.2 2008/04/06 17:57:43 deanna Exp $
|
||||
--- tools/build/v2/tools/gcc.jam.orig Tue Jun 12 00:47:49 2007
|
||||
+++ tools/build/v2/tools/gcc.jam Sun Mar 30 20:20:02 2008
|
||||
+++ tools/build/v2/tools/gcc.jam Sat Apr 5 16:10:59 2008
|
||||
@@ -41,8 +41,10 @@ generators.override gcc.searched-lib-generator : searc
|
||||
|
||||
# Make the "o" suffix used for gcc toolset on all
|
||||
@ -56,11 +56,13 @@ $OpenBSD: patch-tools_build_v2_tools_gcc_jam,v 1.1 2008/04/03 07:44:40 bernd Exp
|
||||
"$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,"$(RPATH)" -Wl,-rpath-link$(SPACE)-Wl,"$(RPATH_LINK)" -o "$(<)" $(START-GROUP) "$(>)" "$(LIBRARIES)" -l$(FINDLIBS-ST) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)
|
||||
}
|
||||
|
||||
@@ -629,6 +628,7 @@ rule link.dll ( targets * : sources * : properties * )
|
||||
@@ -629,7 +628,8 @@ rule link.dll ( targets * : sources * : properties * )
|
||||
# Differ from 'link' above only by -shared.
|
||||
actions link.dll bind LIBRARIES
|
||||
{
|
||||
+ echo "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,"$(RPATH)" "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=) -shared $(START-GROUP) "$(>)" "$(LIBRARIES)" -l$(FINDLIBS-ST) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)
|
||||
"$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,"$(RPATH)" "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=) -shared $(START-GROUP) "$(>)" "$(LIBRARIES)" -l$(FINDLIBS-ST) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)
|
||||
- "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,"$(RPATH)" "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=) -shared $(START-GROUP) "$(>)" "$(LIBRARIES)" -l$(FINDLIBS-ST) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)
|
||||
+ echo "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,"$(RPATH)" "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=) -shared -fPIC $(START-GROUP) "$(>)" "$(LIBRARIES)" -l$(FINDLIBS-ST) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)
|
||||
+ "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,"$(RPATH)" "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=) -shared -fPIC $(START-GROUP) "$(>)" "$(LIBRARIES)" -l$(FINDLIBS-ST) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)
|
||||
}
|
||||
|
||||
# Set up threading support. It's somewhat contrived, so perform it at the end,
|
||||
|
Loading…
Reference in New Issue
Block a user