[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[tyndur-devel] [PATCH] [lbuilds] Diffutils geupdatet



+ Neue Version von Diffutils hinzugefügt (3.0). Diese muss aber evt. noch einmal überarbeitet werden.
Signed-off-by: Dominik Bittner <DoBi-tyndur@xxxxxxx>
---
 lbuilds/diffutils/3.0/diffutils-3.0.lbuild         |   35 ++++++++++++
 .../diffutils/3.0/patches/diffutils-config.patch   |   11 ++++
 .../diffutils/3.0/patches/diffutils-inttypes.patch |   13 +++++
 lbuilds/diffutils/3.0/patches/diffutils-src.patch  |   55 ++++++++++++++++++++
 .../diffutils/3.0/patches/diffutils-strftime.patch |   11 ++++
 lbuilds/diffutils/3.0/patches/series               |    4 ++
 6 files changed, 129 insertions(+), 0 deletions(-)
 create mode 100644 lbuilds/diffutils/3.0/diffutils-3.0.lbuild
 create mode 100644 lbuilds/diffutils/3.0/patches/diffutils-config.patch
 create mode 100644 lbuilds/diffutils/3.0/patches/diffutils-inttypes.patch
 create mode 100644 lbuilds/diffutils/3.0/patches/diffutils-src.patch
 create mode 100644 lbuilds/diffutils/3.0/patches/diffutils-strftime.patch
 create mode 100644 lbuilds/diffutils/3.0/patches/series

diff --git a/lbuilds/diffutils/3.0/diffutils-3.0.lbuild b/lbuilds/diffutils/3.0/diffutils-3.0.lbuild
new file mode 100644
index 0000000..ea0eb30
--- /dev/null
+++ b/lbuilds/diffutils/3.0/diffutils-3.0.lbuild
@@ -0,0 +1,35 @@
+include lutils
+include toolchain
+
+DESCRIPTION="Tools necessary to build programs"
+HOMEPAGE="http://lowlevel.brainsware.org/wiki/index.php/LOST/Pakete/diffutils";
+SRC_URI="http://ftp.gnu.org/gnu/diffutils/${P}.tar.gz";
+
+LICENSE="GPL-2"
+
+BUILD_DEPEND=""
+RUN_DEPEND=""
+
+MY_S="${S}/${P}"
+
+src_compile() {
+	cd ${MY_S}
+	./configure \
+		--build=`tc-build` \
+		--host=`tc-host` \
+		--prefix=${R} \
+		|| die "configure failed"
+
+	lmake || die "make failed"
+	cd ..
+}
+
+src_install() {
+	cd ${MY_S}
+	lmake DESTDIR="${D}" install || die "make install failed"
+
+	cd "${D}/${R}"
+
+	# Sonst merkt noch jemand, dass die nicht funktionieren
+	rm bin/diff3 bin/sdiff
+}
diff --git a/lbuilds/diffutils/3.0/patches/diffutils-config.patch b/lbuilds/diffutils/3.0/patches/diffutils-config.patch
new file mode 100644
index 0000000..ef12367
--- /dev/null
+++ b/lbuilds/diffutils/3.0/patches/diffutils-config.patch
@@ -0,0 +1,11 @@
+--- src.orig/diffutils-3.0/build-aux/config.sub	2010-04-15 15:40:36.000000000 +0200
++++ src/diffutils-3.0/build-aux/config.sub	2011-06-29 19:38:10.147375879 +0200
+@@ -1315,7 +1315,7 @@
+ 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+ 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+ 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
++	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tyndur*)
+ 	# Remember, each alternative MUST END IN *, to match a version number.
+ 		;;
+ 	-qnx*)
diff --git a/lbuilds/diffutils/3.0/patches/diffutils-inttypes.patch b/lbuilds/diffutils/3.0/patches/diffutils-inttypes.patch
new file mode 100644
index 0000000..2fdaf31
--- /dev/null
+++ b/lbuilds/diffutils/3.0/patches/diffutils-inttypes.patch
@@ -0,0 +1,13 @@
+--- src.orig/diffutils-3.0/lib/inttypes.in.h	2010-04-15 15:40:37.000000000 +0200
++++ src/diffutils-3.0/lib/inttypes.in.h	2011-06-29 20:06:00.357375107 +0200
+@@ -45,10 +45,6 @@
+ /* Get CHAR_BIT.  */
+ #include <limits.h>
+ 
+-#if !(INT_MIN == INT32_MIN && INT_MAX == INT32_MAX)
+-# error "This file assumes that 'int' has exactly 32 bits. Please report your platform and compiler to <bug-gnulib@xxxxxxx>."
+-#endif
+-
+ /* The definition of _GL_ARG_NONNULL is copied here.  */
+ 
+ /* The definition of _GL_WARN_ON_USE is copied here.  */
diff --git a/lbuilds/diffutils/3.0/patches/diffutils-src.patch b/lbuilds/diffutils/3.0/patches/diffutils-src.patch
new file mode 100644
index 0000000..abbf8ce
--- /dev/null
+++ b/lbuilds/diffutils/3.0/patches/diffutils-src.patch
@@ -0,0 +1,55 @@
+--- src.orig/diffutils-3.0/src/diff.c	2010-04-15 21:53:08.000000000 +0200
++++ src/diffutils-3.0/src/diff.c	2011-06-29 20:00:15.507375267 +0200
+@@ -633,7 +633,7 @@
+ 	specify_style (OUTPUT_NORMAL);
+     }
+ 
+-  if (output_style != OUTPUT_CONTEXT || hard_locale (LC_TIME))
++  /*if (output_style != OUTPUT_CONTEXT || hard_locale (LC_TIME))
+     {
+ #if (defined STAT_TIMESPEC || defined STAT_TIMESPEC_NS \
+      || defined HAVE_STRUCT_STAT_ST_SPARE1)
+@@ -642,7 +642,7 @@
+       time_format = "%Y-%m-%d %H:%M:%S %z";
+ #endif
+     }
+-  else
++  else*/
+     {
+       /* See POSIX 1003.1-2001 for this format.  */
+       time_format = "%a %b %e %T %Y";
+--- src.orig/diffutils-3.0/src/sdiff.c	2010-04-15 14:58:08.000000000 +0200
++++ src/diffutils-3.0/src/sdiff.c	2011-06-29 20:02:01.767375217 +0200
+@@ -1225,12 +1225,12 @@
+   sprintf (buf, "%s/sdiffXXXXXX", dir);
+   sigemptyset (&blocked);
+   sigaddset (&blocked, SIGINT);
+-  sigprocmask (SIG_BLOCK, &blocked, &procmask);
++  // sigprocmask (SIG_BLOCK, &blocked, &procmask);
+   fd = mkstemp (buf);
+   e = errno;
+   if (0 <= fd)
+     tmpname = buf;
+-  sigprocmask (SIG_SETMASK, &procmask, 0);
++  // sigprocmask (SIG_SETMASK, &procmask, 0);
+   errno = e;
+   return fd;
+ }
+--- src.orig/diffutils-3.0/src/util.c	2010-04-15 21:53:08.000000000 +0200
++++ src/diffutils-3.0/src/util.c	2011-06-29 20:02:53.287375194 +0200
+@@ -192,6 +192,7 @@
+ 
+       /* Make OUTFILE a pipe to a subsidiary `pr'.  */
+       {
++#if 0
+ #if HAVE_WORKING_FORK || HAVE_WORKING_VFORK
+ 	int pipes[2];
+ 
+@@ -236,6 +237,7 @@
+ 	  pfatal_with_name (command);
+ 	free (command);
+ #endif
++#endif
+       }
+     }
+   else
diff --git a/lbuilds/diffutils/3.0/patches/diffutils-strftime.patch b/lbuilds/diffutils/3.0/patches/diffutils-strftime.patch
new file mode 100644
index 0000000..4901af4
--- /dev/null
+++ b/lbuilds/diffutils/3.0/patches/diffutils-strftime.patch
@@ -0,0 +1,11 @@
+--- src.orig/diffutils-3.0/lib/strftime.c	2010-04-15 15:40:37.000000000 +0200
++++ src/diffutils-3.0/lib/strftime.c	2011-06-29 19:44:58.807375690 +0200
+@@ -1122,7 +1122,7 @@
+             time_t t;
+ 
+             ltm = *tp;
+-            t = mktime (&ltm);
++            t = 0; // mktime (&ltm);
+ 
+             /* Generate string value for T using time_t arithmetic;
+                this works even if sizeof (long) < sizeof (time_t).  */
diff --git a/lbuilds/diffutils/3.0/patches/series b/lbuilds/diffutils/3.0/patches/series
new file mode 100644
index 0000000..511d5de
--- /dev/null
+++ b/lbuilds/diffutils/3.0/patches/series
@@ -0,0 +1,4 @@
+diffutils-config.patch
+diffutils-strftime.patch
+diffutils-src.patch
+diffutils-inttypes.patch
-- 
1.7.4.1