From 2c5b8ec6d95cf68650265941530e5ce38c8dd6d9 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Thu, 9 Dec 2004 09:47:41 +0000 Subject: Merge oe-devel@oe-devel.bkbits.net:openembedded into hyperion.kergoth.com:/home/kergoth/code/openembedded 2004/12/09 03:39:39-06:00 kergoth.com!kergoth Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit. BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA --- coreutils/coreutils-5.0/configure.patch | 47 --------------------------- coreutils/coreutils-5.0/malloc.patch | 19 ----------- coreutils/coreutils-5.1.3/install-cross.patch | 27 --------------- coreutils/coreutils-5.1.3/man.patch | 42 ------------------------ coreutils/coreutils-native_5.1.3.bb | 7 ---- coreutils/coreutils_5.0.bb | 0 coreutils/coreutils_5.1.1.bb | 0 coreutils/coreutils_5.1.3.bb | 0 8 files changed, 142 deletions(-) delete mode 100644 coreutils/coreutils-5.0/configure.patch delete mode 100644 coreutils/coreutils-5.0/malloc.patch delete mode 100644 coreutils/coreutils-5.1.3/install-cross.patch delete mode 100644 coreutils/coreutils-5.1.3/man.patch delete mode 100644 coreutils/coreutils-native_5.1.3.bb delete mode 100644 coreutils/coreutils_5.0.bb delete mode 100644 coreutils/coreutils_5.1.1.bb delete mode 100644 coreutils/coreutils_5.1.3.bb (limited to 'coreutils') diff --git a/coreutils/coreutils-5.0/configure.patch b/coreutils/coreutils-5.0/configure.patch deleted file mode 100644 index 5678c97997..0000000000 --- a/coreutils/coreutils-5.0/configure.patch +++ /dev/null @@ -1,47 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- coreutils-5.0/configure.ac~configure -+++ coreutils-5.0/configure.ac -@@ -15,6 +15,7 @@ - AC_PROG_GCC_TRADITIONAL - AC_PROG_RANLIB - AC_PROG_LN_S -+AC_PROG_YACC - AC_AIX - AC_MINIX - -@@ -28,6 +29,8 @@ - OPTIONAL_BIN_PROGS="$OPTIONAL_BIN_PROGS hostid\$(EXEEXT)" - MAN="$MAN hostid.1") - -+AC_FUNC_ALLOCA -+ - jm_MACROS - - AC_HEADER_TIOCGWINSZ() ---- coreutils-5.0/configure.ac 2004-01-23 14:49:55.000000000 -0500 -+++ coreutils-5.0/configure.ac 2004-01-23 14:41:46.000000000 -0500 -@@ -147,7 +147,7 @@ - fi - fi - --AC_DEFUN(jm_DUMMY_1, -+AC_DEFUN([jm_DUMMY_1], - [ - AC_REQUIRE([jm_PREREQ_READUTMP]) - if test $ac_cv_header_utmp_h = yes || test $ac_cv_header_utmpx_h = yes; then ---- coreutils-5.0/m4/nanosleep.m4 2001-09-17 17:44:03.000000000 -0400 -+++ coreutils-5.0/m4/nanosleep.m4 2004-01-23 14:47:18.000000000 -0500 -@@ -12,6 +12,9 @@ - # Solaris 2.5.1 needs -lposix4 to get the nanosleep function. - # Solaris 7 prefers the library name -lrt to the obsolescent name -lposix4. - AC_SEARCH_LIBS(nanosleep, [rt posix4], [LIB_NANOSLEEP=$ac_cv_search_nanosleep]) -+ if test "$ac_cv_search_nanosleep" = "none required"; then -+ LIB_NANOSLEEP= -+ fi - AC_SUBST(LIB_NANOSLEEP) - - AC_CACHE_CHECK([whether nanosleep works], diff --git a/coreutils/coreutils-5.0/malloc.patch b/coreutils/coreutils-5.0/malloc.patch deleted file mode 100644 index 079b57b94e..0000000000 --- a/coreutils/coreutils-5.0/malloc.patch +++ /dev/null @@ -1,19 +0,0 @@ - -# -# Made by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- coreutils-5.0/lib/putenv.c~malloc -+++ coreutils-5.0/lib/putenv.c -@@ -34,9 +34,11 @@ - char *malloc (); - void free (); - -+#if 0 - #if defined (__GNU_LIBRARY__) || defined (HAVE_STRING_H) - # include - #endif -+#endif - #if defined (__GNU_LIBRARY__) || defined (HAVE_UNISTD_H) - # include - #endif diff --git a/coreutils/coreutils-5.1.3/install-cross.patch b/coreutils/coreutils-5.1.3/install-cross.patch deleted file mode 100644 index 98ba3d916c..0000000000 --- a/coreutils/coreutils-5.1.3/install-cross.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- src/install.c~ 2003-08-09 18:46:45.000000000 +0100 -+++ src/install.c 2004-03-27 18:38:45.000000000 +0000 -@@ -516,7 +516,14 @@ - strip (const char *path) - { - int status; -- pid_t pid = fork (); -+ pid_t pid; -+ char *strip_name; -+ -+ strip_name = getenv ("STRIP"); -+ if (strip_name == NULL) -+ strip_name = "strip"; -+ -+ pid = fork (); - - switch (pid) - { -@@ -524,7 +531,7 @@ - error (EXIT_FAILURE, errno, _("fork system call failed")); - break; - case 0: /* Child. */ -- execlp ("strip", "strip", path, NULL); -+ execlp (strip_name, "strip", path, NULL); - error (EXIT_FAILURE, errno, _("cannot run strip")); - break; - default: /* Parent. */ diff --git a/coreutils/coreutils-5.1.3/man.patch b/coreutils/coreutils-5.1.3/man.patch deleted file mode 100644 index b067c380e2..0000000000 --- a/coreutils/coreutils-5.1.3/man.patch +++ /dev/null @@ -1,42 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- coreutils-5.1.3/configure.ac~man 2004-01-25 16:57:15.000000000 -0600 -+++ coreutils-5.1.3/configure.ac 2004-06-29 14:22:10.000000000 -0500 -@@ -232,6 +232,20 @@ - AM_GNU_GETTEXT([external], [need-ngettext]) - AM_GNU_GETTEXT_VERSION(0.13.1) - -+AC_MSG_CHECKING([whether to build man pages]) -+AC_ARG_WITH(manpages, -+ AS_HELP_STRING([--with-manpages], -+ [Enable building of manpages (default=yes)]), -+ [cu_cv_build_manpages=$enableval], -+ [cu_cv_build_manpages=yes]) -+# help2man doesn't work when crosscompiling, as it needs to run the -+# binary that was built. -+if test x"$cross_compiling" = x"yes"; then -+ cu_cv_build_manpages=no -+fi -+AC_MSG_RESULT($cu_cv_build_manpages) -+AM_CONDITIONAL(ENABLE_MANPAGES, test x"$cu_cv_build_manpages" = x"yes") -+ - AC_CONFIG_FILES( - Makefile - doc/Makefile ---- coreutils-5.1.3/Makefile.am~man 2003-11-09 14:23:02.000000000 -0600 -+++ coreutils-5.1.3/Makefile.am 2004-06-29 14:18:14.000000000 -0500 -@@ -1,6 +1,11 @@ - ## Process this file with automake to produce Makefile.in -*-Makefile-*- - -+if ENABLE_MANPAGES - SUBDIRS = lib src doc man m4 po tests -+else -+SUBDIRS = lib src doc m4 po tests -+endif -+ - EXTRA_DIST = Makefile.cfg Makefile.maint GNUmakefile \ - .kludge-stamp .prev-version THANKS-to-translators THANKStt.in \ - .x-sc_space_tab .x-sc_sun_os_names \ diff --git a/coreutils/coreutils-native_5.1.3.bb b/coreutils/coreutils-native_5.1.3.bb deleted file mode 100644 index 3fbe1bb6f1..0000000000 --- a/coreutils/coreutils-native_5.1.3.bb +++ /dev/null @@ -1,7 +0,0 @@ -SECTION = "base" -inherit native - -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/coreutils-${PV}" -S = "${WORKDIR}/coreutils-${PV}" - -include coreutils_${PV}.bb diff --git a/coreutils/coreutils_5.0.bb b/coreutils/coreutils_5.0.bb deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/coreutils/coreutils_5.1.1.bb b/coreutils/coreutils_5.1.1.bb deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/coreutils/coreutils_5.1.3.bb b/coreutils/coreutils_5.1.3.bb deleted file mode 100644 index e69de29bb2..0000000000 -- cgit v1.2.3