aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2011-07-15 09:24:41 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-27 15:39:17 +0100
commitae5269039511d0f3d8aa6a87cb8d9fcf01d79ddd (patch)
treef9150c352ef3db4e567f23303c2e4ca62157840a /meta/recipes-core
parent019a33236f76aacb989e8f37b09b81599c27f296 (diff)
downloadopenembedded-core-contrib-ae5269039511d0f3d8aa6a87cb8d9fcf01d79ddd.tar.gz
ncurses: Resolve header and man page multilib conflicts
By default man pages are compressed, the way ncurses compresses them causes differences (timestamp and name) to be embedded into the gziped file. So each build will end up with a slightly different file. Avoid this, by not compressing the man pages. Avoid header conflict with curses.h using the multilib header helper. Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/ncurses/ncurses.inc7
1 files changed, 5 insertions, 2 deletions
diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc
index 1e139a36e0..be7d387c9c 100644
--- a/meta/recipes-core/ncurses/ncurses.inc
+++ b/meta/recipes-core/ncurses/ncurses.inc
@@ -6,9 +6,9 @@ LIC_FILES_CHKSUM = "file://ncurses/base/version.c;beginline=1;endline=27;md5=cbc
SECTION = "libs"
DEPENDS = "ncurses-native"
DEPENDS_virtclass-native = ""
-INC_PR = "r0"
+INC_PR = "r1"
-inherit autotools binconfig
+inherit autotools binconfig multilib_header
# Upstream has useful patches at times at ftp://invisible-island.net/ncurses/
SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${PV}.tar.gz"
@@ -61,6 +61,7 @@ do_configure() {
--enable-sigwinch \
--enable-pc-files \
--disable-rpath-hack \
+ --with-manpage-format=normal \
"$@"
cd ..
done
@@ -161,6 +162,8 @@ do_install() {
f=${D}${libdir}/libtermcap.so
echo '/* GNU ld script */' >$f
echo 'INPUT(AS_NEEDED(-ltinfo))' >>$f
+
+ oe_multilib_header curses.h
}
python populate_packages_prepend () {
1 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339