July 2011 - PPL-devel - BUGSENG Mailman

[doko@debian.org: Bug#625417: ppl: ftbfs with gcc-4.6 -Werror]
by Michael Tautschnig 08 Nov '11

08 Nov '11

Hi all, As you might have heard already, GCC 4.6 introduced a number of new warnings. As we build the package for Debian with -Werror turned on, these would cause build failures. If you agree that these warnings should be addressed, it would be nice if you could fix them upstream. Otherwise I will introduce Debian-specific patches to work around them. The best way to find all of them is take a look at the build log at http://people.debian.org/~doko/tmp/werror/ppl_0.11.2-3_lsid64.buildlog and search for -Wunused. Many of the warnings relate to ppl.hh, hence are easily fixed by changing the code it is generated from. Only a few others concern the tests. Thanks a lot, Michael PS.: If someone could afterwards tell me about the git commit ids that would makes things even easier :-) ----- Forwarded message from Matthias Klose <doko(a)debian.org> ----- Date: Tue, 03 May 2011 10:34:10 +0000 From: Matthias Klose <doko(a)debian.org> To: maintonly(a)bugs.debian.org Subject: Bug#625417: ppl: ftbfs with gcc-4.6 -Werror Reply-To: Matthias Klose <doko(a)debian.org>, 625417-maintonly(a)bugs.debian.org Package: ppl Version: 0.11.2-3 Severity: important Tags: wheezy sid User: debian-gcc(a)lists.debian.org Usertags: ftbfs-gcc-4.6 ftbfs-werror This package builds with -Werror, and GCC 4.6 triggers new warnings which will make the package fail to build. Currently a Debian patch just passes -Wno-error=unused-but-set-variable and -Wno-error=unused-but-set-parameter to avoid build failures, but this patch will be reverted with the GCC 4.6.1 release, and the severity of the report will be raised. The full build log can be found at: http://people.debian.org/~doko/tmp/werror/ppl_0.11.2-3_lsid64.buildlog The last lines of the build log are at the end of this report. ----- End forwarded message -----

2 1

PPL installation problems
by Adrien Champion 08 Nov '11

08 Nov '11

Hello, A few months ago, I managed to install and use PPL on my main computer, but now that I am trying to install it on my notebook I encounter problems. I should probably start by saying that the part I am interested in is the Java interface. The configure, make and make install work but when I try to run make for the java interface I get the following error: /bin/bash: no: command not found make[1]: *** [java_classes.stamp] Error 127 When looking closer however, the configure does not really work since it does not find all the java related commands: checking for javac... no checking for java... no checking for jar... no checking for javah... no configure: WARNING: unable to include <jni.h> Do you happen to have any solution for this problem ? Thank you in advance. Best, -- Adrien Champion PhD student Onera / Rockwell Collins France adrien.champion(a)onera.fr Onera: +33 (0)5 62 25 26 54 RCF: +33 (0)5 61 71 77 00

3 2

Re: [PPL-devel] Can't find GMP, but it's installed
by Roberto Bagnara 07 Nov '11

07 Nov '11

On 05/11/11 14:18, rafael ff1 wrote: > 2011/5/11 Roberto Bagnara<bagnara(a)cs.unipr.it>: >> >> What is the contents of the `config.log' file generated by the >> `configure' script? >> Cheers, >> >> Roberto >> >> -- >> Prof. Roberto Bagnara >> Applied Formal Methods Laboratory >> Department of Mathematics, University of Parma, Italy >> http://www.cs.unipr.it/~bagnara/ >> mailto:bagnara@cs.unipr.it >> _______________________________________________ >> PPL-devel mailing list >> PPL-devel(a)cs.unipr.it >> http://www.cs.unipr.it/mailman/listinfo/ppl-devel >> > > I'm sending as attachment a config.log for the aforementioned > configure script and another one with ld library path forced. Please > let me know if you don't receive it - some mail lists block > attachments... > > Rafael Hi Rafael, the config.log you sent does not seem to match the file fail-build.log you sent earlier. The latter says: checking how to link with libgmp... /usr/lib32/libgmp.so -Wl,-rpath -Wl,/usr/lib32 checking how to link with libgmpxx... /usr/lib32/libgmpxx.so /usr/lib32/libgmp.so -Wl,-rpath -Wl,/usr/lib32 -Wl,-rpath -Wl,/usr/lib32 which looks correct to me. The former says: configure:10129: checking how to link with libgmp configure:10602: result: /usr/lib/libgmp.so configure:10644: checking how to link with libgmpxx configure:11117: result: /usr/lib/libgmpxx.so /usr/lib/libgmp.so which is very different and very wrong, since it is because of that that later we have: configure:11252: g++ -m32 -o conftest -g -O2 -frounding-math -march=x86-64 -mtune=generic -O2 -pipe -Wl,--hash-style=gnu -Wl,--as-needed conftest.cpp /usr/lib/libgmpxx.so /usr/lib/libgmp.so >&5 /usr/lib/libgmpxx.so: could not read symbols: File in wrong format collect2: ld returned 1 exit status This is caused by the fact that g++ is given the x86_64 version of GMP. Please direct all messages to ppl-devel(a)cs.unipr.it. Cheers, Roberto -- Prof. Roberto Bagnara Applied Formal Methods Laboratory Department of Mathematics, University of Parma, Italy http://www.cs.unipr.it/~bagnara/ mailto:bagnara@cs.unipr.it

3 4

[GIT] ppl/ppl(master): Make sure we have a declaration of setrlimit() before trying to use it.
by Roberto Bagnara 28 Jul '11

28 Jul '11

Module: ppl/ppl Branch: master Commit: ffb68c3d33f787ec99856d129c82ad8328c343cb URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ffb68c3d33f7… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Thu Jul 28 09:53:52 2011 +0200 Make sure we have a declaration of setrlimit() before trying to use it. We still assume that a system that provides setrlimit() also provides getrlimit(), the converse being false for, e.g., Minix. (Thanks to Thomas Cort.) --- configure.ac | 6 +++--- demos/ppl_lcdd/ppl_lcdd.cc | 3 ++- demos/ppl_lpsol/ppl_lpsol.c | 3 ++- demos/ppl_pips/ppl_pips.cc | 2 +- m4/ac_cxx_limit_memory.m4 | 4 ++++ 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 8a675d9..eb56f66 100644 --- a/configure.ac +++ b/configure.ac @@ -1491,7 +1491,7 @@ AC_CHECK_DECLS([RLIMIT_DATA, RLIMIT_RSS, RLIMIT_VMEM, RLIMIT_AS], #endif ]) -AC_CHECK_DECLS([getrusage], +AC_CHECK_DECLS([getrusage, setrlimit], , , [ @@ -1502,6 +1502,7 @@ AC_CHECK_DECLS([getrusage], # include <sys/resource.h> #endif ]) + AC_CHECK_DECLS([sigaction], , , [#include <csignal>]) # Checks for typedefs, structures, and compiler characteristics. @@ -1510,8 +1511,7 @@ AC_CHECK_TYPES([siginfo_t], [], [], [[ #include <signal.h> ]]) -# Check whether the IEEE inexact flag is supported and available to -# C++ programs. +# Check whether we can limit memory in C and C++ using setrlimit(). AC_CXX_SUPPORTS_LIMITING_MEMORY # Checks for library functions. diff --git a/demos/ppl_lcdd/ppl_lcdd.cc b/demos/ppl_lcdd/ppl_lcdd.cc index e62e300..68e6f53 100644 --- a/demos/ppl_lcdd/ppl_lcdd.cc +++ b/demos/ppl_lcdd/ppl_lcdd.cc @@ -141,6 +141,7 @@ typedef Polyhedron* POLYHEDRON_TYPE; #endif #if defined(PPL_HAVE_SYS_RESOURCE_H) \ + && PPL_CXX_SUPPORTS_LIMITING_MEMORY \ && (defined(SA_ONESHOT) || defined(SA_RESETHAND)) # define PPL_LCDD_SUPPORTS_LIMIT_ON_CPU_TIME #endif @@ -331,7 +332,7 @@ set_alarm_on_cpu_time(const unsigned seconds, sig_handler_type handler) { #endif // PPL_LCDD_SUPPORTS_LIMIT_ON_CPU_TIME -#if PPL_HAVE_DECL_RLIMIT_AS +#if PPL_CXX_SUPPORTS_LIMITING_MEMORY && PPL_HAVE_DECL_RLIMIT_AS void limit_virtual_memory(const unsigned long bytes) { diff --git a/demos/ppl_lpsol/ppl_lpsol.c b/demos/ppl_lpsol/ppl_lpsol.c index cef707e..5c1e16a 100644 --- a/demos/ppl_lpsol/ppl_lpsol.c +++ b/demos/ppl_lpsol/ppl_lpsol.c @@ -96,6 +96,7 @@ static const char* ppl_source_version = PPL_VERSION; #endif #if defined(PPL_HAVE_SYS_RESOURCE_H) \ + && PPL_CXX_SUPPORTS_LIMITING_MEMORY \ && (defined(SA_ONESHOT) || defined(SA_RESETHAND)) # define PPL_LPSOL_SUPPORTS_LIMIT_ON_CPU_TIME #endif @@ -524,7 +525,7 @@ set_alarm_on_cpu_time(unsigned seconds, void (*handler)(int)) { #endif /* defined(PPL_LPSOL_SUPPORTS_LIMIT_ON_CPU_TIME) */ -#if PPL_HAVE_DECL_RLIMIT_AS +#if PPL_CXX_SUPPORTS_LIMITING_MEMORY && PPL_HAVE_DECL_RLIMIT_AS void limit_virtual_memory(unsigned long bytes) { diff --git a/demos/ppl_pips/ppl_pips.cc b/demos/ppl_pips/ppl_pips.cc index 51cdbac..69f2f8a 100644 --- a/demos/ppl_pips/ppl_pips.cc +++ b/demos/ppl_pips/ppl_pips.cc @@ -622,7 +622,7 @@ warning(const char* format, ...) { va_end(ap); } -#if PPL_HAVE_DECL_RLIMIT_AS +#if PPL_CXX_SUPPORTS_LIMITING_MEMORY && PPL_HAVE_DECL_RLIMIT_AS void limit_virtual_memory(const unsigned long bytes) { diff --git a/m4/ac_cxx_limit_memory.m4 b/m4/ac_cxx_limit_memory.m4 index a0151a5..a3332e1 100644 --- a/m4/ac_cxx_limit_memory.m4 +++ b/m4/ac_cxx_limit_memory.m4 @@ -30,6 +30,10 @@ AC_LANG_PUSH(C++) AC_MSG_CHECKING([whether we can limit memory in C++ using setrlimit()]) AC_RUN_IFELSE([AC_LANG_SOURCE([[ +#if !HAVE_DECL_SETRLIMIT +# error "cannot limit memory without setrlimit()" +#endif + #include <stdexcept> #ifdef HAVE_SYS_TYPES_H

1 0

[GIT] ppl/ppl(master): Added environment variable export.
by Roberto Bagnara 24 Jul '11

24 Jul '11

Module: ppl/ppl Branch: master Commit: a7cfa455ece8dc44193d01c6b63d2acf32b4f335 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a7cfa455ece8… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Jul 24 17:24:24 2011 +0200 Added environment variable export. --- m4/ac_check_gmp.m4 | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/m4/ac_check_gmp.m4 b/m4/ac_check_gmp.m4 index 03a37fb..35efd5c 100644 --- a/m4/ac_check_gmp.m4 +++ b/m4/ac_check_gmp.m4 @@ -76,6 +76,7 @@ ac_save_LIBS="$LIBS" LIBS="$LIBS $gmp_library_options" eval ac_save_shared_library_path_env_var="\$$shared_library_path_env_var" eval $shared_library_path_env_var=$gmp_library_paths +export $shared_library_path_env_var AC_LANG_PUSH(C++)

1 0

[GIT] ppl/ppl(master): Make sure the run-time tests for GMP can find GMP' s shared libraries.
by Roberto Bagnara 24 Jul '11

24 Jul '11

Module: ppl/ppl Branch: master Commit: 5436da20afde0109292c5cfda908b9c96622fe97 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=5436da20afde… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Jul 24 17:12:53 2011 +0200 Make sure the run-time tests for GMP can find GMP's shared libraries. --- configure.ac | 10 ++++++++++ m4/ac_check_gmp.m4 | 11 +++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 25951a9..8a675d9 100644 --- a/configure.ac +++ b/configure.ac @@ -501,23 +501,33 @@ case "${host_os}" in cygwin*) cygwin=yes no_undefined=yes + shared_library_path_env_var=PATH ;; darwin*) darwin=yes + shared_library_path_env_var=DYLD_LIBRARY_PATH + ;; +hpux*) + hpux=yes + shared_library_path_env_var=SHLIB_PATH ;; mingw*) mingw=yes no_undefined=yes + shared_library_path_env_var=PATH ;; solaris*) solaris=yes + shared_library_path_env_var=LD_LIBRARY_PATH ;; *) + shared_library_path_env_var=LD_LIBRARY_PATH ;; esac AM_CONDITIONAL(HOST_OS_CYGWIN, test x$cygwin = xyes) AM_CONDITIONAL(HOST_OS_DARWIN, test x$darwin = xyes) +AM_CONDITIONAL(HOST_OS_HPUX, test x$hpux = xyes) AM_CONDITIONAL(HOST_OS_MINGW, test x$mingw = xyes) AM_CONDITIONAL(HOST_OS_SOLARIS, test x$solaris = xyes) diff --git a/m4/ac_check_gmp.m4 b/m4/ac_check_gmp.m4 index f00cb6d..03a37fb 100644 --- a/m4/ac_check_gmp.m4 +++ b/m4/ac_check_gmp.m4 @@ -38,7 +38,8 @@ AC_ARG_WITH(gmp-lib, if test -n "$with_gmp" then gmp_include_options="-I$with_gmp/include" - gmp_library_options="-L$with_gmp/lib" + gmp_library_paths="$with_gmp/lib" + gmp_library_options="-L$gmp_library_paths" fi if test -n "$with_gmp_include" @@ -48,7 +49,8 @@ fi if test -n "$with_gmp_lib" then - gmp_library_options="-L$with_gmp_lib" + gmp_library_paths="$with_gmp_lib/lib" + gmp_library_options="-L$gmp_library_paths" fi AC_ARG_WITH(gmp-build, @@ -59,6 +61,7 @@ AC_ARG_WITH(gmp-build, || test -n "$with_gmp_include" || test -n "$with_gmp_lib" then gmp_include_options="-I$gmp_build_dir -I$gmp_build_dir/tune" + gmp_library_paths="$gmp_build_dir:$gmp_build_dir/.libs:$gmp_build_dir/tune" gmp_library_options="-L$gmp_build_dir -L$gmp_build_dir/.libs" gmp_library_options="$gmp_library_options -L$gmp_build_dir/tune" else @@ -71,6 +74,9 @@ ac_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $gmp_include_options" ac_save_LIBS="$LIBS" LIBS="$LIBS $gmp_library_options" +eval ac_save_shared_library_path_env_var="\$$shared_library_path_env_var" +eval $shared_library_path_env_var=$gmp_library_paths + AC_LANG_PUSH(C++) AC_MSG_CHECKING([for the GMP library version 4.1.3 or above]) @@ -210,6 +216,7 @@ AC_DEFINE_UNQUOTED(PPL_GMP_SUPPORTS_EXCEPTIONS, $value, fi AC_LANG_POP(C++) +eval $shared_library_path_env_var=$ac_save_shared_library_path_env_var LIBS="$ac_save_LIBS" CPPFLAGS="$ac_save_CPPFLAGS" ])

1 0

[GIT] ppl/ppl(master): Fixed uses of PPL_HAVE_DECL_GETRUSAGE.
by Roberto Bagnara 23 Jul '11

23 Jul '11

Module: ppl/ppl Branch: master Commit: dd51d715bd632799ef00cc9ceb5814f120927a05 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=dd51d715bd63… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Jul 23 14:12:41 2011 +0200 Fixed uses of PPL_HAVE_DECL_GETRUSAGE. (Thanks to Thomas Cort.) --- utils/timings.cc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/timings.cc b/utils/timings.cc index 819d965..243cf06 100644 --- a/utils/timings.cc +++ b/utils/timings.cc @@ -51,7 +51,7 @@ static struct timeval saved_ru_utime; void start_clock() { -#if defined(PPL_HAVE_DECL_GETRUSAGE) && defined(PPL_HAVE_TIMEVAL) +#if PPL_HAVE_DECL_GETRUSAGE && defined(PPL_HAVE_TIMEVAL) struct rusage rsg; if (getrusage(RUSAGE_SELF, &rsg) != 0) { cerr << "getrusage failed: " << strerror(errno) << endl; @@ -64,7 +64,7 @@ start_clock() { void print_clock(ostream& s) { -#if defined(PPL_HAVE_DECL_GETRUSAGE) && defined(PPL_HAVE_TIMEVAL) +#if PPL_HAVE_DECL_GETRUSAGE && defined(PPL_HAVE_TIMEVAL) struct rusage rsg; if (getrusage(RUSAGE_SELF, &rsg) != 0) { cerr << "getrusage failed: " << strerror(errno) << endl;

2 3

[GIT] ppl/ppl(master): New configure options `--with-gmp=DIR', `--with-gmp-include=DIR' and
by Roberto Bagnara 23 Jul '11

23 Jul '11

Module: ppl/ppl Branch: master Commit: 1f0282c0cb86a7a9d86fb21721b985bab2b60bd5 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1f0282c0cb86… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Jul 23 12:36:26 2011 +0200 New configure options `--with-gmp=DIR', `--with-gmp-include=DIR' and `--with-gmp-lib=DIR'. These supersede the (now removed) option `--with-gmp-prefix'. (The old option never really worked; hopefully this is the last change in this area.) --- NEWS | 15 +- configure.ac | 4 +- m4/Makefile.am | 3 - m4/ac_check_gmp.m4 | 67 +++-- m4/lib-ld.m4 | 109 -------- m4/lib-link.m4 | 777 ---------------------------------------------------- m4/lib-prefix.m4 | 224 --------------- 7 files changed, 51 insertions(+), 1148 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=1f0282c0…

1 0

[GIT] ppl/ppl(master): Updated.
by Roberto Bagnara 20 Jul '11

20 Jul '11

Module: ppl/ppl Branch: master Commit: 7cb6f2087a64f4c9d15a15b2b9f38b7792780c35 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=7cb6f2087a64… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Wed Jul 20 19:19:17 2011 +0200 Updated. --- m4/lib-ld.m4 | 27 ++++++++++++------------- m4/lib-link.m4 | 55 +++++++++++++++++++++++++++++++++-------------------- m4/lib-prefix.m4 | 2 +- 3 files changed, 48 insertions(+), 36 deletions(-) diff --git a/m4/lib-ld.m4 b/m4/lib-ld.m4 index e4863f2..ae003f7 100644 --- a/m4/lib-ld.m4 +++ b/m4/lib-ld.m4 @@ -1,5 +1,5 @@ -# lib-ld.m4 serial 4 (gettext-0.18) -dnl Copyright (C) 1996-2003, 2009 Free Software Foundation, Inc. +# lib-ld.m4 serial 5 (gettext-0.18.2) +dnl Copyright (C) 1996-2003, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -31,15 +31,14 @@ AC_REQUIRE([AC_CANONICAL_HOST])dnl # Prepare PATH_SEPARATOR. # The user is always right. if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh + # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which + # contains only /bin. Note that ksh looks also at the FPATH variable, + # so we have to set that as well for the test. + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + || PATH_SEPARATOR=';' + } fi ac_prog=ld if test "$GCC" = yes; then @@ -59,7 +58,7 @@ if test "$GCC" = yes; then # Canonicalize the path of ld ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do - ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` + ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` done test -z "$LD" && LD="$ac_prog" ;; @@ -89,9 +88,9 @@ AC_CACHE_VAL([acl_cv_path_LD], # Break only if it was the GNU/non-GNU ld that we prefer. case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in *GNU* | *'with BFD'*) - test "$with_gnu_ld" != no && break ;; + test "$with_gnu_ld" != no && break ;; *) - test "$with_gnu_ld" != yes && break ;; + test "$with_gnu_ld" != yes && break ;; esac fi done diff --git a/m4/lib-link.m4 b/m4/lib-link.m4 index 2f8b7ff..e7c9ba9 100644 --- a/m4/lib-link.m4 +++ b/m4/lib-link.m4 @@ -1,5 +1,5 @@ -# lib-link.m4 serial 20 (gettext-0.18) -dnl Copyright (C) 2001-2009 Free Software Foundation, Inc. +# lib-link.m4 serial 26 (gettext-0.18.2) +dnl Copyright (C) 2001-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -18,9 +18,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS], [ AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) AC_REQUIRE([AC_LIB_RPATH]) - pushdef([Name],[translit([$1],[./-], [___])]) - pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + pushdef([Name],[m4_translit([$1],[./+-], [____])]) + pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [ AC_LIB_LINKFLAGS_BODY([$1], [$2]) ac_cv_lib[]Name[]_libs="$LIB[]NAME" @@ -58,9 +58,9 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], [ AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) AC_REQUIRE([AC_LIB_RPATH]) - pushdef([Name],[translit([$1],[./-], [___])]) - pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + pushdef([Name],[m4_translit([$1],[./+-], [____])]) + pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME dnl accordingly. @@ -74,8 +74,19 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [ ac_save_LIBS="$LIBS" - LIBS="$LIBS $LIB[]NAME" - AC_TRY_LINK([$3], [$4], + dnl If $LIB[]NAME contains some -l options, add it to the end of LIBS, + dnl because these -l options might require -L options that are present in + dnl LIBS. -l options benefit only from the -L options listed before it. + dnl Otherwise, add it to the front of LIBS, because it may be a static + dnl library that depends on another static library that is present in LIBS. + dnl Static libraries benefit only from the static libraries listed after + dnl it. + case " $LIB[]NAME" in + *" -l"*) LIBS="$LIBS $LIB[]NAME" ;; + *) LIBS="$LIB[]NAME $LIBS" ;; + esac + AC_LINK_IFELSE( + [AC_LANG_PROGRAM([[$3]], [[$4]])], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])']) LIBS="$ac_save_LIBS" @@ -105,6 +116,8 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], dnl Determine the platform dependent parameters needed to use rpath: dnl acl_libext, dnl acl_shlibext, +dnl acl_libname_spec, +dnl acl_library_names_spec, dnl acl_hardcode_libdir_flag_spec, dnl acl_hardcode_libdir_separator, dnl acl_hardcode_direct, @@ -147,15 +160,15 @@ dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar dnl macro call that searches for libname. AC_DEFUN([AC_LIB_FROMPACKAGE], [ - pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) define([acl_frompackage_]NAME, [$2]) popdef([NAME]) pushdef([PACK],[$2]) - pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) define([acl_libsinpackage_]PACKUP, - m4_ifdef([acl_libsinpackage_]PACKUP, [acl_libsinpackage_]PACKUP[[, ]],)[lib$1]) + m4_ifdef([acl_libsinpackage_]PACKUP, [m4_defn([acl_libsinpackage_]PACKUP)[, ]],)[lib$1]) popdef([PACKUP]) popdef([PACK]) ]) @@ -168,14 +181,14 @@ dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem. AC_DEFUN([AC_LIB_LINKFLAGS_BODY], [ AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) - pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])]) - pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])]) dnl Autoconf >= 2.61 supports dots in --with options. - pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit(PACK,[.],[_])],PACK)]) + pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[m4_translit(PACK,[.],[_])],PACK)]) dnl By default, look in $includedir and $libdir. use_additional=yes AC_LIB_WITH_FINAL_PREFIX([ @@ -232,7 +245,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], names_already_handled="$names_already_handled $name" dnl See if it was already located by an earlier AC_LIB_LINKFLAGS dnl or AC_LIB_HAVE_LINKFLAGS call. - uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` + uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'` eval value=\"\$HAVE_LIB$uppername\" if test -n "$value"; then if test "$value" = yes; then diff --git a/m4/lib-prefix.m4 b/m4/lib-prefix.m4 index 4b7ee33..7e5f0bd 100644 --- a/m4/lib-prefix.m4 +++ b/m4/lib-prefix.m4 @@ -1,5 +1,5 @@ # lib-prefix.m4 serial 7 (gettext-0.18) -dnl Copyright (C) 2001-2005, 2008-2009 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2005, 2008-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved.

1 0

[GIT] ppl/ppl(bounded_arithmetic): Added new control on the second parameter of the operator<< and operator>>
by Alberto Gioia 18 Jul '11

18 Jul '11

Module: ppl/ppl Branch: bounded_arithmetic Commit: e6269c05822db0b1baafe700a108030a0b362523 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e6269c05822d… Author: Alberto Gioia <alberto.gioia1(a)studenti.unipr.it> Date: Mon Jul 18 12:37:18 2011 +0200 Added new control on the second parameter of the operator<< and operator>> function, respectively for the two bitwise operators. --- src/Linear_Form.templates.hh | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Linear_Form.templates.hh b/src/Linear_Form.templates.hh index ea00c35..2240a2a 100644 --- a/src/Linear_Form.templates.hh +++ b/src/Linear_Form.templates.hh @@ -606,7 +606,9 @@ operator<<(Linear_Form<C>& f, const C& n) { dimension_type f_size = f.size(); - if (f >= zero) { + if (n == zero) + return f = Linear_Form<C>(zero); + else if (f >= zero) { if (n >= zero) { exp.assign((typename C::boundary_type)ldexp(1.0, n.lower())); exp.join_assign((typename C::boundary_type)ldexp(1.0, n.upper())); @@ -682,7 +684,9 @@ operator>>(Linear_Form<C>& f, const C& n) { dimension_type f_size = f.size(); - if (f >= zero) { + if (n == zero) + return f = Linear_Form<C>(zero); + else if (f >= zero) { if (n >= zero) { exp.assign((typename C::boundary_type)ldexp(1.0, n.lower())); exp.join_assign((typename C::boundary_type)ldexp(1.0, n.upper()));

1 0