[oe-commits] : libpam: add flex as a dependency; handle empty .debug dir case ( and clean up

[OE GIT Trial]

Module: OE.dev
Branch: master
Commit: 14cdd41eb991eaf1b649e972a66048cc30cbc9a5
URL:    http://gitweb.openembedded.net//OE.dev.git/?a=commit;h=14cdd41eb991eaf1b649e972a66048cc30cbc9a5

Author:  <mwester at openembedded.org>
Date:   Mon Sep  8 06:03:55 2008 +0000

libpam: add flex as a dependency; handle empty .debug dir case (and clean up
the python whitespace too), bump PR.

---

 packages/pam/libpam_1.0.2.bb |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/packages/pam/libpam_1.0.2.bb b/packages/pam/libpam_1.0.2.bb
index cf98944..0b7eada 100644
--- a/packages/pam/libpam_1.0.2.bb
+++ b/packages/pam/libpam_1.0.2.bb
@@ -10,6 +10,10 @@ SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPLv2"
 
+DEPENDS = "flex flex-native"
+
+PR = "r1"
+
 # The project is actually called Linux-PAM but that gives
 # a bad OE package name because of the upper case characters
 pn = "Linux-PAM"
@@ -24,12 +28,15 @@ inherit autotools
 LEAD_SONAME = "libpam.so.*"
 
 python populate_packages_prepend () {
-        pam_libdir    = bb.data.expand('${libdir}/security', d)
+	import os.path
+
+	pam_libdir    = bb.data.expand('${libdir}/security', d)
 	pam_libdirdebug = bb.data.expand('${libdir}/security/.debug', d)
-        pam_filterdir = bb.data.expand('${libdir}/security/pam_filter', d)
+	pam_filterdir = bb.data.expand('${libdir}/security/pam_filter', d)
 	do_split_packages(d, pam_libdir, '^pam(.*)\.so$', 'pam-plugin%s', 'PAM plugin for %s', extra_depends='')
-        do_split_packages(d, pam_libdir, '^pam(.*)\.la$', 'pam-plugin%s-dev', 'PAM plugin for %s dev', extra_depends='')
-	do_split_packages(d, pam_libdirdebug, '^pam(.*)\.so$', 'pam-plugin%s-dbg', 'PAM plugin for %s debugging symbols', extra_depends='')
+	do_split_packages(d, pam_libdir, '^pam(.*)\.la$', 'pam-plugin%s-dev', 'PAM plugin for %s dev', extra_depends='')
+	if os.path.exists(pam_libdirdebug):
+		do_split_packages(d, pam_libdirdebug, '^pam(.*)\.so$', 'pam-plugin%s-dbg', 'PAM plugin for %s debugging symbols', extra_depends='')
 	do_split_packages(d, pam_filterdir, '^(.*)$', 'pam-filter-%s', 'PAM filter for %s', extra_depends='')
 }