SF.net SVN: gar:[25262] csw/mgar/pkg/gnutls3/trunk/Makefile

[dmichelsen at users.sourceforge.net]

Revision: 25262
          http://sourceforge.net/p/gar/code/25262
Author:   dmichelsen
Date:     2015-10-01 13:24:03 +0000 (Thu, 01 Oct 2015)
Log Message:
-----------
gnutls3/trunk: Intermediate commit

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

Modified: csw/mgar/pkg/gnutls3/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnutls3/trunk/Makefile	2015-10-01 09:02:53 UTC (rev 25261)
+++ csw/mgar/pkg/gnutls3/trunk/Makefile	2015-10-01 13:24:03 UTC (rev 25262)
@@ -12,11 +12,11 @@
 MASTER_SITES = ftp://ftp.gnutls.org/gcrypt/gnutls/v$(SUBV)/
 DISTFILES += $(DISTNAME).tar.xz
 # PATCHFILES += 0001-Do-not-strip-norunpath.patch
-PATCHFILES += 0002-Use-AF_UNIX-instead-of-AF_LOCAL-on-Solaris.patch
+##PATCHFILES += 0002-Use-AF_UNIX-instead-of-AF_LOCAL-on-Solaris.patch
 
 # Some test scripts now uses some bashisms, so we make
 # sure that bash is used instead of sh
-PATCHFILES += 0003-force-use-of-bash-shell-in-non-portable-test-scripts.patch
+##PATCHFILES += 0003-force-use-of-bash-shell-in-non-portable-test-scripts.patch
 
 # Sun Studio 12 bails out on .deinit_func
 GARCOMPILER = GCC4
@@ -59,11 +59,12 @@
 SPKG_DESC_CSWlibgnutls-dev = Development Files for GNU TLS
 PKGFILES_CSWlibgnutls-dev = $(PKGFILES_DEVEL)
 RUNTIME_DEP_PKGS_CSWlibgnutls-dev += CSWlibgnutls28
+RUNTIME_DEP_PKGS_CSWlibgnutls-dev += CSWlibp11kit-dev
 
 # The compilation complains with 
 # "gets is a security hole - use fgets instead"
 # even if it is not used, so we remove this warning
-PATCHFILES += 0001-no-gets-warning.patch
+# PATCHFILES += 0001-no-gets-warning.patch
 
 # EXTRA_CPPFLAGS = -D_FILE_OFFSET_BITS=64
 
@@ -72,25 +73,25 @@
 CONFIGURE_ARGS += $(DIRPATHS)
 CONFIGURE_ARGS += --with-lzo
 CONFIGURE_ARGS += --disable-guile
-CONFIGURE_ARGS += --disable-libdane
+#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
 # libopts doesn't contains yet 64 bits libraries so we have to use
 # the included one meanwhile: see https://www.opencsw.org/mantis/view.php?id=5156
-CONFIGURE_ARGS += --enable-local-libopts
+# CONFIGURE_ARGS += --enable-local-libopts
 # 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/[^.]*//')
+##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)
+##LD_OPTIONS = $(LINKER_MAPS) $(LINKER_DIRECT) $(LINKER_IGNORE)
 
 include gar/category.mk
 
 # We must regerenere this file with autogen otherwise we run into an error like this:
 #    error option template version mismatches autoopts/options.h header
 # We simply delete them as they will be regenerated thanks to the Makefile rules
-pre-build:
+xxpre-build:
 	gfind $(WORKSRC) -regex ".*/src/.*-args.c" -delete
 	@$(MAKECOOKIE)

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