SF.net SVN: gar:[24499] csw/mgar/pkg/git/trunk

[bdwalton at users.sourceforge.net]

Revision: 24499
          http://sourceforge.net/p/gar/code/24499
Author:   bdwalton
Date:     2014-12-21 11:13:13 +0000 (Sun, 21 Dec 2014)
Log Message:
-----------
git/trunk: remove two more patches that are now upstream

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

Removed Paths:
-------------
    csw/mgar/pkg/git/trunk/files/0006-Do-not-make-trace.c-getnanotime-and-inlined-function.patch
    csw/mgar/pkg/git/trunk/files/0007-Fix-a-hashbang-issue-in-the-test-suite.patch

Modified: csw/mgar/pkg/git/trunk/Makefile
===================================================================
--- csw/mgar/pkg/git/trunk/Makefile	2014-12-21 10:58:57 UTC (rev 24498)
+++ csw/mgar/pkg/git/trunk/Makefile	2014-12-21 11:13:13 UTC (rev 24499)
@@ -99,9 +99,6 @@
 PATCHFILES += 0003-Use-bash-and-set-PATH-in-contributed-hook-file.patch
 PATCHFILES += 0004-Add-OpenCSW-apache2-path-to-instaweb-search-path.patch
 
-PATCHFILES += 0006-Do-not-make-trace.c-getnanotime-and-inlined-function.patch
-PATCHFILES += 0007-Fix-a-hashbang-issue-in-the-test-suite.patch
-
 # this patch is required on current9s (not necessarily all sparc boxes) due
 # to the selection of available utf8 locales.
 PATCHFILES_isa-sparcv8 += 0005-Force-en_US.UTF-8-for-a-git-svn-test.patch

Deleted: csw/mgar/pkg/git/trunk/files/0006-Do-not-make-trace.c-getnanotime-and-inlined-function.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/0006-Do-not-make-trace.c-getnanotime-and-inlined-function.patch	2014-12-21 10:58:57 UTC (rev 24498)
+++ csw/mgar/pkg/git/trunk/files/0006-Do-not-make-trace.c-getnanotime-and-inlined-function.patch	2014-12-21 11:13:13 UTC (rev 24499)
@@ -1,35 +0,0 @@
-From 1c56cdfaa14f59af95c73ac1d1ec46200cd47e16 Mon Sep 17 00:00:00 2001
-From: Ben Walton <bdwalton at gmail.com>
-Date: Sat, 27 Sep 2014 19:35:18 +0100
-Subject: [PATCH] Do not make trace.c/getnanotime and inlined function
-
-Oracle Studio compilers don't allow for static variables in functions
-that are defined to be inline. GNU C does permit this. Let's reference
-the C99 standard though, which doesn't allow for inline functions to
-contain modifiable static variables.
-
-As the use of trace.c/getnanotime extends beyond the local translation
-unit, normal object code is generated for it anyway. Remove the inline
-statement from the function definition.
-
-Signed-off-by: Ben Walton <bdwalton at gmail.com>
----
- trace.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/trace.c b/trace.c
-index b6f25a2..4778608 100644
---- a/trace.c
-+++ b/trace.c
-@@ -385,7 +385,7 @@ static inline uint64_t gettimeofday_nanos(void)
-  * Returns nanoseconds since the epoch (01/01/1970), for performance tracing
-  * (i.e. favoring high precision over wall clock time accuracy).
-  */
--inline uint64_t getnanotime(void)
-+uint64_t getnanotime(void)
- {
- 	static uint64_t offset;
- 	if (offset > 1) {
--- 
-1.9.1
-

Deleted: csw/mgar/pkg/git/trunk/files/0007-Fix-a-hashbang-issue-in-the-test-suite.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/0007-Fix-a-hashbang-issue-in-the-test-suite.patch	2014-12-21 10:58:57 UTC (rev 24498)
+++ csw/mgar/pkg/git/trunk/files/0007-Fix-a-hashbang-issue-in-the-test-suite.patch	2014-12-21 11:13:13 UTC (rev 24499)
@@ -1,28 +0,0 @@
-From 3a7c0997ccbf33ba136d2ef78827d345f5f37de9 Mon Sep 17 00:00:00 2001
-From: Ben Walton <bwalton at opencsw.org>
-Date: Sun, 28 Sep 2014 23:13:40 +0100
-Subject: [PATCH] Fix a hashbang issue in the test suite.
-
-Signed-off-by: Ben Walton <bwalton at opencsw.org>
----
- t/lib-credential.sh | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/t/lib-credential.sh b/t/lib-credential.sh
-index 9e7d796..ca4a6de 100755
---- a/t/lib-credential.sh
-+++ b/t/lib-credential.sh
-@@ -278,8 +278,8 @@ helper_test_timeout() {
- 	'
- }
- 
--cat >askpass <<\EOF
--#!/bin/sh
-+echo "#!$SHELL_PATH" >askpass
-+cat >>askpass <<\EOF
- echo >&2 askpass: $*
- what=$(echo $1 | cut -d" " -f1 | tr A-Z a-z | tr -cd a-z)
- echo "askpass-$what"
--- 
-2.0.3
-

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