diff options
| author | Phil Blundell <philb@gnu.org> | 2004-12-04 23:40:56 +0000 |
|---|---|---|
| committer | Phil Blundell <philb@gnu.org> | 2004-12-04 23:40:56 +0000 |
| commit | 959144cc520a6e3044bc1019c5ed0681ae018719 (patch) | |
| tree | fd18e62040e398dc32961f9efd46864cdc2092ee | |
| parent | b12e649f8a0e8426fea9555455f08d79261240e5 (diff) | |
Merge bk://oe-devel@oe-devel.bkbits.net/packages
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
| -rw-r--r-- | classes/base.oeclass | 3 | ||||
| -rw-r--r-- | readline/readline_4.3.oe | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/classes/base.oeclass b/classes/base.oeclass index caa40a9c0d..66136074c7 100644 --- a/classes/base.oeclass +++ b/classes/base.oeclass @@ -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) diff --git a/readline/readline_4.3.oe b/readline/readline_4.3.oe index 8dbe021cd8..ea1b1ffb52 100644 --- a/readline/readline_4.3.oe +++ b/readline/readline_4.3.oe @@ -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 \ |