[csw-devel] SF.net SVN: gar:[10465] csw/mgar/pkg/patch/trunk

Wed Jul 7 11:22:35 CEST 2010

Revision: 10465
          http://gar.svn.sourceforge.net/gar/?rev=10465&view=rev
Author:   dmichelsen
Date:     2010-07-07 09:22:35 +0000 (Wed, 07 Jul 2010)

Log Message:
-----------
patch: Fix issue with GAR now using git for patches

Modified Paths:
--------------
    csw/mgar/pkg/patch/trunk/Makefile
    csw/mgar/pkg/patch/trunk/checksums
    csw/mgar/pkg/patch/trunk/files/0001-Add-missing-strnlen.c-from-GNUlib.patch

Added Paths:
-----------
    csw/mgar/pkg/patch/trunk/files/0002-Add-missing-m4-files.patch

Modified: csw/mgar/pkg/patch/trunk/Makefile
===================================================================

--- csw/mgar/pkg/patch/trunk/Makefile	2010-07-07 09:15:27 UTC (rev 10464)
+++ csw/mgar/pkg/patch/trunk/Makefile	2010-07-07 09:22:35 UTC (rev 10465)
@@ -9,7 +9,8 @@
 
 MASTER_SITES = $(GNU_MIRROR)
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz 
-PATCHFILES = 0001-Add-missing-strnlen.c-from-GNUlib.patch
+PATCHFILES  = 0001-Add-missing-strnlen.c-from-GNUlib.patch
+PATCHFILES += 0002-Add-missing-m4-files.patch
 
 PACKAGES = CSWgpatch
 
@@ -27,3 +28,14 @@
 TEST_TARGET = check
 
 include gar/category.mk
+
+post-extract-modulated:
+	@# GARs usage of .git for patching in the package confuses the upstream building as
+	@# if it was bootstrapped.
+	-echo "exit 0" > $(WORKSRC)/update-version.sh
+
+post-install-modulated:
+	ginstall -d $(DESTDIR)$(prefix)/gnu
+	$(foreach G,$(notdir $(wildcard $(DESTDIR)$(bindir)/*)),ln -s ../bin/$G $(DESTDIR)$(prefix)/gnu/$(patsubst g%,%,$G);)
+	@$(MAKECOOKIE)
+

Modified: csw/mgar/pkg/patch/trunk/checksums
===================================================================
--- csw/mgar/pkg/patch/trunk/checksums	2010-07-07 09:15:27 UTC (rev 10464)
+++ csw/mgar/pkg/patch/trunk/checksums	2010-07-07 09:22:35 UTC (rev 10465)
@@ -1,2 +1,3 @@
-d976e6d1af14d714cffa3e6579cf7afa  0001-Add-missing-strnlen.c-from-GNUlib.patch
+46d02b036813c195171f723f162e3786  0001-Add-missing-strnlen.c-from-GNUlib.patch
+f18f4ae6a5d427f20941a439fcd7d61a  0002-Add-missing-m4-files.patch
 d758eb96d3f75047efc004a720d33daf  patch-2.6.1.tar.gz

Modified: csw/mgar/pkg/patch/trunk/files/0001-Add-missing-strnlen.c-from-GNUlib.patch
===================================================================
--- csw/mgar/pkg/patch/trunk/files/0001-Add-missing-strnlen.c-from-GNUlib.patch	2010-07-07 09:15:27 UTC (rev 10464)
+++ csw/mgar/pkg/patch/trunk/files/0001-Add-missing-strnlen.c-from-GNUlib.patch	2010-07-07 09:22:35 UTC (rev 10465)
@@ -1,7 +1,7 @@
-From 301697b91b91d3b08059a9e18ce8154040762d63 Mon Sep 17 00:00:00 2001
+From e45bf18c6a3355d54dc29b6b259ae21e83ff8041 Mon Sep 17 00:00:00 2001
 From: Dagobert Michelsen <dam at opencsw.org>
 Date: Thu, 11 Feb 2010 10:19:05 +0100
-Subject: [PATCH] Add missing strnlen.c from GNUlib
+Subject: [PATCH 1/2] Add missing strnlen.c from GNUlib
 
 ---
  gl/lib/strnlen.c |   31 +++++++++++++++++++++++++++++++
@@ -46,5 +46,5 @@
 +  return end ? (size_t) (end - string) : maxlen;
 +}
 -- 
-1.6.6
+1.7.1
 

Added: csw/mgar/pkg/patch/trunk/files/0002-Add-missing-m4-files.patch
===================================================================
--- csw/mgar/pkg/patch/trunk/files/0002-Add-missing-m4-files.patch	                        (rev 0)
+++ csw/mgar/pkg/patch/trunk/files/0002-Add-missing-m4-files.patch	2010-07-07 09:22:35 UTC (rev 10465)
@@ -0,0 +1,76 @@
+From e70f6d46e9a2f6df77a234e0a0404588c39bd142 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 30 Jun 2010 16:23:10 +0200
+Subject: [PATCH 2/2] Add missing m4 files
+
+---
+ gl/m4/safe-read.m4 |   18 ++++++++++++++++++
+ gl/m4/strnlen.m4   |   31 +++++++++++++++++++++++++++++++
+ 2 files changed, 49 insertions(+), 0 deletions(-)
+ create mode 100644 gl/m4/safe-read.m4
+ create mode 100644 gl/m4/strnlen.m4
+
+diff --git a/gl/m4/safe-read.m4 b/gl/m4/safe-read.m4
+new file mode 100644
+index 0000000..7a89d0a
+--- /dev/null
++++ b/gl/m4/safe-read.m4
+@@ -0,0 +1,18 @@
++# safe-read.m4 serial 5
++dnl Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
++dnl This file is free software; the Free Software Foundation
++dnl gives unlimited permission to copy and/or distribute it,
++dnl with or without modifications, as long as this notice is preserved.
++
++AC_DEFUN([gl_SAFE_READ],
++[
++  AC_LIBOBJ([safe-read])
++
++  gl_PREREQ_SAFE_READ
++])
++
++# Prerequisites of lib/safe-read.c.
++AC_DEFUN([gl_PREREQ_SAFE_READ],
++[
++  AC_REQUIRE([gt_TYPE_SSIZE_T])
++])
+diff --git a/gl/m4/strnlen.m4 b/gl/m4/strnlen.m4
+new file mode 100644
+index 0000000..1c97859
+--- /dev/null
++++ b/gl/m4/strnlen.m4
+@@ -0,0 +1,31 @@
++# strnlen.m4 serial 10
++dnl Copyright (C) 2002-2003, 2005-2007, 2009 Free Software Foundation, Inc.
++dnl This file is free software; the Free Software Foundation
++dnl gives unlimited permission to copy and/or distribute it,
++dnl with or without modifications, as long as this notice is preserved.
++
++AC_DEFUN([gl_FUNC_STRNLEN],
++[
++  dnl Persuade glibc <string.h> to declare strnlen().
++  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
++
++  AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
++  AC_CHECK_DECLS_ONCE([strnlen])
++  if test $ac_cv_have_decl_strnlen = no; then
++    HAVE_DECL_STRNLEN=0
++  fi
++
++  AC_FUNC_STRNLEN
++  if test $ac_cv_func_strnlen_working = no; then
++    # This is necessary because automake-1.6.1 doesn't understand
++    # that the above use of AC_FUNC_STRNLEN means we may have to use
++    # lib/strnlen.c.
++    #AC_LIBOBJ([strnlen])
++    AC_DEFINE([strnlen], [rpl_strnlen],
++      [Define to rpl_strnlen if the replacement function should be used.])
++    gl_PREREQ_STRNLEN
++  fi
++])
++
++# Prerequisites of lib/strnlen.c.
++AC_DEFUN([gl_PREREQ_STRNLEN], [:])
+-- 
+1.7.1
+


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