Changeset: bb44914049a8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bb44914049a8
Modified Files:
MonetDB.spec
configure.ag
Branch: Jun2016
Log Message:
Fix configure check for int128 type: it does work on EPEL 6.
diffs (86 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -9,10 +9,8 @@
%define bits 32
%else
%define bits 64
-%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
%define with_int128=1
%endif
-%endif
# only add .oidXX suffix if oid size differs from bit size
%if %{bits} == 64 && %{?oid32:1}%{!?oid32:0}
@@ -594,7 +592,7 @@ Requires: %{name}-client%{?_isa} = %{ver
Obsoletes: MonetDB5-server-rdf
%if (0%{?fedora} >= 22)
Recommends: %{name}-SQL-server5%{?_isa} = %{version}-%{release}
-%if %{?with_int128:1}%{!?with_int128:0}
+%if %{bits} == 64
Recommends: MonetDB5-server-hugeint%{?_isa} = %{version}-%{release}
%endif
Suggests: %{name}-client%{?_isa} = %{version}-%{release}
@@ -655,7 +653,7 @@ fi
%exclude %{_libdir}/monetdb5/rapi.mal
%endif
%exclude %{_libdir}/monetdb5/sql*.mal
-%if %{?with_int128:1}%{!?with_int128:0}
+%if %{bits} == 64
%exclude %{_libdir}/monetdb5/*_hge.mal
%exclude %{_libdir}/monetdb5/autoload/*_hge.mal
%endif
@@ -694,7 +692,7 @@ fi
%docdir %{_datadir}/doc/MonetDB
%{_datadir}/doc/MonetDB/*
-%if %{?with_int128:1}%{!?with_int128:0}
+%if %{bits} == 64
%package -n MonetDB5-server-hugeint
Summary: MonetDB - 128-bit integer support for MonetDB5-server
Group: Application/Databases
@@ -749,7 +747,7 @@ Requires: %{_bindir}/systemd-tmpfiles
Obsoletes: MonetDB-SQL-devel
Obsoletes: %{name}-SQL
%if (0%{?fedora} >= 22)
-%if %{?with_int128:1}%{!?with_int128:0}
+%if %{bits} == 64
Recommends: %{name}-SQL-server5-hugeint%{?_isa} = %{version}-%{release}
%endif
Suggests: %{name}-client%{?_isa} = %{version}-%{release}
@@ -802,7 +800,7 @@ systemd-tmpfiles --create %{_sysconfdir}
%endif
%{_libdir}/monetdb5/createdb/*.sql
%{_libdir}/monetdb5/sql*.mal
-%if %{?with_int128:1}%{!?with_int128:0}
+%if %{bits} == 64
%exclude %{_libdir}/monetdb5/createdb/*_hge.sql
%exclude %{_libdir}/monetdb5/sql*_hge.mal
%endif
@@ -812,7 +810,7 @@ systemd-tmpfiles --create %{_sysconfdir}
%docdir %{_datadir}/doc/MonetDB-SQL
%{_datadir}/doc/MonetDB-SQL/*
-%if %{?with_int128:1}%{!?with_int128:0}
+%if %{bits} == 64
%package SQL-server5-hugeint
Summary: MonetDB5 128 bit integer (hugeint) support for SQL
Group: Applications/Databases
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -2998,8 +2998,12 @@ case "$enable_int128" in
yes|auto)
have_hge=no
why_have_hge='(no 128-bit integer type found)'
- AC_CHECK_TYPES([__int128, __int128_t, __uint128_t], [have_hge=yes;
why_have_hge=''],
- [if test x$enable_int128 = xyes; then AC_MSG_ERROR([128-bit
integers not supported by platform]); fi])
+ AC_CHECK_TYPES([__int128, __int128_t, __uint128_t], [have_hge=yes;
why_have_hge=''])
+ if test $have_hge = no; then
+ if test x$enable_int128 = xyes; then
+ AC_MSG_ERROR([128-bit integers not supported by
platform])
+ fi
+ fi
;;
no)
have_hge=no
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
