[csw-devel] SF.net SVN: gar:[21308] csw/mgar/pkg/gnutls3/trunk/Makefile

[chninkel at users.sourceforge.net]

Revision: 21308
          http://gar.svn.sourceforge.net/gar/?rev=21308&view=rev
Author:   chninkel
Date:     2013-06-08 17:20:48 +0000 (Sat, 08 Jun 2013)
Log Message:
-----------
gnutls3/trunk: disable libdane support and remove LD_OPTIONS that break tests

Modified Paths:
--------------
    csw/mgar/pkg/gnutls3/trunk/Makefile

Modified: csw/mgar/pkg/gnutls3/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnutls3/trunk/Makefile	2013-06-07 20:27:17 UTC (rev 21307)
+++ csw/mgar/pkg/gnutls3/trunk/Makefile	2013-06-08 17:20:48 UTC (rev 21308)
@@ -63,9 +63,6 @@
 
 PATCHFILES += 0001-no-gets-warning.patch
 
-# We don't need it and if defined the test breaks
-#LD_OPTIONS =
-
 # EXTRA_CPPFLAGS = -D_FILE_OFFSET_BITS=64
 
 BUILD64 = 1
@@ -73,12 +70,16 @@
 CONFIGURE_ARGS += $(DIRPATHS)
 CONFIGURE_ARGS += --with-lzo
 CONFIGURE_ARGS += --disable-guile
+CONFIGURE_ARGS += --disable-libdane
 CONFIGURE_ARGS += --with-default-trust-store-file=$(sysconfdir)/ssl/certs/ca-certificates.crt
 CONFIGURE_ARGS += --with-unbound-root-key-file=$(sysconfdir)/unbound/root.key
 # Workaround a host detection bug in configure for amd64
 CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(ISA))
 CONFIGURE_ARGS_amd64 += --build=x86_64-pc-solaris2$(shell uname -r |sed -e 's/[^.]*//')
 
+# If defined with the default value, the test breaks
+# # so we only keep the required items
+LD_OPTIONS = $(LINKER_MAPS) $(LINKER_DIRECT) $(LINKER_IGNORE)
 
 include gar/category.mk
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.