[m-rev.] diff: disable build of libatomic_ops_gpl.a

[Peter Ross]

Hi,

This may lead to a lot of changes to Makefile.in files, it does
on sparc solaris but I need to check under linux as well.

===================================================================


Estimated hours taken: 2
Branches: main

boehm_gc/libatomic_ops/src/Makefile.am:
	Disable the build of libatomic_ops_gpl.a as it doesn't
	build under sparc solaris 10, and it's not needed by
	the Mercury version of boehmgc.

Index: boehm_gc/libatomic_ops/src/Makefile.am
===================================================================
RCS file: /home/mercury1/repository/mercury/boehm_gc/libatomic_ops/src/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- boehm_gc/libatomic_ops/src/Makefile.am	16 Jul 2012 16:16:21 -0000	1.3
+++ boehm_gc/libatomic_ops/src/Makefile.am	29 Jul 2012 10:17:33 -0000	1.4
@@ -3,15 +3,21 @@
 AM_CFLAGS=@PICFLAG@
 AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_srcdir)/src
 
-include_HEADERS=atomic_ops.h atomic_ops_stack.h atomic_ops_malloc.h
-lib_LIBRARIES = libatomic_ops.a libatomic_ops_gpl.a
+# Disable the build of libatomic_ops_gpl.a as the Mercury compiler
+# doesn't need it and it doesn't build under Sparc Solaris 10
+#include_HEADERS=atomic_ops.h atomic_ops_stack.h atomic_ops_malloc.h
+#lib_LIBRARIES = libatomic_ops.a libatomic_ops_gpl.a
+include_HEADERS=atomic_ops.h
+lib_LIBRARIES = libatomic_ops.a
 if NEED_ASM
 libatomic_ops_a_SOURCES = atomic_ops.c atomic_ops_sysdeps.S
 else
 libatomic_ops_a_SOURCES = atomic_ops.c
 endif
 
-libatomic_ops_gpl_a_SOURCES = atomic_ops_stack.c atomic_ops_malloc.c
+# Disable the build of libatomic_ops_gpl.a as the Mercury compiler
+# doesn't need it and it doesn't build under Sparc Solaris 10
+#libatomic_ops_gpl_a_SOURCES = atomic_ops_stack.c atomic_ops_malloc.c
 
 EXTRA_DIST=Makefile.msft
 
--------------------------------------------------------------------------
mercury-reviews mailing list
Post messages to:       mercury-reviews at csse.unimelb.edu.au
Administrative Queries: owner-mercury-reviews at csse.unimelb.edu.au
Subscriptions:          mercury-reviews-request at csse.unimelb.edu.au
--------------------------------------------------------------------------