diff options
author | Saul Wold <Saul.Wold@intel.com> | 2010-08-11 14:04:54 -0700 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-13 13:36:00 +0100 |
commit | e5052c493bbc4d1f5ad6a8d936c04f398549043f (patch) | |
tree | 49c33cacfc4911676928bf0388a786fde8afa41f /meta-lsb | |
parent | 1280503a59b24598b1d34931b6e02ed46bf25f66 (diff) | |
download | poky-e5052c493bbc4d1f5ad6a8d936c04f398549043f.tar.gz |
minicom: Update to 2.3 (from OE)
Signed-off-by: Saul Wold <Saul.Wold@intel.com>
Diffstat (limited to 'meta-lsb')
-rw-r--r-- | meta-lsb/packages/minicom/minicom-2.1/configure.patch | 25 | ||||
-rw-r--r-- | meta-lsb/packages/minicom/minicom-2.3/gcc4-scope.patch (renamed from meta-lsb/packages/minicom/minicom-2.1/gcc4-scope.patch) | 0 | ||||
-rw-r--r-- | meta-lsb/packages/minicom/minicom-2.3/rename-conflicting-functions.patch | 13 | ||||
-rw-r--r-- | meta-lsb/packages/minicom/minicom_2.1.bb | 12 | ||||
-rw-r--r-- | meta-lsb/packages/minicom/minicom_2.3.bb | 17 |
5 files changed, 30 insertions, 37 deletions
diff --git a/meta-lsb/packages/minicom/minicom-2.1/configure.patch b/meta-lsb/packages/minicom/minicom-2.1/configure.patch deleted file mode 100644 index 4db47fb3d8..0000000000 --- a/meta-lsb/packages/minicom/minicom-2.1/configure.patch +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | Index: minicom-2.1/configure.in | ||
2 | =================================================================== | ||
3 | --- minicom-2.1.orig/configure.in 2003-04-29 21:08:25.000000000 +0000 | ||
4 | +++ minicom-2.1/configure.in 2005-07-04 19:03:32.000000000 +0000 | ||
5 | @@ -231,9 +231,9 @@ | ||
6 | AC_HEADER_STAT | ||
7 | AC_HEADER_TIME | ||
8 | |||
9 | -AM_SYS_POSIX_TERMIOS | ||
10 | +AC_SYS_POSIX_TERMIOS | ||
11 | AM_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL | ||
12 | -if test $am_cv_sys_posix_termios = yes; then | ||
13 | +if test $ac_cv_sys_posix_termios = yes; then | ||
14 | AC_DEFINE(POSIX_TERMIOS) | ||
15 | fi | ||
16 | |||
17 | @@ -253,7 +253,7 @@ | ||
18 | |||
19 | dnl Checks for library functions. | ||
20 | AC_TYPE_SIGNAL | ||
21 | -AM_FUNC_ERROR_AT_LINE | ||
22 | +AC_FUNC_ERROR_AT_LINE | ||
23 | AC_FUNC_CLOSEDIR_VOID | ||
24 | AM_WITH_DMALLOC | ||
25 | AC_CHECK_FUNCS(getcwd getwd strerror strstr vsnprintf vprintf) | ||
diff --git a/meta-lsb/packages/minicom/minicom-2.1/gcc4-scope.patch b/meta-lsb/packages/minicom/minicom-2.3/gcc4-scope.patch index 5bd47bd354..5bd47bd354 100644 --- a/meta-lsb/packages/minicom/minicom-2.1/gcc4-scope.patch +++ b/meta-lsb/packages/minicom/minicom-2.3/gcc4-scope.patch | |||
diff --git a/meta-lsb/packages/minicom/minicom-2.3/rename-conflicting-functions.patch b/meta-lsb/packages/minicom/minicom-2.3/rename-conflicting-functions.patch new file mode 100644 index 0000000000..c344203267 --- /dev/null +++ b/meta-lsb/packages/minicom/minicom-2.3/rename-conflicting-functions.patch | |||
@@ -0,0 +1,13 @@ | |||
1 | --- minicom-2.3/src/minicom.c-orig 2009-06-08 14:49:07.000000000 +0200 | ||
2 | +++ minicom-2.3/src/minicom.c 2009-06-08 14:50:23.000000000 +0200 | ||
3 | @@ -63,6 +63,10 @@ | ||
4 | } | ||
5 | #endif /*DEBUG*/ | ||
6 | |||
7 | +#ifdef __USE_GNU | ||
8 | +#define getline minicom_getline | ||
9 | +#endif | ||
10 | + | ||
11 | /* | ||
12 | * Sub - menu's. | ||
13 | */ | ||
diff --git a/meta-lsb/packages/minicom/minicom_2.1.bb b/meta-lsb/packages/minicom/minicom_2.1.bb deleted file mode 100644 index c4a1c3018a..0000000000 --- a/meta-lsb/packages/minicom/minicom_2.1.bb +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | SECTION = "console/network" | ||
2 | DEPENDS = "ncurses" | ||
3 | LICENSE = "GPL" | ||
4 | SRC_URI = "http://alioth.debian.org/download.php/123/minicom-${PV}.tar.gz \ | ||
5 | file://configure.patch;patch=1 \ | ||
6 | file://gcc4-scope.patch;patch=1" | ||
7 | |||
8 | inherit autotools gettext | ||
9 | |||
10 | do_install() { | ||
11 | for d in doc extras man intl lib src; do make -C $d DESTDIR=${D} install; done | ||
12 | } | ||
diff --git a/meta-lsb/packages/minicom/minicom_2.3.bb b/meta-lsb/packages/minicom/minicom_2.3.bb new file mode 100644 index 0000000000..a114e30c99 --- /dev/null +++ b/meta-lsb/packages/minicom/minicom_2.3.bb | |||
@@ -0,0 +1,17 @@ | |||
1 | SECTION = "console/network" | ||
2 | DEPENDS = "ncurses" | ||
3 | LICENSE = "GPL" | ||
4 | SRC_URI = "http://alioth.debian.org/frs/download.php/2332/minicom-${PV}.tar.gz \ | ||
5 | file://rename-conflicting-functions.patch \ | ||
6 | " | ||
7 | |||
8 | # file://gcc4-scope.patch;patch=1 \ | ||
9 | |||
10 | inherit autotools gettext | ||
11 | |||
12 | do_install() { | ||
13 | for d in doc extras man lib src; do make -C $d DESTDIR=${D} install; done | ||
14 | } | ||
15 | |||
16 | SRC_URI[md5sum] = "0ebe7a91898384ca906787cc4e2c3f25" | ||
17 | SRC_URI[sha256sum] = "2acbc3d4a07e1134ee285a72fa44bbc27703b02dba02be68db9e6fd8320356fb" | ||