Merge bk://oe-devel@oe-devel.bkbits.net/packages
authorPhil Blundell <philb@gnu.org>
Sat, 4 Dec 2004 23:40:56 +0000 (23:40 +0000)
committerPhil Blundell <philb@gnu.org>
Sat, 4 Dec 2004 23:40:56 +0000 (23:40 +0000)
into stealth.nexus.co.uk:/home/pb/oe/oe-packages

2004/12/04 17:58:25-05:00 handhelds.org!kergoth
Merge oe-devel@oe-devel.bkbits.net:packages
into handhelds.org:/home/kergoth/code/packages

2004/12/04 17:40:54-06:00 ti.com!kergoth
Merge oe-devel@oe-devel.bkbits.net:packages
into odin.sc.ti.com:/home/kergoth/code/packages

2004/12/04 17:37:56-06:00 ti.com!kergoth
Fix the readline build failure (two pieces, first install the .a and .so in two seperate commands, then fix a variable initialization bug in oe_libinstall).

BKrev: 41b24b08rvSUum69_SfnyjuGRnzynQ

classes/base.oeclass
readline/readline_4.3.oe

index caa40a9..6613607 100644 (file)
@@ -107,6 +107,9 @@ oe_libinstall() {
        # oe_libinstall -C src/libblah libblah ${D}/${libdir}/
        dir=""
        libtool=""
+       silent=""
+       require_static=""
+       require_shared=""
        while [ "$#" -gt 0 ]; do
                case "$1" in
                -C)
index 8dbe021..ea1b1ff 100644 (file)
@@ -25,8 +25,10 @@ do_install () {
 }
 
 do_stage() {
-       oe_libinstall -so -a -C shlib libhistory ${STAGING_LIBDIR}
-       oe_libinstall -so -a -C shlib libreadline ${STAGING_LIBDIR}
+       oe_libinstall -a libhistory ${STAGING_LIBDIR}
+       oe_libinstall -a libreadline ${STAGING_LIBDIR}
+       oe_libinstall -so -C shlib libhistory ${STAGING_LIBDIR}
+       oe_libinstall -so -C shlib libreadline ${STAGING_LIBDIR}
 
        install -d ${STAGING_INCDIR}/readline
        for f in readline.h chardefs.h keymaps.h history.h tilde.h rlstdc.h \