Changeset: 86d3d8a2c6c3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=86d3d8a2c6c3
Modified Files:
MonetDB.spec
NT/monetdb_config.h.in
NT/rules.msc
README-Debian
README-Fedora
buildtools/doc/windowsbuild.rst
debian/control
Branch: default
Log Message:
Remove references to libatomic_ops. Not needed since changeset be419310b1ae.
diffs (127 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -141,12 +141,6 @@ BuildRequires: geos-devel >= 3.4.0
BuildRequires: liblas-devel >= 1.8.0
BuildRequires: pkgconfig(gdal)
%endif
-%if 0%{?rhel} >= 7
-# On RHEL 7, use the atomic_ops package for atomic operation.
-# On RHEL 6 the package is not available.
-# On Fedora, we use <stdatomic.h> from C11.
-BuildRequires: pkgconfig(atomic_ops)
-%endif
BuildRequires: pkgconfig(libcurl)
BuildRequires: pkgconfig(liblzma)
# BuildRequires: libmicrohttpd-devel
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -112,9 +112,6 @@
/* there is something very similar to asctime_r on Windows: */
#define asctime_r(t,b,s) asctime_s(b,s,t)
-/* Define to 1 if you have the <atomic_ops.h> header file. */
-/* #undef HAVE_ATOMIC_OPS_H */
-
/* Define to 1 if you have the `backtrace' function. */
/* #undef HAVE_BACKTRACE */
@@ -248,9 +245,6 @@
/* Define to 1 if you have the <langinfo.h> header file. */
/* #undef HAVE_LANGINFO_H */
-/* Define if you have the atomic_ops library */
-/* #undef HAVE_LIBATOMIC_OPS */
-
/* Define if you have the bz2 library */
/* #undef HAVE_LIBBZ2 */
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -114,13 +114,6 @@ LTLIBICONV = "$(LIBICONV)\lib\iconv.dll.
ICONV_CFLAGS = -DHAVE_ICONV "-I$(LIBICONV)\include"
!ENDIF
-!IFDEF HAVE_ATOMIC_OPS
-!IFNDEF LIBATOMIC_OPS
-LIBATOMIC_OPS = C:\atomic_ops-7.2
-!ENDIF
-ATOMIC_OPS_CFLAGS = -DHAVE_LIBATOMIC_OPS "-I$(LIBATOMIC_OPS)"
-!endif
-
!IFDEF HAVE_LIBZ
# This is the location of the ZLIB library
!IFNDEF LIBZLIB
@@ -219,7 +212,7 @@ COMPILERFLAGS = -GF -W3 $(W_CFLAGS) -MDd
# add -Zi flag (implies -debug, not -D_DEBUG) to get symbol info in .pdb files
COMPILERFLAGS = -GF -W3 $(W_CFLAGS) -MD -nologo -Ox -Zi -Oi
!ENDIF
-CFLAGS = $(COMPILERFLAGS) -I. -I$(TOPDIR) $(LIBC_INCS) $(INCLUDES)
$(WINCONFIG_INCS) $(ICONV_CFLAGS) $(ATOMIC_OPS_CFLAGS)
+CFLAGS = $(COMPILERFLAGS) -I. -I$(TOPDIR) $(LIBC_INCS) $(INCLUDES)
$(WINCONFIG_INCS) $(ICONV_CFLAGS)
# No general LDFLAGS needed
INSTALL = copy
diff --git a/README-Debian b/README-Debian
--- a/README-Debian
+++ b/README-Debian
@@ -16,7 +16,6 @@ pkg-config
These packages are optional, but required when building the MonetDB
.deb packages.
-libatomic-ops-dev # optional, but recommended
libbam-dev # optional: read BAM and SAM files
libbz2-dev # optional: read and write .bz2 compressed files
libcurl4-gnutls-dev # optional: read remote files with sys.getcontent(url)
diff --git a/README-Fedora b/README-Fedora
--- a/README-Fedora
+++ b/README-Fedora
@@ -18,7 +18,6 @@ bzip2-devel # optional: read and write
bzip2 # optional, required to create a tar ball (make dist)
checkpolicy # optional, required to create RPMs (make rpm)
geos-devel # optional: required for geom module
-libatomic_ops-devel # optional but recommended
libcurl-devel # optional: read remote files with sys.getcontent(url)
libuuid-devel # optional
pcre-devel # optional: use PCRE library, enable some functions
diff --git a/buildtools/doc/windowsbuild.rst b/buildtools/doc/windowsbuild.rst
--- a/buildtools/doc/windowsbuild.rst
+++ b/buildtools/doc/windowsbuild.rst
@@ -631,24 +631,6 @@ with the extra parameter ``HAVE_LIBBZ2=1
__ http://www.bzip.org/
-Libatomic_ops
--------------
-
-`Atomic Ops`__ is a library that provides semi-portable access to
-hardware-provided atomic memory update operations on a number of
-architectures. We optionally uses this to implement thread-safe
-access to a number of variables and for the implementation of locks.
-
-To install, it suffices to copy the file ``src\atomic_ops.h`` and the
-folder ``src\atomic_ops`` to the installation location in
-e.g. ``C:\Libraries``.
-
-Fix the ``LIBATOMIC_OPS`` definition in ``NT\rules.msc`` so that it
-refers to the location where you installed the header files and call
-``nmake`` with the extra parameter ``HAVE_ATOMIC_OPS=1``.
-
-__ https://github.com/ivmai/libatomic_ops
-
Build Environment
=================
diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: MonetDB BV <i...@monetdb.org
Homepage: https://www.monetdb.org/
Vcs-Browser: https://dev.monetdb.org/hg/MonetDB/
Vcs-Hg: https://dev.monetdb.org/hg/MonetDB/
-Build-Depends: debhelper (>= 9), autotools-dev, bison, libatomic-ops-dev,
+Build-Depends: debhelper (>= 9), autotools-dev, bison,
libbam-dev, libbz2-dev, libcurl4-gnutls-dev, libgeos-dev (>= 3.4.0),
libpcre3-dev, libreadline-dev, liblzma-dev,
libssl-dev, libxml2-dev, pkg-config,
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
