[pkg-boost-commits] r14666 - boost/trunk/debian/patches
Steven Michael Robbins
smr at alioth.debian.org
Sat Nov 19 05:29:45 UTC 2011
Author: smr
Date: 2011-11-19 05:29:43 +0000 (Sat, 19 Nov 2011)
New Revision: 14666
Removed:
boost/trunk/debian/patches/add-disable-long-double.patch
boost/trunk/debian/patches/jam-wall-clean.patch
boost/trunk/debian/patches/math_tools_config.patch
Log:
Remove obsolete patches.
Deleted: boost/trunk/debian/patches/add-disable-long-double.patch
===================================================================
--- boost/trunk/debian/patches/add-disable-long-double.patch 2011-11-19 05:16:26 UTC (rev 14665)
+++ boost/trunk/debian/patches/add-disable-long-double.patch 2011-11-19 05:29:43 UTC (rev 14666)
@@ -1,64 +0,0 @@
-Add option --disable-long-double to Boost build procedure.
-Specifying this option essentially allows us to ignore
-a build failure.
-
-c.f. http://lists.boost.org/boost-build/2008/11/20683.php
-
-Reported upstream as https://svn.boost.org/trac/boost/ticket/2597
-
-
---- boost1.36-1.36.0.orig/libs/math/build/Jamfile.v2
-+++ boost1.36-1.36.0/libs/math/build/Jamfile.v2
-@@ -51,7 +51,15 @@
- sph_neumann
- ;
-
--compile has_long_double_support.cpp ;
-+if --disable-long-double in [ modules.peek : ARGV ]
-+{
-+ build-long-double = false ;
-+}
-+else
-+{
-+ build-long-double = true ;
-+ compile has_long_double_support.cpp ;
-+}
-
- lib boost_math_tr1 : ../src/tr1/$(TR1_SOURCES).cpp
- :
-@@ -63,11 +74,14 @@
- <link>shared:<define>BOOST_MATH_TR1_DYN_LINK=1
- ;
-
-+if $(build-long-double) = true
-+{
- lib boost_math_tr1l : ../src/tr1/$(TR1_SOURCES)l.cpp
- :
- <link>shared:<define>BOOST_MATH_TR1_DYN_LINK=1
- <dependency>has_long_double_support
- ;
-+}
-
- lib boost_math_c99 : ../src/tr1/$(C99_SOURCES).cpp
- :
-@@ -79,12 +94,19 @@
- <link>shared:<define>BOOST_MATH_TR1_DYN_LINK=1
- ;
-
-+if $(build-long-double) = true
-+{
- lib boost_math_c99l : ../src/tr1/$(C99_SOURCES)l.cpp
- :
- <link>shared:<define>BOOST_MATH_TR1_DYN_LINK=1
- <dependency>has_long_double_support
- ;
-+}
-
-
--boost-install boost_math_c99 boost_math_c99f boost_math_c99l boost_math_tr1 boost_math_tr1f boost_math_tr1l ;
-+boost-install boost_math_c99 boost_math_c99f boost_math_tr1 boost_math_tr1f ;
-
-+if $(build-long-double) = true
-+{
-+boost-install boost_math_c99l boost_math_tr1l ;
-+}
Deleted: boost/trunk/debian/patches/jam-wall-clean.patch
===================================================================
--- boost/trunk/debian/patches/jam-wall-clean.patch 2011-11-19 05:16:26 UTC (rev 14665)
+++ boost/trunk/debian/patches/jam-wall-clean.patch 2011-11-19 05:29:43 UTC (rev 14666)
@@ -1,76 +0,0 @@
---- boost1.38-1.38.0.orig/tools/jam/src/expand.c
-+++ boost1.38-1.38.0/tools/jam/src/expand.c
-@@ -82,7 +82,7 @@
- int depth;
-
- if ( DEBUG_VAREXP )
-- printf( "expand '%.*s'\n", end - in, in );
-+ printf( "expand '%.*s'\n", (int)(end - in), in );
-
- /* This gets a lot of cases: $(<) and $(>). */
- if
---- boost1.38-1.38.0.orig/tools/jam/src/class.c
-+++ boost1.38-1.38.0/tools/jam/src/class.c
-@@ -119,7 +119,7 @@
- }
- else
- {
-- hashenter( classes, (HASHDATA * *)&pp );
-+ (void)hashenter( classes, (HASHDATA * *)&pp );
- }
- check_defined( bases );
-
---- boost1.38-1.38.0.orig/tools/jam/src/modules.c
-+++ boost1.38-1.38.0/tools/jam/src/modules.c
-@@ -143,7 +143,7 @@
- {
- char * s = module_names->string;
- char * * ss = &s;
-- hashenter( h, (HASHDATA * *)&ss );
-+ (void)hashenter( h, (HASHDATA * *)&ss );
- }
-
- PROFILE_EXIT( IMPORT_MODULE );
---- boost1.38-1.38.0.orig/tools/jam/src/search.c
-+++ boost1.38-1.38.0/tools/jam/src/search.c
-@@ -213,7 +213,7 @@
- /* CONSIDER: we probably should issue a warning is another file
- is explicitly bound to the same location. This might break
- compatibility, though. */
-- hashenter( explicit_bindings, (HASHDATA * *)&ba );
-+ (void)hashenter( explicit_bindings, (HASHDATA * *)&ba );
- }
-
- /* prepare a call to BINDRULE if the variable is set */
---- boost1.38-1.38.0.orig/tools/jam/src/native.c
-+++ boost1.38-1.38.0/tools/jam/src/native.c
-@@ -31,6 +31,6 @@
- }
- n.procedure = parse_make( f, P0, P0, P0, C0, C0, 0 );
- n.version = version;
-- hashenter(m->native_rules, (HASHDATA**)&np);
-+ (void)hashenter(m->native_rules, (HASHDATA**)&np);
- }
- }
---- boost1.38-1.38.0.orig/tools/jam/src/hash.c
-+++ boost1.38-1.38.0/tools/jam/src/hash.c
-@@ -448,7 +448,7 @@
- run = here;
- }
-
-- printf( "%s table: %d+%d+%d (%dK+%ldK) items+table+hash, %f density\n",
-+ printf( "%s table: %d+%d+%d (%dK+%zdK) items+table+hash, %f density\n",
- hp->name,
- count,
- hp->items.nel,
---- boost1.38-1.38.0.orig/tools/jam/src/hcache.c
-+++ boost1.38-1.38.0/tools/jam/src/hcache.c
-@@ -166,7 +166,7 @@
- {
- if ( !s )
- s = "";
-- fprintf( f, "%lu\t%s\n", strlen( s ), s );
-+ fprintf( f, "%zu\t%s\n", strlen( s ), s );
- }
-
-
Deleted: boost/trunk/debian/patches/math_tools_config.patch
===================================================================
--- boost/trunk/debian/patches/math_tools_config.patch 2011-11-19 05:16:26 UTC (rev 14665)
+++ boost/trunk/debian/patches/math_tools_config.patch 2011-11-19 05:29:43 UTC (rev 14666)
@@ -1,12 +0,0 @@
-Reported upstream as https://svn.boost.org/trac/boost/ticket/2526
-
---- boost1.37-1.37.0.orig/boost/math/tools/config.hpp
-+++ boost1.37-1.37.0/boost/math/tools/config.hpp
-@@ -24,6 +24,7 @@
- #include <boost/math/special_functions/detail/round_fwd.hpp>
-
- #if defined(__CYGWIN__) || defined(__FreeBSD__) || defined(__NetBSD__) \
-+ || defined(__arm__) || defined(__armel__) || defined(__hppa__) || defined(__mips__) || defined(__mipsel__) \
- || defined(__hppa) || defined(__NO_LONG_DOUBLE_MATH)
- # define BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
- #endif
More information about the pkg-boost-commits
mailing list