Changeset: 1de9069bd830 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1de9069bd830 Modified Files: ChangeLog.Aug2011 configure.ag Branch: Aug2011 Log Message:
perl: drop SWIG and perl development bits We no longer use SWIG, and no longer compile against perl. Theoretically we don't need to check for perl either, and could we transform it into --enable-perl if we didn't need to figure out where to install it. diffs (262 lines): diff --git a/ChangeLog.Aug2011 b/ChangeLog.Aug2011 new file mode 100644 --- /dev/null +++ b/ChangeLog.Aug2011 @@ -0,0 +1,6 @@ +# ChangeLog file for hgrepo +# This file is updated with Maddlog + +* Sun Jul 24 2011 Fabian Groffen <[email protected]> +- SWIG and Perl development requirements have been dropped + diff --git a/configure.ag b/configure.ag --- a/configure.ag +++ b/configure.ag @@ -524,8 +524,6 @@ dnl i.e., at the end of this configure[.ag] script. dnl Only GNU (gcc) and Intel ([ie]cc/[ie]cpc on Linux) are done so far. : ${X_CFLAGS=} # initialize to empty if not set -GCC_SWIG_CFLAGS="" -ICC_SWIG_CFLAGS="" if test "x$enable_strict" = xyes; then case "$GCC-$CC-$host_os" in yes-*-*) @@ -678,47 +676,6 @@ ;; esac - dnl GNU's gcc does not like to compile swig-generated code - dnl (at least not with our strict X_CFLAGS), complaining about - dnl "warning: dereferencing type-punned pointer will break strict-aliasing rules", - dnl "warning: unused variable '...'", - dnl "warning: '...' defined but not used", - dnl "warning: unused parameter '...'", - dnl 'error: "..." is not defined', and/or - dnl "warning: missing initializer". - dnl Hence, we use GCC_SWIG_CFLAGS to disable the respective warning - dnl as locally as possbile via "-Wno-strict-aliasing -Wno-unused-variable -Wno-unused-function -Wno-unused-parameter -Wno-undef -Wno-missing-field-initializers" - dnl (see also clients/perl/Cimpl/Makefile.ag). - GCC_SWIG_CFLAGS="$GCC_SWIG_CFLAGS -Wno-strict-aliasing -Wno-unused-variable -Wno-unused-function -Wno-unused-parameter -Wno-undef -Wno-unused-value" - case "$CC" in - *clang*) - ;; - *) - case "$gcc_ver" in - 4.[[3-9]].*|[[5-9]].*) - dnl clang (2.8) & gcc < 4.3 do not know this - GCC_SWIG_CFLAGS="$GCC_SWIG_CFLAGS -Wno-logical-op" - ;; - esac - case "$gcc_ver" in - 3.[[5-9]].*|4.[[0-4]].*) - dnl 3.4 < gcc < 4.5 trigger a warning (-> error) without this - GCC_SWIG_CFLAGS="$GCC_SWIG_CFLAGS -Wno-nonnull" - ;; - esac - ;; - esac - case "$gcc_ver" in - [[4-9]].*) - dnl -Wno-missing-field-initializers is only available as of gcc 4.* - GCC_SWIG_CFLAGS="$GCC_SWIG_CFLAGS -Wno-missing-field-initializers" - ;; - *) - dnl need to use -Wno-extra with older gcc - GCC_SWIG_CFLAGS="$GCC_SWIG_CFLAGS -Wno-extra" - ;; - esac - dnl GNU's gcc version 4.4 has very strict aliasing rules dnl which we fall foul of. The problem has to do with thing dnl like @@ -793,16 +750,6 @@ dnl #1572: floating-point equality and inequality comparisons are unreliable dnl #1599: declaration hides variable dnl #2259: non-pointer conversion from "." to "." may lose significant bits - - dnl Intel's icc does not like to compile swig-generated code - dnl (at least not with our strict X_CFLAGS), complaining about - dnl 'error #869: parameter "..." was never referenced', - dnl 'error #177: function "..." was declared but never referenced', and/or - dnl 'error #310: old-style parameter list (anachronism)'. - dnl Hence, we use ICC_SWIG_CFLAGS to disable the respective warning - dnl as locally as possbile via "-wd869 -wd177 -wd310" - dnl (see also clients/perl/Cimpl/Makefile.ag). - ICC_SWIG_CFLAGS="$ICC_SWIG_CFLAGS -wd869 -wd177 -wd310" ;; -*pgcc*-linux*) dnl Portland Group (PGI) (pgcc/pgCC on Linux) @@ -1299,8 +1246,6 @@ else AC_MSG_RESULT([no]) fi -AC_SUBST(GCC_SWIG_CFLAGS) -AC_SUBST(ICC_SWIG_CFLAGS) AC_MSG_CHECKING([for --enable-warning]) if test "x$enable_warning" = xyes; then @@ -1358,63 +1303,8 @@ AC_CHECK_PROGS(RPMBUILD,rpmbuild rpm) -AC_ARG_WITH(swig, - AS_HELP_STRING([--with-swig=FILE], [swig is installed as FILE]), - SWIG="$withval", - SWIG=swig) - -case "$SWIG" in - yes|auto) - SWIG=swig - ;; -esac - -case "$SWIG" in - no) ;; - /*) - AC_MSG_CHECKING(whether $SWIG exists and is executable) - if test -x "$SWIG"; then - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) - SWIG=no - fi - ;; - *) AC_PATH_PROG(SWIG,$SWIG,no,$PATH);; -esac - -if test "x$SWIG" != xno; then - # we want the right version... - req_swig_ver="1.3.20" - AC_MSG_CHECKING(whether $SWIG is >= $req_swig_ver) - swig_ver="`"$SWIG" -version 2>&1 | grep Version | sed -e 's|^[[^0-9]]*||' -e 's|[[^0-9]]*$||'`" - if test MONETDB_VERSION_TO_NUMBER(echo $swig_ver) -ge MONETDB_VERSION_TO_NUMBER(echo $req_swig_ver); then - AC_MSG_RESULT(yes: $swig_ver) - else - AC_MSG_RESULT(no: $swig_ver) - SWIG=no - fi -fi - -if test "x$SWIG" != xno; then - # ...and it must support -outdir - AC_MSG_CHECKING(whether $SWIG supports "-outdir") - case `$SWIG -help 2>&1` in - *-outdir*) - AC_MSG_RESULT(yes) - ;; - *) - AC_MSG_RESULT(no) - SWIG=no - ;; - esac -fi -AC_SUBST(SWIG) - have_perl=auto PERL=perl -PERL_INCS= -PERL_LIBS= AC_ARG_WITH(perl, AS_HELP_STRING([--with-perl=FILE], [perl is installed as FILE]), have_perl="$withval") @@ -1440,65 +1330,6 @@ fi if test "x$have_perl" != xno; then - have_perl_incdir=auto - AC_ARG_WITH(perl-incdir, - AS_HELP_STRING([--with-perl-incdir=DIR], - [Perl include directory]), - have_perl_incdir="$withval") - case "$have_perl_incdir" in - yes|auto) - if test x$cross_compiling = xyes; then - AC_MSG_ERROR([Must specify --with-perl-incdir --with-perl-libdir --with-perl-library when cross compiling]) - fi - PERL_INCS=`"$PERL" -MConfig -e 'print "$Config{archlib}/CORE"' 2>/dev/null` - ;; - no) ;; - *) - PERL_INCS="$have_perl_incdir" - have_perl_incdir=yes - ;; - esac - - if test "x$have_perl_incdir" != xno; then - PERL_INCS="-I$PERL_INCS" - save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $PERL_INCS" - AC_CHECK_HEADER(perl.h, :, [ - if test "x$have_perl_incdir" = xyes; then - AC_MSG_ERROR([No perl.h found, is Perl installed properly?]); - fi; - have_perl_incdir=no - ], [#include <EXTERN.h>]) - CPPFLAGS="$save_CPPFLAGS" - fi - - have_perl_library=auto - AC_ARG_WITH(perl-library, - AS_HELP_STRING([--with-perl-library=DIR], - [Perl library directory (where -lperl can be found)]), - have_perl_library="$withval") - case "$have_perl_library" in - yes|auto) - if test x$cross_compiling = xyes; then - AC_MSG_ERROR([Must specify --with-perl-incdir --with-perl-libdir --with-perl-library when cross compiling]) - fi - PERL_LIBS=`"$PERL" -MConfig -e 'print "$Config{archlib}/CORE"' 2>/dev/null` - dnl HACK(?) to find & use proper 32-bit libperl on 64-bit system (with default 64-bit perl) - if test "$bits" = "32" ; then - PERL_LIBS=`echo "$PERL_LIBS" | sed 's|/lib64/|/lib/|' 2>/dev/null` - fi - ;; - no) ;; - *) - PERL_LIBS="$have_perl_library" - have_perl_library=yes - ;; - esac - - if test "x$have_perl_library" != xno; then - PERL_LIBS="-L$PERL_LIBS -lperl" - fi - have_perl_libdir=auto AC_ARG_WITH(perl-libdir, AS_HELP_STRING([--with-perl-libdir=DIR], @@ -1519,33 +1350,13 @@ ;; esac else - # no Perl implies no Perl includes or libraries - have_perl_incdir=no - have_perl_libdir=no - # and no interpreter + # no Perl implies no interpreter PERL=`type -P false` fi -if test "x$have_perl_incdir" != xno -a "x$have_perl_libdir" != xno; then - save_CPPFLAGS="$CPPFLAGS" - save_LIBS="$LIBS" - CPPFLAGS="$CPPFLAGS $PERL_INCS" - LIBS="$LIBS $PERL_LIBS" - AC_MSG_CHECKING([whether we can compile with Perl]) - AC_TRY_LINK([#include <EXTERN.h> -#include <perl.h>], [], [AC_MSG_RESULT(yes)], - [ AC_MSG_RESULT(no); if test "x$have_perl_incdir" != xauto -o "x$have_perl_libdir" != xauto; then AC_MSG_ERROR([Cannot compile with Perl]); fi; have_perl_incdir=no have_perl_libdir=no ]) - CPPFLAGS="$save_CPPFLAGS" - LIBS="$save_LIBS" -fi - AC_SUBST(PERL) AM_CONDITIONAL(HAVE_PERL, test x"$have_perl" != xno) -AC_SUBST(PERL_INCS) -AC_SUBST(PERL_LIBS) AC_SUBST(PERL_LIBDIR) -AM_CONDITIONAL(HAVE_PERL_DEVEL, test "x$have_perl_incdir" != xno -a "x$have_perl_libdir" != xno) -AM_CONDITIONAL(HAVE_PERL_SWIG, test "x$have_perl_incdir" != xno -a "x$have_perl_libdir" != xno -a x"$SWIG" != xno) have_python=auto PYTHON=python _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
