diff options
| author | Tom Rini <tom_rini@mentor.com> | 2010-06-09 11:08:07 -0700 |
|---|---|---|
| committer | Tom Rini <tom_rini@mentor.com> | 2010-06-09 13:48:29 -0700 |
| commit | 8cd716868ad626ad11356144df1f20accf6c789a (patch) | |
| tree | d3bada81ff3979c1b689dc5168273c5756ddceb9 | |
| parent | 0f5be314dd920d6a37e16df54ccb8d85384c4dba (diff) | |
ncurses: Switch to INC_PR and BBCLASSEXTEND. Fix ncurses-sdk and terminfo
RSUGGESTS needs to use ${PN} not ncurses otherwise ncurses-sdk will try
ncurses-terminfo (wrong) not ncurses-sdk-terminfo (right).
Signed-off-by: Tom Rini <tom_rini@mentor.com>
| -rw-r--r-- | recipes/ncurses/ncurses-native_5.4.bb | 7 | ||||
| -rw-r--r-- | recipes/ncurses/ncurses-sdk_5.4.bb | 3 | ||||
| -rw-r--r-- | recipes/ncurses/ncurses.inc | 4 | ||||
| -rw-r--r-- | recipes/ncurses/ncurses_5.4.bb | 8 |
4 files changed, 8 insertions, 14 deletions
diff --git a/recipes/ncurses/ncurses-native_5.4.bb b/recipes/ncurses/ncurses-native_5.4.bb deleted file mode 100644 index 749e1c487a..0000000000 --- a/recipes/ncurses/ncurses-native_5.4.bb +++ /dev/null @@ -1,7 +0,0 @@ -require ncurses_${PV}.bb -inherit native -EXTRA_OEMAKE = '"BUILD_CCFLAGS=${BUILD_CCFLAGS}"' -DEPENDS = "" - -SRC_URI[md5sum] = "069c8880072060373290a4fefff43520" -SRC_URI[sha256sum] = "5abce063cf431790f4e6a801a96c7eea0b33a41ecd0970f6312f52575c083b36" diff --git a/recipes/ncurses/ncurses-sdk_5.4.bb b/recipes/ncurses/ncurses-sdk_5.4.bb deleted file mode 100644 index fb69c1ec7d..0000000000 --- a/recipes/ncurses/ncurses-sdk_5.4.bb +++ /dev/null @@ -1,3 +0,0 @@ -require ncurses_${PV}.bb -inherit sdk -EXTRA_OEMAKE = '"BUILD_CCFLAGS=${BUILD_CCFLAGS}"' diff --git a/recipes/ncurses/ncurses.inc b/recipes/ncurses/ncurses.inc index fb4d9123bf..48412c1998 100644 --- a/recipes/ncurses/ncurses.inc +++ b/recipes/ncurses/ncurses.inc @@ -3,6 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/ncurses/ncurses.html" LICENSE = "MIT" SECTION = "libs" DEPENDS = "ncurses-native" +INC_PR = "r20" inherit autotools @@ -110,8 +111,7 @@ FILES_${PN}-tools = "\ FILES_${PN}-terminfo = "\ ${datadir}/terminfo \ " -RSUGGESTS_${PN} = "ncurses-terminfo" +RSUGGESTS_${PN} = "${PN}-terminfo" RPROVIDES_${PN} = "libncurses5" RCONFLICTS_${PN} = "libncurses5" RREPLACES_${PN} = "libncurses5" - diff --git a/recipes/ncurses/ncurses_5.4.bb b/recipes/ncurses/ncurses_5.4.bb index 8c0f62c48a..d358e162ec 100644 --- a/recipes/ncurses/ncurses_5.4.bb +++ b/recipes/ncurses/ncurses_5.4.bb @@ -1,5 +1,3 @@ -PR = "r20" - SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${PV}.tar.gz \ file://makefile_tweak.patch \ file://use_ldflags.patch \ @@ -7,8 +5,14 @@ SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${PV}.tar.gz \ S = "${WORKDIR}/ncurses-${PV}" require ncurses.inc +PR = "${INC_PR}.0" LEAD_SONAME = "libncurses.so.5" SRC_URI[md5sum] = "069c8880072060373290a4fefff43520" SRC_URI[sha256sum] = "5abce063cf431790f4e6a801a96c7eea0b33a41ecd0970f6312f52575c083b36" + +BBCLASSEXTEND = "native sdk" +DEPENDS_virtclass-native = "" +EXTRA_OEMAKE_virtclass-native = '"BUILD_CCFLAGS=${BUILD_CCFLAGS}"' +EXTRA_OEMAKE_virtclass-sdk = '"BUILD_CCFLAGS=${BUILD_CCFLAGS}"' |