update to 0.3.0.git20130212 [release 0.3.0.git20130212-1mamba;Tue Feb 12 2013]
This commit is contained in:
parent
1f04cbb418
commit
b862765fae
@ -1,2 +1,4 @@
|
||||
# libixion
|
||||
|
||||
Ixion is a general purpose formula parser & interpreter that can calculate multiple named targets, or “cells”.
|
||||
|
||||
|
||||
26
libixion-0.3.0-automake.patch
Normal file
26
libixion-0.3.0-automake.patch
Normal file
@ -0,0 +1,26 @@
|
||||
--- libixion_0.3.0.orig/src/Makefile.am 2011-11-01 23:48:02.000000000 +0100
|
||||
+++ libixion_0.3.0/src/Makefile.am 2013-02-12 21:18:21.800607280 +0100
|
||||
@@ -1,7 +1,6 @@
|
||||
SUBDIRS = libixion .
|
||||
|
||||
-INCLUDES = -I$(top_srcdir)/include
|
||||
+INCLUDES = -I../include
|
||||
-
|
||||
bin_PROGRAMS = ixion-parser ixion-sorter ixion-test
|
||||
|
||||
ixion_parser_SOURCES = \
|
||||
@@ -10,7 +8,7 @@
|
||||
|
||||
ixion_parser_LDADD = libixion/libixion-@IXION_API_VERSION@.la \
|
||||
$(BOOST_THREAD_LIBS) $(BOOST_PROGRAM_OPTIONS_LIBS)
|
||||
-ixion_parser_CPPFLAGS = -I$(top_builddir)/lib/libixion/libixion.la
|
||||
+ixion_parser_CPPFLAGS = -I$(top_builddir)/lib/libixion/libixion.la -I$(top_builddir)/include
|
||||
|
||||
ixion_sorter_SOURCES = \
|
||||
ixion_sorter.cpp \
|
||||
@@ -24,4 +22,4 @@
|
||||
ixion_test_LDADD = libixion/libixion-@IXION_API_VERSION@.la
|
||||
ixion_test_CPPFLAGS = -I$(top_builddir)/lib/libixion/libixion.la
|
||||
|
||||
-TESTS = $(top_srcdir)/test/ixion-parser-test.sh ixion-test
|
||||
+TESTS = $(top_builddir)/test/ixion-parser-test.sh ixion-test
|
||||
694
libixion-0.3.0-boost.m4.patch
Normal file
694
libixion-0.3.0-boost.m4.patch
Normal file
@ -0,0 +1,694 @@
|
||||
diff -Nru libixion_0.3.0.orig/m4/boost.m4 libixion_0.3.0/m4/boost.m4
|
||||
--- libixion_0.3.0.orig/m4/boost.m4 2011-11-01 23:48:02.000000000 +0100
|
||||
+++ libixion_0.3.0/m4/boost.m4 2013-02-12 20:53:11.982421195 +0100
|
||||
@@ -1,5 +1,5 @@
|
||||
# boost.m4: Locate Boost headers and libraries for autoconf-based projects.
|
||||
-# Copyright (C) 2007, 2008, 2009 Benoit Sigoure <tsuna@lrde.epita.fr>
|
||||
+# Copyright (C) 2007, 2008, 2009, 2010, 2011 Benoit Sigoure <tsuna@lrde.epita.fr>
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
@@ -22,7 +22,7 @@
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
m4_define([_BOOST_SERIAL], [m4_translit([
|
||||
-# serial 12
|
||||
+# serial 16
|
||||
], [#
|
||||
], [])])
|
||||
|
||||
@@ -45,15 +45,19 @@
|
||||
# Note: THESE MACROS ASSUME THAT YOU USE LIBTOOL. If you don't, don't worry,
|
||||
# simply read the README, it will show you what to do step by step.
|
||||
|
||||
-m4_pattern_forbid([^_?BOOST_])
|
||||
+m4_pattern_forbid([^_?(BOOST|Boost)_])
|
||||
|
||||
|
||||
# _BOOST_SED_CPP(SED-PROGRAM, PROGRAM,
|
||||
# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
|
||||
# --------------------------------------------------------
|
||||
# Same as AC_EGREP_CPP, but leave the result in conftest.i.
|
||||
-# PATTERN is *not* overquoted, as in AC_EGREP_CPP. It could be useful
|
||||
-# to turn this into a macro which extracts the value of any macro.
|
||||
+#
|
||||
+# SED-PROGRAM is *not* overquoted, as in AC_EGREP_CPP. It is expanded
|
||||
+# in double-quotes, so escape your double quotes.
|
||||
+#
|
||||
+# It could be useful to turn this into a macro which extracts the
|
||||
+# value of any macro.
|
||||
m4_define([_BOOST_SED_CPP],
|
||||
[AC_LANG_PREPROC_REQUIRE()dnl
|
||||
AC_REQUIRE([AC_PROG_SED])dnl
|
||||
@@ -98,6 +102,7 @@
|
||||
IFS=$boost_save_IFS
|
||||
shift
|
||||
boost_version_req=`expr "$[1]" '*' 100000 + "$[2]" '*' 100 + "$[3]"`
|
||||
+boost_version_req_string=$[1].$[2].$[3]
|
||||
AC_ARG_WITH([boost],
|
||||
[AS_HELP_STRING([--with-boost=DIR],
|
||||
[prefix of Boost $1 @<:@guess@:>@])])dnl
|
||||
@@ -113,9 +118,9 @@
|
||||
fi
|
||||
fi
|
||||
AC_SUBST([DISTCHECK_CONFIGURE_FLAGS],
|
||||
- ["$DISTCHECK_CONFIGURE_FLAGS '--with-boost=$with_boost'"])
|
||||
+ ["$DISTCHECK_CONFIGURE_FLAGS '--with-boost=$with_boost'"])dnl
|
||||
boost_save_CPPFLAGS=$CPPFLAGS
|
||||
- AC_CACHE_CHECK([for Boost headers version >= $boost_version_req],
|
||||
+ AC_CACHE_CHECK([for Boost headers version >= $boost_version_req_string],
|
||||
[boost_cv_inc_path],
|
||||
[boost_cv_inc_path=no
|
||||
AC_LANG_PUSH([C++])dnl
|
||||
@@ -183,7 +188,7 @@
|
||||
])
|
||||
case $boost_cv_inc_path in #(
|
||||
no)
|
||||
- boost_errmsg="cannot find Boost headers version >= $boost_version_req"
|
||||
+ boost_errmsg="cannot find Boost headers version >= $boost_version_req_string"
|
||||
m4_if([$2], [], [AC_MSG_ERROR([$boost_errmsg])],
|
||||
[AC_MSG_NOTICE([$boost_errmsg])])
|
||||
$2
|
||||
@@ -192,7 +197,7 @@
|
||||
BOOST_CPPFLAGS=
|
||||
;;#(
|
||||
*)
|
||||
- AC_SUBST([BOOST_CPPFLAGS], ["-I$boost_cv_inc_path"])
|
||||
+ AC_SUBST([BOOST_CPPFLAGS], ["-I$boost_cv_inc_path"])dnl
|
||||
;;
|
||||
esac
|
||||
if test x"$boost_cv_inc_path" != xno; then
|
||||
@@ -201,7 +206,7 @@
|
||||
AC_CACHE_CHECK([for Boost's header version],
|
||||
[boost_cv_lib_version],
|
||||
[m4_pattern_allow([^BOOST_LIB_VERSION$])dnl
|
||||
- _BOOST_SED_CPP([/^boost-lib-version = /{s///;s/\"//g;p;g;}],
|
||||
+ _BOOST_SED_CPP([/^boost-lib-version = /{s///;s/\"//g;p;q;}],
|
||||
[#include <boost/version.hpp>
|
||||
boost-lib-version = BOOST_LIB_VERSION],
|
||||
[boost_cv_lib_version=`cat conftest.i`])])
|
||||
@@ -222,7 +227,7 @@
|
||||
# on the command line, static versions of the libraries will be looked up.
|
||||
AC_DEFUN([BOOST_STATIC],
|
||||
[AC_ARG_ENABLE([static-boost],
|
||||
- [AC_HELP_STRING([--enable-static-boost],
|
||||
+ [AS_HELP_STRING([--enable-static-boost],
|
||||
[Prefer the static boost libraries over the shared ones [no]])],
|
||||
[enable_static_boost=yes],
|
||||
[enable_static_boost=no])])# BOOST_STATIC
|
||||
@@ -292,6 +297,7 @@
|
||||
AC_LANG_PUSH([C++])dnl
|
||||
AS_VAR_PUSHDEF([Boost_lib], [boost_cv_lib_$1])dnl
|
||||
AS_VAR_PUSHDEF([Boost_lib_LDFLAGS], [boost_cv_lib_$1_LDFLAGS])dnl
|
||||
+AS_VAR_PUSHDEF([Boost_lib_LDPATH], [boost_cv_lib_$1_LDPATH])dnl
|
||||
AS_VAR_PUSHDEF([Boost_lib_LIBS], [boost_cv_lib_$1_LIBS])dnl
|
||||
BOOST_FIND_HEADER([$3])
|
||||
boost_save_CPPFLAGS=$CPPFLAGS
|
||||
@@ -373,8 +379,8 @@
|
||||
boost_tmp_lib=$with_boost
|
||||
test x"$with_boost" = x && boost_tmp_lib=${boost_cv_inc_path%/include}
|
||||
for boost_ldpath in "$boost_tmp_lib/lib" '' \
|
||||
- /opt/local/lib /usr/local/lib /opt/lib /usr/lib \
|
||||
- "$with_boost" C:/Boost/lib /lib /usr/lib64 /lib64
|
||||
+ /opt/local/lib* /usr/local/lib* /opt/lib* /usr/lib* \
|
||||
+ "$with_boost" C:/Boost/lib /lib*
|
||||
do
|
||||
test -e "$boost_ldpath" || continue
|
||||
boost_save_LDFLAGS=$LDFLAGS
|
||||
@@ -397,7 +403,8 @@
|
||||
LDFLAGS=$boost_save_LDFLAGS
|
||||
LIBS=$boost_save_LIBS
|
||||
if test x"$Boost_lib" = xyes; then
|
||||
- Boost_lib_LDFLAGS="-L$boost_ldpath -R$boost_ldpath"
|
||||
+ Boost_lib_LDFLAGS="-L$boost_ldpath -Wl,-R$boost_ldpath"
|
||||
+ Boost_lib_LDPATH="$boost_ldpath"
|
||||
break 6
|
||||
else
|
||||
boost_failed_libs="$boost_failed_libs@$boost_lib@"
|
||||
@@ -412,14 +419,17 @@
|
||||
])
|
||||
case $Boost_lib in #(
|
||||
no) _AC_MSG_LOG_CONFTEST
|
||||
- AC_MSG_ERROR([cannot not find the flags to link with Boost $1])
|
||||
+ AC_MSG_ERROR([cannot find the flags to link with Boost $1])
|
||||
;;
|
||||
esac
|
||||
-AC_SUBST(AS_TR_CPP([BOOST_$1_LDFLAGS]), [$Boost_lib_LDFLAGS])
|
||||
-AC_SUBST(AS_TR_CPP([BOOST_$1_LIBS]), [$Boost_lib_LIBS])
|
||||
+AC_SUBST(AS_TR_CPP([BOOST_$1_LDFLAGS]), [$Boost_lib_LDFLAGS])dnl
|
||||
+AC_SUBST(AS_TR_CPP([BOOST_$1_LDPATH]), [$Boost_lib_LDPATH])dnl
|
||||
+AC_SUBST([BOOST_LDPATH], [$Boost_lib_LDPATH])dnl
|
||||
+AC_SUBST(AS_TR_CPP([BOOST_$1_LIBS]), [$Boost_lib_LIBS])dnl
|
||||
CPPFLAGS=$boost_save_CPPFLAGS
|
||||
AS_VAR_POPDEF([Boost_lib])dnl
|
||||
AS_VAR_POPDEF([Boost_lib_LDFLAGS])dnl
|
||||
+AS_VAR_POPDEF([Boost_lib_LDPATH])dnl
|
||||
AS_VAR_POPDEF([Boost_lib_LIBS])dnl
|
||||
AC_LANG_POP([C++])dnl
|
||||
fi
|
||||
@@ -434,17 +444,31 @@
|
||||
# The page http://beta.boost.org/doc/libs is useful: it gives the first release
|
||||
# version of each library (among other things).
|
||||
|
||||
+# BOOST_DEFUN(LIBRARY, CODE)
|
||||
+# --------------------------
|
||||
+# Define BOOST_<LIBRARY-UPPERCASE> as a macro that runs CODE.
|
||||
+#
|
||||
+# Use indir to avoid the warning on underquoted macro name given to AC_DEFUN.
|
||||
+m4_define([BOOST_DEFUN],
|
||||
+[m4_indir([AC_DEFUN],
|
||||
+ m4_toupper([BOOST_$1]),
|
||||
+[m4_pushdef([BOOST_Library], [$1])dnl
|
||||
+$2
|
||||
+m4_popdef([BOOST_Library])dnl
|
||||
+])
|
||||
+])
|
||||
+
|
||||
# BOOST_ARRAY()
|
||||
# -------------
|
||||
# Look for Boost.Array
|
||||
-AC_DEFUN([BOOST_ARRAY],
|
||||
+BOOST_DEFUN([Array],
|
||||
[BOOST_FIND_HEADER([boost/array.hpp])])
|
||||
|
||||
|
||||
# BOOST_ASIO()
|
||||
# ------------
|
||||
# Look for Boost.Asio (new in Boost 1.35).
|
||||
-AC_DEFUN([BOOST_ASIO],
|
||||
+BOOST_DEFUN([Asio],
|
||||
[AC_REQUIRE([BOOST_SYSTEM])dnl
|
||||
BOOST_FIND_HEADER([boost/asio.hpp])])
|
||||
|
||||
@@ -452,14 +476,41 @@
|
||||
# BOOST_BIND()
|
||||
# ------------
|
||||
# Look for Boost.Bind
|
||||
-AC_DEFUN([BOOST_BIND],
|
||||
+BOOST_DEFUN([Bind],
|
||||
[BOOST_FIND_HEADER([boost/bind.hpp])])
|
||||
|
||||
|
||||
+# BOOST_CHRONO()
|
||||
+# ------------------
|
||||
+# Look for Boost.Chrono
|
||||
+BOOST_DEFUN([Chrono],
|
||||
+[# Do we have to check for Boost.System? This link-time dependency was
|
||||
+# added as of 1.35.0. If we have a version <1.35, we must not attempt to
|
||||
+# find Boost.System as it didn't exist by then.
|
||||
+if test $boost_major_version -ge 135; then
|
||||
+BOOST_SYSTEM([$1])
|
||||
+fi # end of the Boost.System check.
|
||||
+boost_filesystem_save_LIBS=$LIBS
|
||||
+boost_filesystem_save_LDFLAGS=$LDFLAGS
|
||||
+m4_pattern_allow([^BOOST_SYSTEM_(LIBS|LDFLAGS)$])dnl
|
||||
+LIBS="$LIBS $BOOST_SYSTEM_LIBS"
|
||||
+LDFLAGS="$LDFLAGS $BOOST_SYSTEM_LDFLAGS"
|
||||
+BOOST_FIND_LIB([chrono], [$1],
|
||||
+ [boost/chrono.hpp],
|
||||
+ [boost::chrono::thread_clock d;])
|
||||
+if test $enable_static_boost = yes && test $boost_major_version -ge 135; then
|
||||
+ AC_SUBST([BOOST_FILESYSTEM_LIBS], ["$BOOST_FILESYSTEM_LIBS $BOOST_SYSTEM_LIBS"])
|
||||
+fi
|
||||
+LIBS=$boost_filesystem_save_LIBS
|
||||
+LDFLAGS=$boost_filesystem_save_LDFLAGS
|
||||
+
|
||||
+])# BOOST_CHRONO
|
||||
+
|
||||
+
|
||||
# BOOST_CONVERSION()
|
||||
# ------------------
|
||||
# Look for Boost.Conversion (cast / lexical_cast)
|
||||
-AC_DEFUN([BOOST_CONVERSION],
|
||||
+BOOST_DEFUN([Conversion],
|
||||
[BOOST_FIND_HEADER([boost/cast.hpp])
|
||||
BOOST_FIND_HEADER([boost/lexical_cast.hpp])
|
||||
])# BOOST_CONVERSION
|
||||
@@ -469,7 +520,7 @@
|
||||
# -----------------------------------
|
||||
# Look for Boost.Date_Time. For the documentation of PREFERRED-RT-OPT, see the
|
||||
# documentation of BOOST_FIND_LIB above.
|
||||
-AC_DEFUN([BOOST_DATE_TIME],
|
||||
+BOOST_DEFUN([Date_Time],
|
||||
[BOOST_FIND_LIB([date_time], [$1],
|
||||
[boost/date_time/posix_time/posix_time.hpp],
|
||||
[boost::posix_time::ptime t;])
|
||||
@@ -482,7 +533,7 @@
|
||||
# the documentation of BOOST_FIND_LIB above.
|
||||
# Do not check for boost/filesystem.hpp because this file was introduced in
|
||||
# 1.34.
|
||||
-AC_DEFUN([BOOST_FILESYSTEM],
|
||||
+BOOST_DEFUN([Filesystem],
|
||||
[# Do we have to check for Boost.System? This link-time dependency was
|
||||
# added as of 1.35.0. If we have a version <1.35, we must not attempt to
|
||||
# find Boost.System as it didn't exist by then.
|
||||
@@ -496,6 +547,9 @@
|
||||
LDFLAGS="$LDFLAGS $BOOST_SYSTEM_LDFLAGS"
|
||||
BOOST_FIND_LIB([filesystem], [$1],
|
||||
[boost/filesystem/path.hpp], [boost::filesystem::path p;])
|
||||
+if test $enable_static_boost = yes && test $boost_major_version -ge 135; then
|
||||
+ AC_SUBST([BOOST_FILESYSTEM_LIBS], ["$BOOST_FILESYSTEM_LIBS $BOOST_SYSTEM_LIBS"])
|
||||
+fi
|
||||
LIBS=$boost_filesystem_save_LIBS
|
||||
LDFLAGS=$boost_filesystem_save_LDFLAGS
|
||||
])# BOOST_FILESYSTEM
|
||||
@@ -504,7 +558,7 @@
|
||||
# BOOST_FOREACH()
|
||||
# ---------------
|
||||
# Look for Boost.Foreach
|
||||
-AC_DEFUN([BOOST_FOREACH],
|
||||
+BOOST_DEFUN([Foreach],
|
||||
[BOOST_FIND_HEADER([boost/foreach.hpp])])
|
||||
|
||||
|
||||
@@ -515,14 +569,14 @@
|
||||
# standalone. It can't be compiled because it triggers the following error:
|
||||
# boost/format/detail/config_macros.hpp:88: error: 'locale' in namespace 'std'
|
||||
# does not name a type
|
||||
-AC_DEFUN([BOOST_FORMAT],
|
||||
+BOOST_DEFUN([Format],
|
||||
[BOOST_FIND_HEADER([boost/format.hpp])])
|
||||
|
||||
|
||||
# BOOST_FUNCTION()
|
||||
# ----------------
|
||||
# Look for Boost.Function
|
||||
-AC_DEFUN([BOOST_FUNCTION],
|
||||
+BOOST_DEFUN([Function],
|
||||
[BOOST_FIND_HEADER([boost/function.hpp])])
|
||||
|
||||
|
||||
@@ -530,37 +584,60 @@
|
||||
# -------------------------------
|
||||
# Look for Boost.Graphs. For the documentation of PREFERRED-RT-OPT, see the
|
||||
# documentation of BOOST_FIND_LIB above.
|
||||
-AC_DEFUN([BOOST_GRAPH],
|
||||
+BOOST_DEFUN([Graph],
|
||||
[BOOST_FIND_LIB([graph], [$1],
|
||||
[boost/graph/adjacency_list.hpp], [boost::adjacency_list<> g;])
|
||||
])# BOOST_GRAPH
|
||||
|
||||
|
||||
# BOOST_IOSTREAMS([PREFERRED-RT-OPT])
|
||||
-# -------------------------------
|
||||
+# -----------------------------------
|
||||
# Look for Boost.IOStreams. For the documentation of PREFERRED-RT-OPT, see the
|
||||
# documentation of BOOST_FIND_LIB above.
|
||||
-AC_DEFUN([BOOST_IOSTREAMS],
|
||||
+BOOST_DEFUN([IOStreams],
|
||||
[BOOST_FIND_LIB([iostreams], [$1],
|
||||
[boost/iostreams/device/file_descriptor.hpp],
|
||||
- [boost::iostreams::file_descriptor fd(0); fd.close();])
|
||||
+ [boost::iostreams::file_descriptor fd; fd.close();])
|
||||
])# BOOST_IOSTREAMS
|
||||
|
||||
|
||||
# BOOST_HASH()
|
||||
# ------------
|
||||
# Look for Boost.Functional/Hash
|
||||
-AC_DEFUN([BOOST_HASH],
|
||||
+BOOST_DEFUN([Hash],
|
||||
[BOOST_FIND_HEADER([boost/functional/hash.hpp])])
|
||||
|
||||
|
||||
# BOOST_LAMBDA()
|
||||
# --------------
|
||||
# Look for Boost.Lambda
|
||||
-AC_DEFUN([BOOST_LAMBDA],
|
||||
+BOOST_DEFUN([Lambda],
|
||||
[BOOST_FIND_HEADER([boost/lambda/lambda.hpp])])
|
||||
|
||||
|
||||
+# BOOST_LOG([PREFERRED-RT-OPT])
|
||||
+# -----------------------------
|
||||
+# Look for Boost.Log For the documentation of PREFERRED-RT-OPT, see the
|
||||
+# documentation of BOOST_FIND_LIB above.
|
||||
+BOOST_DEFUN([Log],
|
||||
+[BOOST_FIND_LIB([log], [$1],
|
||||
+ [boost/log/core/core.hpp],
|
||||
+ [boost::log::attribute a; a.get_value();])
|
||||
+])# BOOST_LOG
|
||||
+
|
||||
+
|
||||
+# BOOST_LOG_SETUP([PREFERRED-RT-OPT])
|
||||
+# -----------------------------------
|
||||
+# Look for Boost.Log For the documentation of PREFERRED-RT-OPT, see the
|
||||
+# documentation of BOOST_FIND_LIB above.
|
||||
+BOOST_DEFUN([Log_Setup],
|
||||
+[AC_REQUIRE([BOOST_LOG])dnl
|
||||
+BOOST_FIND_LIB([log_setup], [$1],
|
||||
+ [boost/log/utility/init/from_settings.hpp],
|
||||
+ [boost::log::basic_settings<char> bs; bs.empty();])
|
||||
+])# BOOST_LOG_SETUP
|
||||
+
|
||||
+
|
||||
# BOOST_MATH()
|
||||
# ------------
|
||||
# Look for Boost.Math
|
||||
@@ -569,21 +646,21 @@
|
||||
# libboost_math_c99f, libboost_math_c99l, libboost_math_tr1,
|
||||
# libboost_math_tr1f, libboost_math_tr1l). This macro must be fixed to do the
|
||||
# right thing anyway.
|
||||
-AC_DEFUN([BOOST_MATH],
|
||||
+BOOST_DEFUN([Math],
|
||||
[BOOST_FIND_HEADER([boost/math/special_functions.hpp])])
|
||||
|
||||
|
||||
# BOOST_MULTIARRAY()
|
||||
# ------------------
|
||||
# Look for Boost.MultiArray
|
||||
-AC_DEFUN([BOOST_MULTIARRAY],
|
||||
+BOOST_DEFUN([MultiArray],
|
||||
[BOOST_FIND_HEADER([boost/multi_array.hpp])])
|
||||
|
||||
|
||||
# BOOST_NUMERIC_CONVERSION()
|
||||
# --------------------------
|
||||
# Look for Boost.NumericConversion (policy-based numeric conversion)
|
||||
-AC_DEFUN([BOOST_NUMERIC_CONVERSION],
|
||||
+BOOST_DEFUN([Numeric_Conversion],
|
||||
[BOOST_FIND_HEADER([boost/numeric/conversion/converter.hpp])
|
||||
])# BOOST_NUMERIC_CONVERSION
|
||||
|
||||
@@ -591,32 +668,76 @@
|
||||
# BOOST_OPTIONAL()
|
||||
# ----------------
|
||||
# Look for Boost.Optional
|
||||
-AC_DEFUN([BOOST_OPTIONAL],
|
||||
+BOOST_DEFUN([Optional],
|
||||
[BOOST_FIND_HEADER([boost/optional.hpp])])
|
||||
|
||||
|
||||
# BOOST_PREPROCESSOR()
|
||||
# --------------------
|
||||
# Look for Boost.Preprocessor
|
||||
-AC_DEFUN([BOOST_PREPROCESSOR],
|
||||
+BOOST_DEFUN([Preprocessor],
|
||||
[BOOST_FIND_HEADER([boost/preprocessor/repeat.hpp])])
|
||||
|
||||
|
||||
+# BOOST_UNORDERED()
|
||||
+# -----------------
|
||||
+# Look for Boost.Unordered
|
||||
+BOOST_DEFUN([Unordered],
|
||||
+[BOOST_FIND_HEADER([boost/unordered_map.hpp])])
|
||||
+
|
||||
+
|
||||
+# BOOST_UUID()
|
||||
+# ------------
|
||||
+# Look for Boost.Uuid
|
||||
+BOOST_DEFUN([Uuid],
|
||||
+[BOOST_FIND_HEADER([boost/uuid/uuid.hpp])])
|
||||
+
|
||||
+
|
||||
# BOOST_PROGRAM_OPTIONS([PREFERRED-RT-OPT])
|
||||
# -----------------------------------------
|
||||
-# Look for Boost.Program_options. For the documentation of PREFERRED-RT-OPT, see
|
||||
-# the documentation of BOOST_FIND_LIB above.
|
||||
-AC_DEFUN([BOOST_PROGRAM_OPTIONS],
|
||||
+# Look for Boost.Program_options. For the documentation of PREFERRED-RT-OPT,
|
||||
+# see the documentation of BOOST_FIND_LIB above.
|
||||
+BOOST_DEFUN([Program_Options],
|
||||
[BOOST_FIND_LIB([program_options], [$1],
|
||||
[boost/program_options.hpp],
|
||||
[boost::program_options::options_description d("test");])
|
||||
])# BOOST_PROGRAM_OPTIONS
|
||||
|
||||
|
||||
+
|
||||
+# _BOOST_PYTHON_CONFIG(VARIABLE, FLAG)
|
||||
+# ------------------------------------
|
||||
+# Save VARIABLE, and define it via `python-config --FLAG`.
|
||||
+# Substitute BOOST_PYTHON_VARIABLE.
|
||||
+m4_define([_BOOST_PYTHON_CONFIG],
|
||||
+[AC_SUBST([BOOST_PYTHON_$1],
|
||||
+ [`python-config --$2 2>/dev/null`])dnl
|
||||
+boost_python_save_$1=$$1
|
||||
+$1="$$1 $BOOST_PYTHON_$1"])
|
||||
+
|
||||
+
|
||||
+# BOOST_PYTHON([PREFERRED-RT-OPT])
|
||||
+# --------------------------------
|
||||
+# Look for Boost.Python. For the documentation of PREFERRED-RT-OPT,
|
||||
+# see the documentation of BOOST_FIND_LIB above.
|
||||
+BOOST_DEFUN([Python],
|
||||
+[_BOOST_PYTHON_CONFIG([CPPFLAGS], [includes])
|
||||
+_BOOST_PYTHON_CONFIG([LDFLAGS], [ldflags])
|
||||
+_BOOST_PYTHON_CONFIG([LIBS], [libs])
|
||||
+m4_pattern_allow([^BOOST_PYTHON_MODULE$])dnl
|
||||
+BOOST_FIND_LIB([python], [$1],
|
||||
+ [boost/python.hpp],
|
||||
+ [], [BOOST_PYTHON_MODULE(empty) {}])
|
||||
+CPPFLAGS=$boost_python_save_CPPFLAGS
|
||||
+LDFLAGS=$boost_python_save_LDFLAGS
|
||||
+LIBS=$boost_python_save_LIBS
|
||||
+])# BOOST_PYTHON
|
||||
+
|
||||
+
|
||||
# BOOST_REF()
|
||||
# -----------
|
||||
# Look for Boost.Ref
|
||||
-AC_DEFUN([BOOST_REF],
|
||||
+BOOST_DEFUN([Ref],
|
||||
[BOOST_FIND_HEADER([boost/ref.hpp])])
|
||||
|
||||
|
||||
@@ -624,7 +745,7 @@
|
||||
# -------------------------------
|
||||
# Look for Boost.Regex. For the documentation of PREFERRED-RT-OPT, see the
|
||||
# documentation of BOOST_FIND_LIB above.
|
||||
-AC_DEFUN([BOOST_REGEX],
|
||||
+BOOST_DEFUN([Regex],
|
||||
[BOOST_FIND_LIB([regex], [$1],
|
||||
[boost/regex.hpp],
|
||||
[boost::regex exp("*"); boost::regex_match("foo", exp);])
|
||||
@@ -635,19 +756,19 @@
|
||||
# ---------------------------------------
|
||||
# Look for Boost.Serialization. For the documentation of PREFERRED-RT-OPT, see
|
||||
# the documentation of BOOST_FIND_LIB above.
|
||||
-AC_DEFUN([BOOST_SERIALIZATION],
|
||||
+BOOST_DEFUN([Serialization],
|
||||
[BOOST_FIND_LIB([serialization], [$1],
|
||||
[boost/archive/text_oarchive.hpp],
|
||||
[std::ostream* o = 0; // Cheap way to get an ostream...
|
||||
boost::archive::text_oarchive t(*o);])
|
||||
-])# BOOST_SIGNALS
|
||||
+])# BOOST_SERIALIZATION
|
||||
|
||||
|
||||
# BOOST_SIGNALS([PREFERRED-RT-OPT])
|
||||
# ---------------------------------
|
||||
# Look for Boost.Signals. For the documentation of PREFERRED-RT-OPT, see the
|
||||
# documentation of BOOST_FIND_LIB above.
|
||||
-AC_DEFUN([BOOST_SIGNALS],
|
||||
+BOOST_DEFUN([Signals],
|
||||
[BOOST_FIND_LIB([signals], [$1],
|
||||
[boost/signal.hpp],
|
||||
[boost::signal<void ()> s;])
|
||||
@@ -657,7 +778,7 @@
|
||||
# BOOST_SMART_PTR()
|
||||
# -----------------
|
||||
# Look for Boost.SmartPtr
|
||||
-AC_DEFUN([BOOST_SMART_PTR],
|
||||
+BOOST_DEFUN([Smart_Ptr],
|
||||
[BOOST_FIND_HEADER([boost/scoped_ptr.hpp])
|
||||
BOOST_FIND_HEADER([boost/shared_ptr.hpp])
|
||||
])
|
||||
@@ -666,14 +787,14 @@
|
||||
# BOOST_STATICASSERT()
|
||||
# --------------------
|
||||
# Look for Boost.StaticAssert
|
||||
-AC_DEFUN([BOOST_STATICASSERT],
|
||||
+BOOST_DEFUN([StaticAssert],
|
||||
[BOOST_FIND_HEADER([boost/static_assert.hpp])])
|
||||
|
||||
|
||||
# BOOST_STRING_ALGO()
|
||||
# -------------------
|
||||
# Look for Boost.StringAlgo
|
||||
-AC_DEFUN([BOOST_STRING_ALGO],
|
||||
+BOOST_DEFUN([String_Algo],
|
||||
[BOOST_FIND_HEADER([boost/algorithm/string.hpp])
|
||||
])
|
||||
|
||||
@@ -683,7 +804,7 @@
|
||||
# Look for Boost.System. For the documentation of PREFERRED-RT-OPT, see the
|
||||
# documentation of BOOST_FIND_LIB above. This library was introduced in Boost
|
||||
# 1.35.0.
|
||||
-AC_DEFUN([BOOST_SYSTEM],
|
||||
+BOOST_DEFUN([System],
|
||||
[BOOST_FIND_LIB([system], [$1],
|
||||
[boost/system/error_code.hpp],
|
||||
[boost::system::error_code e; e.clear();])
|
||||
@@ -694,7 +815,7 @@
|
||||
# ------------------------------
|
||||
# Look for Boost.Test. For the documentation of PREFERRED-RT-OPT, see the
|
||||
# documentation of BOOST_FIND_LIB above.
|
||||
-AC_DEFUN([BOOST_TEST],
|
||||
+BOOST_DEFUN([Test],
|
||||
[m4_pattern_allow([^BOOST_CHECK$])dnl
|
||||
BOOST_FIND_LIB([unit_test_framework], [$1],
|
||||
[boost/test/unit_test.hpp], [BOOST_CHECK(2 == 2);],
|
||||
@@ -709,25 +830,49 @@
|
||||
# Look for Boost.Thread. For the documentation of PREFERRED-RT-OPT, see the
|
||||
# documentation of BOOST_FIND_LIB above.
|
||||
# FIXME: Provide an alias "BOOST_THREAD".
|
||||
-AC_DEFUN([BOOST_THREADS],
|
||||
+BOOST_DEFUN([Threads],
|
||||
[dnl Having the pthread flag is required at least on GCC3 where
|
||||
dnl boost/thread.hpp would complain if we try to compile without
|
||||
dnl -pthread on GNU/Linux.
|
||||
AC_REQUIRE([_BOOST_PTHREAD_FLAG])dnl
|
||||
boost_threads_save_LIBS=$LIBS
|
||||
+boost_threads_save_LDFLAGS=$LDFLAGS
|
||||
boost_threads_save_CPPFLAGS=$CPPFLAGS
|
||||
-LIBS="$LIBS $boost_cv_pthread_flag"
|
||||
+# Link-time dependency from thread to system was added as of 1.49.0.
|
||||
+if test $boost_major_version -ge 149; then
|
||||
+BOOST_SYSTEM([$1])
|
||||
+fi # end of the Boost.System check.
|
||||
+m4_pattern_allow([^BOOST_SYSTEM_(LIBS|LDFLAGS)$])dnl
|
||||
+LIBS="$LIBS $BOOST_SYSTEM_LIBS $boost_cv_pthread_flag"
|
||||
+LDFLAGS="$LDFLAGS $BOOST_SYSTEM_LDFLAGS"
|
||||
# Yes, we *need* to put the -pthread thing in CPPFLAGS because with GCC3,
|
||||
# boost/thread.hpp will trigger a #error if -pthread isn't used:
|
||||
# boost/config/requires_threads.hpp:47:5: #error "Compiler threading support
|
||||
# is not turned on. Please set the correct command line options for
|
||||
# threading: -pthread (Linux), -pthreads (Solaris) or -mthreads (Mingw32)"
|
||||
CPPFLAGS="$CPPFLAGS $boost_cv_pthread_flag"
|
||||
-BOOST_FIND_LIB([thread], [$1],
|
||||
- [boost/thread.hpp], [boost::thread t; boost::mutex m;])
|
||||
-BOOST_THREAD_LIBS="$BOOST_THREAD_LIBS $boost_cv_pthread_flag"
|
||||
+
|
||||
+# When compiling for the Windows platform, the threads library is named
|
||||
+# differently.
|
||||
+case $host_os in
|
||||
+ (*mingw*)
|
||||
+ BOOST_FIND_LIB([thread_win32], [$1],
|
||||
+ [boost/thread.hpp], [boost::thread t; boost::mutex m;])
|
||||
+ BOOST_THREAD_LDFLAGS=$BOOST_THREAD_WIN32_LDFLAGS
|
||||
+ BOOST_THREAD_LDPATH=$BOOST_THREAD_WIN32_LDPATH
|
||||
+ BOOST_THREAD_LIBS=$BOOST_THREAD_WIN32_LIBS
|
||||
+ ;;
|
||||
+ (*)
|
||||
+ BOOST_FIND_LIB([thread], [$1],
|
||||
+ [boost/thread.hpp], [boost::thread t; boost::mutex m;])
|
||||
+ ;;
|
||||
+esac
|
||||
+
|
||||
+BOOST_THREAD_LIBS="$BOOST_THREAD_LIBS $BOOST_SYSTEM_LIBS $boost_cv_pthread_flag"
|
||||
+BOOST_THREAD_LDFLAGS="$BOOST_SYSTEM_LDFLAGS"
|
||||
BOOST_CPPFLAGS="$BOOST_CPPFLAGS $boost_cv_pthread_flag"
|
||||
LIBS=$boost_threads_save_LIBS
|
||||
+LDFLAGS=$boost_threads_save_LDFLAGS
|
||||
CPPFLAGS=$boost_threads_save_CPPFLAGS
|
||||
])# BOOST_THREADS
|
||||
|
||||
@@ -735,14 +880,14 @@
|
||||
# BOOST_TOKENIZER()
|
||||
# -----------------
|
||||
# Look for Boost.Tokenizer
|
||||
-AC_DEFUN([BOOST_TOKENIZER],
|
||||
+BOOST_DEFUN([Tokenizer],
|
||||
[BOOST_FIND_HEADER([boost/tokenizer.hpp])])
|
||||
|
||||
|
||||
# BOOST_TRIBOOL()
|
||||
# ---------------
|
||||
# Look for Boost.Tribool
|
||||
-AC_DEFUN([BOOST_TRIBOOL],
|
||||
+BOOST_DEFUN([Tribool],
|
||||
[BOOST_FIND_HEADER([boost/logic/tribool_fwd.hpp])
|
||||
BOOST_FIND_HEADER([boost/logic/tribool.hpp])
|
||||
])
|
||||
@@ -751,36 +896,29 @@
|
||||
# BOOST_TUPLE()
|
||||
# -------------
|
||||
# Look for Boost.Tuple
|
||||
-AC_DEFUN([BOOST_TUPLE],
|
||||
+BOOST_DEFUN([Tuple],
|
||||
[BOOST_FIND_HEADER([boost/tuple/tuple.hpp])])
|
||||
|
||||
|
||||
# BOOST_TYPETRAITS()
|
||||
# --------------------
|
||||
# Look for Boost.TypeTraits
|
||||
-AC_DEFUN([BOOST_TYPETRAITS],
|
||||
+BOOST_DEFUN([TypeTraits],
|
||||
[BOOST_FIND_HEADER([boost/type_traits.hpp])])
|
||||
|
||||
-# BOOST_UNORDERED()
|
||||
-# ---------------
|
||||
-# Look for Boost.Unordered (unordered_map, unordered_set
|
||||
-# etc.)
|
||||
-AC_DEFUN([BOOST_UNORDERED],
|
||||
-[BOOST_FIND_HEADER([boost/unordered_map.hpp])
|
||||
-BOOST_FIND_HEADER([boost/unordered_set.hpp])])
|
||||
|
||||
# BOOST_UTILITY()
|
||||
# ---------------
|
||||
# Look for Boost.Utility (noncopyable, result_of, base-from-member idiom,
|
||||
# etc.)
|
||||
-AC_DEFUN([BOOST_UTILITY],
|
||||
+BOOST_DEFUN([Utility],
|
||||
[BOOST_FIND_HEADER([boost/utility.hpp])])
|
||||
|
||||
|
||||
# BOOST_VARIANT()
|
||||
# ---------------
|
||||
# Look for Boost.Variant.
|
||||
-AC_DEFUN([BOOST_VARIANT],
|
||||
+BOOST_DEFUN([Variant],
|
||||
[BOOST_FIND_HEADER([boost/variant/variant_fwd.hpp])
|
||||
BOOST_FIND_HEADER([boost/variant.hpp])])
|
||||
|
||||
@@ -791,15 +929,15 @@
|
||||
# call BOOST_THREADS first.
|
||||
# Look for Boost.Wave. For the documentation of PREFERRED-RT-OPT, see the
|
||||
# documentation of BOOST_FIND_LIB above.
|
||||
-AC_DEFUN([BOOST_WAVE],
|
||||
+BOOST_DEFUN([Wave],
|
||||
[AC_REQUIRE([BOOST_FILESYSTEM])dnl
|
||||
AC_REQUIRE([BOOST_DATE_TIME])dnl
|
||||
boost_wave_save_LIBS=$LIBS
|
||||
boost_wave_save_LDFLAGS=$LDFLAGS
|
||||
m4_pattern_allow([^BOOST_((FILE)?SYSTEM|DATE_TIME|THREAD)_(LIBS|LDFLAGS)$])dnl
|
||||
-LIBS="$LIBS $BOOST_SYSTEM_LIBS $BOOST_FILESYSTEM_LIBS $BOOST_DATE_TIME_LIBS\
|
||||
+LIBS="$LIBS $BOOST_SYSTEM_LIBS $BOOST_FILESYSTEM_LIBS $BOOST_DATE_TIME_LIBS \
|
||||
$BOOST_THREAD_LIBS"
|
||||
-LDFLAGS="$LDFLAGS $BOOST_SYSTEM_LDFLAGS $BOOST_FILESYSTEM_LDFLAGS\
|
||||
+LDFLAGS="$LDFLAGS $BOOST_SYSTEM_LDFLAGS $BOOST_FILESYSTEM_LDFLAGS \
|
||||
$BOOST_DATE_TIME_LDFLAGS $BOOST_THREAD_LDFLAGS"
|
||||
BOOST_FIND_LIB([wave], [$1],
|
||||
[boost/wave.hpp],
|
||||
@@ -812,7 +950,7 @@
|
||||
# BOOST_XPRESSIVE()
|
||||
# -----------------
|
||||
# Look for Boost.Xpressive (new since 1.36.0).
|
||||
-AC_DEFUN([BOOST_XPRESSIVE],
|
||||
+BOOST_DEFUN([Xpressive],
|
||||
[BOOST_FIND_HEADER([boost/xpressive/xpressive.hpp])])
|
||||
|
||||
|
||||
@@ -918,8 +1056,12 @@
|
||||
# como, edg, kcc, bck, mp, sw, tru, xlc
|
||||
# I'm not sure about my test for `il' (be careful: Intel's ICC pre-defines
|
||||
# the same defines as GCC's).
|
||||
- # TODO: Move the test on GCC 4.4 up once it's released.
|
||||
for i in \
|
||||
+ _BOOST_gcc_test(4, 8) \
|
||||
+ _BOOST_gcc_test(4, 7) \
|
||||
+ _BOOST_gcc_test(4, 6) \
|
||||
+ _BOOST_gcc_test(4, 5) \
|
||||
+ _BOOST_gcc_test(4, 4) \
|
||||
_BOOST_gcc_test(4, 3) \
|
||||
_BOOST_gcc_test(4, 2) \
|
||||
_BOOST_gcc_test(4, 1) \
|
||||
@@ -939,7 +1081,6 @@
|
||||
"defined __ICC && (defined __unix || defined __unix__) @ il" \
|
||||
"defined __ICL @ iw" \
|
||||
"defined _MSC_VER && _MSC_VER == 1300 @ vc7" \
|
||||
- _BOOST_gcc_test(4, 4) \
|
||||
_BOOST_gcc_test(2, 95) \
|
||||
"defined __MWERKS__ && __MWERKS__ <= 0x32FF @ cw9" \
|
||||
"defined _MSC_VER && _MSC_VER < 1300 && !defined UNDER_CE @ vc6" \
|
||||
10
libixion-0.5.0-libboost-1.52.patch
Normal file
10
libixion-0.5.0-libboost-1.52.patch
Normal file
@ -0,0 +1,10 @@
|
||||
--- ixion-0.5.0/include/ixion/global.hpp.orig 2013-02-12 22:07:31.740886279 +0100
|
||||
+++ ixion-0.5.0/include/ixion/global.hpp 2013-02-12 22:05:41.309023036 +0100
|
||||
@@ -35,6 +35,7 @@
|
||||
#include <boost/ptr_container/ptr_map.hpp>
|
||||
#include <boost/ptr_container/ptr_vector.hpp>
|
||||
#include <boost/interprocess/smart_ptr/unique_ptr.hpp>
|
||||
+#include <boost/noncopyable.hpp>
|
||||
|
||||
#define __IXION_DEBUG_OUT__ ::std::cout << __FILE__ << "#" << __LINE__ << ": "
|
||||
|
||||
97
libixion.spec
Normal file
97
libixion.spec
Normal file
@ -0,0 +1,97 @@
|
||||
Name: libixion
|
||||
Version: 0.3.0.git20130212
|
||||
Release: 1mamba
|
||||
Summary: A general purpose formula parser and interpreter that can calculate multiple named targets, or “cells”
|
||||
Group: System/Libraries
|
||||
Vendor: openmamba
|
||||
Distribution: openmamba
|
||||
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
|
||||
URL: http://gitorious.org/ixion/pages/Home
|
||||
# version 0.5.0 created from git
|
||||
Source: http://kohei.us/files/ixion/src/libixion-%{version}.tar.bz2
|
||||
Patch0: libixion-0.3.0-boost.m4.patch
|
||||
Patch1: libixion-0.3.0-automake.patch
|
||||
Patch2: libixion-0.5.0-libboost-1.52.patch
|
||||
License: MIT
|
||||
## AUTOBUILDREQ-BEGIN
|
||||
BuildRequires: glibc-devel
|
||||
BuildRequires: libboost-devel
|
||||
BuildRequires: libgcc
|
||||
BuildRequires: libstdc++6-devel
|
||||
## AUTOBUILDREQ-END
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
||||
|
||||
%description
|
||||
Ixion is a general purpose formula parser & interpreter that can calculate multiple named targets, or “cells”.
|
||||
|
||||
%package devel
|
||||
Group: Development/Libraries
|
||||
Summary: Development files for %{name}
|
||||
Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release}
|
||||
Requires: pkg-config
|
||||
|
||||
%description devel
|
||||
This package contains libraries and header files for developing applications that use %{name}.
|
||||
|
||||
%package tools
|
||||
Group: Applications/Publishing
|
||||
Summary: Utility applications for %{name}
|
||||
Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release}
|
||||
|
||||
%description tools
|
||||
This package contains utility applications for %{name}.
|
||||
|
||||
%debug_package
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
#%patch0 -p1
|
||||
#%patch1 -p1
|
||||
%patch2 -p1
|
||||
|
||||
%build
|
||||
#./autogen.sh
|
||||
%configure
|
||||
%make
|
||||
|
||||
%install
|
||||
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
|
||||
%makeinstall
|
||||
|
||||
%clean
|
||||
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
%postun -p /sbin/ldconfig
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/libixion-0.6.so.*
|
||||
%doc AUTHORS COPYING
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root)
|
||||
%dir %{_includedir}/libixion-0.6/ixion
|
||||
%{_includedir}/libixion-0.6/ixion/*.hpp
|
||||
%dir %{_includedir}/libixion-0.6/ixion/interface
|
||||
%{_includedir}/libixion-0.6/ixion/interface/*.hpp
|
||||
%dir %{_includedir}/libixion-0.6/ixion/hash_container
|
||||
%{_includedir}/libixion-0.6/ixion/hash_container/*.hpp
|
||||
%{_libdir}/libixion-0.6.a
|
||||
%{_libdir}/libixion-0.6.la
|
||||
%{_libdir}/libixion-0.6.so
|
||||
%{_libdir}/pkgconfig/libixion-0.6.pc
|
||||
%doc README
|
||||
|
||||
%files tools
|
||||
%defattr(-,root,root)
|
||||
%{_bindir}/ixion-parser
|
||||
%{_bindir}/ixion-sorter
|
||||
%{_bindir}/ixion-test
|
||||
|
||||
%changelog
|
||||
* Tue Feb 12 2013 Silvan Calarco <silvan.calarco@mambasoft.it> 0.3.0.git20130212-1mamba
|
||||
- update to 0.3.0.git20130212
|
||||
|
||||
* Tue Feb 12 2013 Silvan Calarco <silvan.calarco@mambasoft.it> 0.3.0-1mamba
|
||||
- package created by silvan using the webbuild interface
|
||||
Loading…
Reference in New Issue
Block a user