[csw-devel] SF.net SVN: gar:[15327] csw/mgar/pkg/libexplain/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Fri Aug 12 23:35:23 CEST 2011
Revision: 15327
http://gar.svn.sourceforge.net/gar/?rev=15327&view=rev
Author: dmichelsen
Date: 2011-08-12 21:35:23 +0000 (Fri, 12 Aug 2011)
Log Message:
-----------
libexplain: Update to 0.45.D002, builds now, *phew*, some tests fail
Modified Paths:
--------------
csw/mgar/pkg/libexplain/trunk/Makefile
csw/mgar/pkg/libexplain/trunk/checksums
csw/mgar/pkg/libexplain/trunk/files/0002-Include-stdarg.h-for-va_list.patch
Added Paths:
-----------
csw/mgar/pkg/libexplain/trunk/files/0011-Make-sure-to-use-GCC-before-testing-GCC-specific-var.patch
csw/mgar/pkg/libexplain/trunk/files/0012-Shield-functions-not-available-on-Solaris-9-autoconf.patch
csw/mgar/pkg/libexplain/trunk/files/0013-Add-inttypes.h-to-binary-header.patch
Modified: csw/mgar/pkg/libexplain/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libexplain/trunk/Makefile 2011-08-12 15:34:58 UTC (rev 15326)
+++ csw/mgar/pkg/libexplain/trunk/Makefile 2011-08-12 21:35:23 UTC (rev 15327)
@@ -1,8 +1,11 @@
# $Id$
# TODO (release-critical prefixed with !, non release-critical with *)
#
+# * use linkage against libgnugetopt.so only on bin/explain and not the shared library
+# * inspect failed tests from the testsuite
+
NAME = libexplain
-VERSION = 0.44.D001
+VERSION = 0.45.D002
GARTYPE = v2
CATEGORIES = lib
@@ -10,21 +13,57 @@
define BLURB
endef
-PATCHFILES += 0001-Shield-ptrace-defines.patch
-PATCHFILES += 0002-Include-stdarg.h-for-va_list.patch
-PATCHFILES += 0003-Do-not-return-anything-in-void-functions.patch
+MASTER_SITES = $(SF_MIRROR)
+DISTFILES = $(DISTNAME).tar.gz
+
+#PATCHFILES += 0001-Shield-ptrace-defines.patch
+#PATCHFILES += 0002-Include-stdarg.h-for-va_list.patch
+#PATCHFILES += 0003-Do-not-return-anything-in-void-functions.patch
PATCHFILES += 0004-Use-fallback-for-AI_NUMERICSERV.patch
-PATCHFILES += 0005-Solaris-does-not-have-O_NOFOLLOW.patch
-PATCHFILES += 0006-Fix-typo-of-stat-struct-member.patch
-PATCHFILES += 0007-Need-headers-for-major-minor.patch
+#PATCHFILES += 0005-Solaris-does-not-have-O_NOFOLLOW.patch
+#PATCHFILES += 0006-Fix-typo-of-stat-struct-member.patch
+#PATCHFILES += 0007-Need-headers-for-major-minor.patch
PATCHFILES += 0008-inttypes.h-is-needed-for-int-_t.patch
-PATCHFILES += 0009-Use-necessary-mnttab.h.patch
+#PATCHFILES += 0009-Use-necessary-mnttab.h.patch
PATCHFILES += 0010-Include-sys-types.h-for-size_t.patch
+PATCHFILES += 0011-Make-sure-to-use-GCC-before-testing-GCC-specific-var.patch
+PATCHFILES += 0012-Shield-functions-not-available-on-Solaris-9-autoconf.patch
+PATCHFILES += 0013-Add-inttypes.h-to-binary-header.patch
-MASTER_SITES = $(SF_MIRROR)
-DISTFILES = $(DISTNAME).tar.gz
+LICENSE = LICENSE
+BUILD_DEP_PKGS += CSWlibgnugetopt-dev
+
+PACKAGES += CSWexplain
+SPKG_DESC_CSWexplain = Explains unix system call errors
+PKGFILES_CSWexplain += $(bindir)/.*
+PKGFILES_CSWexplain += $(mandir)/man1/.*
+RUNTIME_DEP_PKGS_CSWexplain += CSWlibexplain30
+RUNTIME_DEP_PKGS_CSWexplain += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWexplain += CSWlibgnugetopt0
+RUNTIME_DEP_PKGS_CSWexplain += CSWlibiconv2
+
+PACKAGES += CSWlibexplain30
+SPKG_DESC_CSWlibexplain30 = Explains unix system call errors, libexplain.so.30
+PKGFILES_CSWlibexplain30 += $(call pkgfiles_lib,libexplain.so.30)
+RUNTIME_DEP_PKGS_CSWlibexplain30 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibexplain30 += CSWlibgnugetopt0
+RUNTIME_DEP_PKGS_CSWlibexplain30 += CSWlibiconv2
+
+PACKAGES += CSWlibexplain-dev
+SPKG_DESC_CSWlibexplain-dev = Development files for libexplain.so.30
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWlibexplain-dev += CSWlibexplain30
+
+EXTRA_LINKER_FLAGS = -lgnugetopt
+
BUILD64 = 1
+# Several tests failing, skip for now
+SKIPTEST ?= 1
+
+TEST_OVERRIDE_VARS = SH
+TEST_OVERRIDE_VAR_SH = /bin/bash
+
include gar/category.mk
Modified: csw/mgar/pkg/libexplain/trunk/checksums
===================================================================
--- csw/mgar/pkg/libexplain/trunk/checksums 2011-08-12 15:34:58 UTC (rev 15326)
+++ csw/mgar/pkg/libexplain/trunk/checksums 2011-08-12 21:35:23 UTC (rev 15327)
@@ -1 +1 @@
-c85827069698600c0052397c9d6165eb libexplain-0.44.D001.tar.gz
+21616e801abe365218ea245579c8ff56 libexplain-0.45.D002.tar.gz
Modified: csw/mgar/pkg/libexplain/trunk/files/0002-Include-stdarg.h-for-va_list.patch
===================================================================
--- csw/mgar/pkg/libexplain/trunk/files/0002-Include-stdarg.h-for-va_list.patch 2011-08-12 15:34:58 UTC (rev 15326)
+++ csw/mgar/pkg/libexplain/trunk/files/0002-Include-stdarg.h-for-va_list.patch 2011-08-12 21:35:23 UTC (rev 15327)
@@ -1,12 +1,14 @@
-From adf28f82a857d088282db1f86bf5efd6e3827ef6 Mon Sep 17 00:00:00 2001
+From 06979b1ad037ca3bbb2af89f2861347e783c8da1 Mon Sep 17 00:00:00 2001
From: Dagobert Michelsen <dam at opencsw.org>
-Date: Tue, 12 Jul 2011 15:37:41 +0200
-Subject: [PATCH 02/10] Include stdarg.h for va_list
+Date: Tue, 12 Jul 2011 16:38:22 +0200
+Subject: [PATCH 2/2] Include stdarg.h for va_list
---
- libexplain/vfprintf.h | 1 +
- libexplain/vprintf.h | 1 +
- 2 files changed, 2 insertions(+), 0 deletions(-)
+ libexplain/vfprintf.h | 1 +
+ libexplain/vprintf.h | 1 +
+ libexplain/vsnprintf.h | 1 +
+ libexplain/vsprintf.h | 1 +
+ 4 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/libexplain/vfprintf.h b/libexplain/vfprintf.h
index d16fc49..9367b8c 100644
@@ -32,6 +34,30 @@
#ifdef __cplusplus
extern "C" {
+diff --git a/libexplain/vsnprintf.h b/libexplain/vsnprintf.h
+index 845a370..9616ec8 100644
+--- a/libexplain/vsnprintf.h
++++ b/libexplain/vsnprintf.h
+@@ -32,6 +32,7 @@
+ #include <libexplain/gcc_attributes.h>
+
+ #include <stdio.h>
++#include <stdarg.h>
+
+ #ifdef __cplusplus
+ extern "C" {
+diff --git a/libexplain/vsprintf.h b/libexplain/vsprintf.h
+index cd3acde..6a94a0e 100644
+--- a/libexplain/vsprintf.h
++++ b/libexplain/vsprintf.h
+@@ -32,6 +32,7 @@
+ #include <libexplain/gcc_attributes.h>
+
+ #include <stdio.h>
++#include <stdarg.h>
+
+ #ifdef __cplusplus
+ extern "C" {
--
1.7.6
Added: csw/mgar/pkg/libexplain/trunk/files/0011-Make-sure-to-use-GCC-before-testing-GCC-specific-var.patch
===================================================================
--- csw/mgar/pkg/libexplain/trunk/files/0011-Make-sure-to-use-GCC-before-testing-GCC-specific-var.patch (rev 0)
+++ csw/mgar/pkg/libexplain/trunk/files/0011-Make-sure-to-use-GCC-before-testing-GCC-specific-var.patch 2011-08-12 21:35:23 UTC (rev 15327)
@@ -0,0 +1,39 @@
+From 9c6c093a91998043cad2e34b793e54b469438fa2 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Fri, 12 Aug 2011 17:19:37 +0200
+Subject: [PATCH] Make sure to use GCC before testing GCC specific variables
+
+---
+ libexplain/putc_on_error.c | 2 +-
+ libexplain/putchar_on_error.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libexplain/putc_on_error.c b/libexplain/putc_on_error.c
+index 0661965..72d75b9 100644
+--- a/libexplain/putc_on_error.c
++++ b/libexplain/putc_on_error.c
+@@ -24,7 +24,7 @@
+ #include <libexplain/output.h>
+
+
+-#if __GNUC__ < 3
++#if defined(__GNUC__) && __GNUC__ < 3
+ static
+ #endif
+
+diff --git a/libexplain/putchar_on_error.c b/libexplain/putchar_on_error.c
+index ba46424..1f34319 100644
+--- a/libexplain/putchar_on_error.c
++++ b/libexplain/putchar_on_error.c
+@@ -24,7 +24,7 @@
+ #include <libexplain/output.h>
+
+
+-#if __GNUC__ < 3
++#if defined(__GNUC__) && __GNUC__ < 3
+ static
+ #endif
+
+--
+1.7.6
+
Added: csw/mgar/pkg/libexplain/trunk/files/0012-Shield-functions-not-available-on-Solaris-9-autoconf.patch
===================================================================
--- csw/mgar/pkg/libexplain/trunk/files/0012-Shield-functions-not-available-on-Solaris-9-autoconf.patch (rev 0)
+++ csw/mgar/pkg/libexplain/trunk/files/0012-Shield-functions-not-available-on-Solaris-9-autoconf.patch 2011-08-12 21:35:23 UTC (rev 15327)
@@ -0,0 +1,132 @@
+From 8ed03d015459dbffa371f3a11e348e680ce99d74 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Fri, 12 Aug 2011 18:27:01 +0200
+Subject: [PATCH] Shield functions not available on Solaris 9, autoconf
+ detection still missing
+
+---
+ libexplain/buffer/errno/strtof.c | 2 ++
+ libexplain/buffer/errno/strtold.c | 2 ++
+ libexplain/mkdtemp_on_error.c | 5 +++++
+ libexplain/setenv_on_error.c | 5 +++++
+ libexplain/strtof_on_error.c | 5 +++++
+ libexplain/strtold_on_error.c | 5 +++++
+ libexplain/unsetenv_on_error.c | 5 +++++
+ 7 files changed, 29 insertions(+), 0 deletions(-)
+
+diff --git a/libexplain/buffer/errno/strtof.c b/libexplain/buffer/errno/strtof.c
+index 004a1cc..bab13ad 100644
+--- a/libexplain/buffer/errno/strtof.c
++++ b/libexplain/buffer/errno/strtof.c
+@@ -73,7 +73,9 @@ explain_buffer_errno_strtof_explanation(explain_string_buffer_t *sb, int errnum,
+ */
+ ep = 0;
+ err = errno;
++#ifdef HAVE_STRTOF
+ n = strtof(nptr, &ep);
++#endif
+ errno = err;
+ if (ep == nptr)
+ {
+diff --git a/libexplain/buffer/errno/strtold.c b/libexplain/buffer/errno/strtold.c
+index e252f4d..36deb41 100644
+--- a/libexplain/buffer/errno/strtold.c
++++ b/libexplain/buffer/errno/strtold.c
+@@ -73,7 +73,9 @@ explain_buffer_errno_strtold_explanation(explain_string_buffer_t *sb,
+ */
+ ep = 0;
+ err = errno;
++#ifdef HAVE_STRTOLD
+ n = strtold(nptr, &ep);
++#endif
+ errno = err;
+ if (ep == nptr)
+ {
+diff --git a/libexplain/mkdtemp_on_error.c b/libexplain/mkdtemp_on_error.c
+index 1ce05ac..81dc2ff 100644
+--- a/libexplain/mkdtemp_on_error.c
++++ b/libexplain/mkdtemp_on_error.c
+@@ -29,7 +29,12 @@ explain_mkdtemp_on_error(char *pathname)
+ {
+ char *result;
+
++#ifdef HAVE_MKDTEMP
+ result = mkdtemp(pathname);
++#else
++ errno = ENOSYS;
++ result = -1;
++#endif
+ if (!result)
+ {
+ int hold_errno;
+diff --git a/libexplain/setenv_on_error.c b/libexplain/setenv_on_error.c
+index c1d3fb9..a367364 100644
+--- a/libexplain/setenv_on_error.c
++++ b/libexplain/setenv_on_error.c
+@@ -29,7 +29,12 @@ explain_setenv_on_error(const char *name, const char *value, int overwrite)
+ {
+ int result;
+
++#ifdef HAVE_SETENV
+ result = setenv(name, value, overwrite);
++#else
++ errno = ENOSYS;
++ result = -1;
++#endif
+ if (result < 0)
+ {
+ int hold_errno;
+diff --git a/libexplain/strtof_on_error.c b/libexplain/strtof_on_error.c
+index e2c35f9..e7d2eaf 100644
+--- a/libexplain/strtof_on_error.c
++++ b/libexplain/strtof_on_error.c
+@@ -34,7 +34,12 @@ explain_strtof_on_error(const char *nptr, char **endptr)
+ hold_errno = errno;
+ dummy = 0;
+ errno = 0;
++#ifdef HAVE_STRTOF
+ result = strtof(nptr, endptr ? endptr : &dummy);
++#else
++ errno = ENOSYS;
++ result = -1;
++#endif
+ if (errno == 0 && (endptr ? *endptr : dummy) == nptr)
+ {
+ /*
+diff --git a/libexplain/strtold_on_error.c b/libexplain/strtold_on_error.c
+index 3a5ce0f..7debe2a 100644
+--- a/libexplain/strtold_on_error.c
++++ b/libexplain/strtold_on_error.c
+@@ -34,7 +34,12 @@ explain_strtold_on_error(const char *nptr, char **endptr)
+ hold_errno = errno;
+ dummy = 0;
+ errno = 0;
++#ifdef HAVE_STRTOLD
+ result = strtold(nptr, endptr ? endptr : &dummy);
++#else
++ errno = ENOSYS;
++ result = -1;
++#endif
+ if (errno == 0 && (endptr ? *endptr : dummy) == nptr)
+ {
+ /*
+diff --git a/libexplain/unsetenv_on_error.c b/libexplain/unsetenv_on_error.c
+index d0258ed..77adbbc 100644
+--- a/libexplain/unsetenv_on_error.c
++++ b/libexplain/unsetenv_on_error.c
+@@ -29,7 +29,12 @@ explain_unsetenv_on_error(const char *name)
+ {
+ int result;
+
++#ifdef HAVE_UNSETENV
+ result = unsetenv(name);
++#else
++ errno = ENOSYS;
++ result = -1;
++#endif
+ if (result < 0)
+ {
+ int hold_errno;
+--
+1.7.5.4
+
Added: csw/mgar/pkg/libexplain/trunk/files/0013-Add-inttypes.h-to-binary-header.patch
===================================================================
--- csw/mgar/pkg/libexplain/trunk/files/0013-Add-inttypes.h-to-binary-header.patch (rev 0)
+++ csw/mgar/pkg/libexplain/trunk/files/0013-Add-inttypes.h-to-binary-header.patch 2011-08-12 21:35:23 UTC (rev 15327)
@@ -0,0 +1,25 @@
+From 971268294bccedb69147a08587a47e50d32e48a6 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Fri, 12 Aug 2011 22:31:17 +0200
+Subject: [PATCH] Add inttypes.h to binary header
+
+---
+ ioctl-scan/report.h | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/ioctl-scan/report.h b/ioctl-scan/report.h
+index fe2f2e4..a26c257 100644
+--- a/ioctl-scan/report.h
++++ b/ioctl-scan/report.h
+@@ -22,6 +22,8 @@
+
+ #include <libexplain/ac/stdint.h>
+
++#include <inttypes.h>
++
+ /**
+ * The report_int function may be used to print a line of results for
+ * an ioctl request.
+--
+1.7.6
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list