diff options
26 files changed, 196 insertions, 64 deletions
diff --git a/alsa-oss/alsa-oss-1.0.4/configure.patch b/alsa-oss/alsa-oss-1.0.4/configure.patch index e69de29bb2..05f57be542 100644 --- a/alsa-oss/alsa-oss-1.0.4/configure.patch +++ b/alsa-oss/alsa-oss-1.0.4/configure.patch @@ -0,0 +1,147 @@ +--- tmp/base/alsa-oss-0.9.8-r0/alsa-oss-0.9.8/acinclude.m4 Wed Dec 31 18:00:00 1969 ++++ alsa-oss-0.9.8/acinclude.m4 Fri Nov 14 11:36:08 2003 +@@ -0,0 +1,144 @@ ++dnl Configure Paths for Alsa ++dnl Some modifications by Richard Boulton <richard-alsa@tartarus.org> ++dnl Christopher Lansdown <lansdoct@cs.alfred.edu> ++dnl Jaroslav Kysela <perex@suse.cz> ++dnl Last modification: alsa.m4,v 1.22 2002/05/27 11:14:20 tiwai Exp ++dnl AM_PATH_ALSA([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) ++dnl Test for libasound, and define ALSA_CFLAGS and ALSA_LIBS as appropriate. ++dnl enables arguments --with-alsa-prefix= ++dnl --with-alsa-enc-prefix= ++dnl --disable-alsatest (this has no effect, as yet) ++dnl ++dnl For backwards compatibility, if ACTION_IF_NOT_FOUND is not specified, ++dnl and the alsa libraries are not found, a fatal AC_MSG_ERROR() will result. ++dnl ++AC_DEFUN(AM_PATH_ALSA, ++[dnl Save the original CFLAGS, LDFLAGS, and LIBS ++alsa_save_CFLAGS="$CFLAGS" ++alsa_save_LDFLAGS="$LDFLAGS" ++alsa_save_LIBS="$LIBS" ++alsa_found=yes ++ ++dnl ++dnl Get the cflags and libraries for alsa ++dnl ++AC_ARG_WITH(alsa-prefix, ++[ --with-alsa-prefix=PFX Prefix where Alsa library is installed(optional)], ++[alsa_prefix="$withval"], [alsa_prefix=""]) ++ ++AC_ARG_WITH(alsa-inc-prefix, ++[ --with-alsa-inc-prefix=PFX Prefix where include libraries are (optional)], ++[alsa_inc_prefix="$withval"], [alsa_inc_prefix=""]) ++ ++dnl FIXME: this is not yet implemented ++AC_ARG_ENABLE(alsatest, ++[ --disable-alsatest Do not try to compile and run a test Alsa program], ++[enable_alsatest=no], ++[enable_alsatest=yes]) ++ ++dnl Add any special include directories ++AC_MSG_CHECKING(for ALSA CFLAGS) ++if test "$alsa_inc_prefix" != "" ; then ++ ALSA_CFLAGS="$ALSA_CFLAGS -I$alsa_inc_prefix" ++ CFLAGS="$CFLAGS -I$alsa_inc_prefix" ++fi ++AC_MSG_RESULT($ALSA_CFLAGS) ++ ++dnl add any special lib dirs ++AC_MSG_CHECKING(for ALSA LDFLAGS) ++if test "$alsa_prefix" != "" ; then ++ ALSA_LIBS="$ALSA_LIBS -L$alsa_prefix" ++ LDFLAGS="$LDFLAGS $ALSA_LIBS" ++fi ++ ++dnl add the alsa library ++ALSA_LIBS="$ALSA_LIBS -lasound -lm -ldl -lpthread" ++LIBS=`echo $LIBS | sed 's/-lm//'` ++LIBS=`echo $LIBS | sed 's/-ldl//'` ++LIBS=`echo $LIBS | sed 's/-lpthread//'` ++LIBS=`echo $LIBS | sed 's/ //'` ++LIBS="$ALSA_LIBS $LIBS" ++AC_MSG_RESULT($ALSA_LIBS) ++ ++dnl Check for a working version of libasound that is of the right version. ++min_alsa_version=ifelse([$1], ,0.1.1,$1) ++AC_MSG_CHECKING(for libasound headers version >= $min_alsa_version) ++no_alsa="" ++ alsa_min_major_version=`echo $min_alsa_version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` ++ alsa_min_minor_version=`echo $min_alsa_version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` ++ alsa_min_micro_version=`echo $min_alsa_version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` ++ ++AC_LANG_SAVE ++AC_LANG_C ++AC_TRY_COMPILE([ ++#include <alsa/asoundlib.h> ++], [ ++/* ensure backward compatibility */ ++#if !defined(SND_LIB_MAJOR) && defined(SOUNDLIB_VERSION_MAJOR) ++#define SND_LIB_MAJOR SOUNDLIB_VERSION_MAJOR ++#endif ++#if !defined(SND_LIB_MINOR) && defined(SOUNDLIB_VERSION_MINOR) ++#define SND_LIB_MINOR SOUNDLIB_VERSION_MINOR ++#endif ++#if !defined(SND_LIB_SUBMINOR) && defined(SOUNDLIB_VERSION_SUBMINOR) ++#define SND_LIB_SUBMINOR SOUNDLIB_VERSION_SUBMINOR ++#endif ++ ++# if(SND_LIB_MAJOR > $alsa_min_major_version) ++ exit(0); ++# else ++# if(SND_LIB_MAJOR < $alsa_min_major_version) ++# error not present ++# endif ++ ++# if(SND_LIB_MINOR > $alsa_min_minor_version) ++ exit(0); ++# else ++# if(SND_LIB_MINOR < $alsa_min_minor_version) ++# error not present ++# endif ++ ++# if(SND_LIB_SUBMINOR < $alsa_min_micro_version) ++# error not present ++# endif ++# endif ++# endif ++exit(0); ++], ++ [AC_MSG_RESULT(found.)], ++ [AC_MSG_RESULT(not present.) ++ ifelse([$3], , [AC_MSG_ERROR(Sufficiently new version of libasound not found.)]) ++ alsa_found=no] ++) ++AC_LANG_RESTORE ++ ++dnl Now that we know that we have the right version, let's see if we have the library and not just the headers. ++AC_CHECK_LIB([asound], [snd_ctl_open],, ++ [ifelse([$3], , [AC_MSG_ERROR(No linkable libasound was found.)]) ++ alsa_found=no] ++) ++ ++if test "x$alsa_found" = "xyes" ; then ++ ifelse([$2], , :, [$2]) ++ LIBS=`echo $LIBS | sed 's/-lasound//g'` ++ LIBS=`echo $LIBS | sed 's/ //'` ++ LIBS="-lasound $LIBS" ++fi ++if test "x$alsa_found" = "xno" ; then ++ ifelse([$3], , :, [$3]) ++ CFLAGS="$alsa_save_CFLAGS" ++ LDFLAGS="$alsa_save_LDFLAGS" ++ LIBS="$alsa_save_LIBS" ++ ALSA_CFLAGS="" ++ ALSA_LIBS="" ++fi ++ ++dnl That should be it. Now just export out symbols: ++AC_SUBST(ALSA_CFLAGS) ++AC_SUBST(ALSA_LIBS) ++]) ++ ++ diff --git a/db/db3_3.2.9.oe b/db/db3_3.2.9.oe index f4556daf44..78a543fff1 100644 --- a/db/db3_3.2.9.oe +++ b/db/db3_3.2.9.oe @@ -59,13 +59,10 @@ do_stage () { set -e cd ${B} install -m 0644 db_185.h ../include/db_cxx.h db.h ${STAGING_INCDIR}/ - install -m 0755 .libs/libdb-3.2.so ${STAGING_LIBDIR}/ - ln -sf libdb-3.2.so ${STAGING_LIBDIR}/libdb-3.so - ln -sf libdb-3.2.so ${STAGING_LIBDIR}/libdb3.so + oe_libinstall -so libdb-3.2 ${STAGING_LIBDIR} ln -sf libdb-3.2.so ${STAGING_LIBDIR}/libdb.so - install -m 0644 .libs/libdb-3.2.lai ${STAGING_LIBDIR}/libdb-3.2.la cd ${WORKDIR}/db-${PV}/build_unix_static - install -m 0644 libdb.a ${STAGING_LIBDIR}/ + oe_libinstall -a libdb ${STAGING_LIBDIR} cd ${S} } diff --git a/e2fsprogs-libs/e2fsprogs-libs_1.33.oe b/e2fsprogs-libs/e2fsprogs-libs_1.33.oe index 1304964c54..96fb787e2d 100644 --- a/e2fsprogs-libs/e2fsprogs-libs_1.33.oe +++ b/e2fsprogs-libs/e2fsprogs-libs_1.33.oe @@ -13,10 +13,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \ inherit autotools do_stage () { - install -m 0644 lib/libcom_err.a ${STAGING_LIBDIR}/ - install -m 0644 lib/libss.a ${STAGING_LIBDIR}/ - install -m 0644 lib/libuuid.a ${STAGING_LIBDIR}/ - install -m 0644 lib/libblkid.a ${STAGING_LIBDIR}/ + for i in libcom_err libss libuuid libblkid; do + oe_libinstall -a -C lib $i ${STAGING_LIBDIR} + done install -d ${STAGING_INCDIR}/et \ ${STAGING_INCDIR}/ss \ ${STAGING_INCDIR}/uuid \ diff --git a/e2fsprogs-libs/e2fsprogs-libs_1.34.oe b/e2fsprogs-libs/e2fsprogs-libs_1.34.oe index e9ebdabf6e..b776c6dc66 100644 --- a/e2fsprogs-libs/e2fsprogs-libs_1.34.oe +++ b/e2fsprogs-libs/e2fsprogs-libs_1.34.oe @@ -19,10 +19,9 @@ do_compile_prepend () { } do_stage () { - install -m 0644 lib/libcom_err.a ${STAGING_LIBDIR}/ - install -m 0644 lib/libss.a ${STAGING_LIBDIR}/ - install -m 0644 lib/libuuid.a ${STAGING_LIBDIR}/ - install -m 0644 lib/libblkid.a ${STAGING_LIBDIR}/ + for i in libcom_err libss libuuid libblkid; do + oe_libinstall -a -C lib $i ${STAGING_LIBDIR} + done install -d ${STAGING_INCDIR}/et \ ${STAGING_INCDIR}/ss \ ${STAGING_INCDIR}/uuid \ diff --git a/e2fsprogs-libs/e2fsprogs-libs_1.35.oe b/e2fsprogs-libs/e2fsprogs-libs_1.35.oe index 5afa214514..5d741fa7bd 100644 --- a/e2fsprogs-libs/e2fsprogs-libs_1.35.oe +++ b/e2fsprogs-libs/e2fsprogs-libs_1.35.oe @@ -19,10 +19,9 @@ do_compile_prepend () { } do_stage () { - install -m 0644 lib/libcom_err.a ${STAGING_LIBDIR}/ - install -m 0644 lib/libss.a ${STAGING_LIBDIR}/ - install -m 0644 lib/libuuid.a ${STAGING_LIBDIR}/ - install -m 0644 lib/libblkid.a ${STAGING_LIBDIR}/ + for i in libcom_err libss libuuid libblkid; do + oe_libinstall -a -C lib $i ${STAGING_LIBDIR} + done install -d ${STAGING_INCDIR}/et \ ${STAGING_INCDIR}/ss \ ${STAGING_INCDIR}/uuid \ diff --git a/fget/fget_1.2.9.oe b/fget/fget_1.2.9.oe index 4b154aa3a6..826f4f3088 100644 --- a/fget/fget_1.2.9.oe +++ b/fget/fget_1.2.9.oe @@ -16,7 +16,7 @@ do_configure() { } do_stage() { - install -m 0755 lib/libfget.a ${STAGING_LIBDIR}/ + oe_libinstall -a -C lib libfget ${STAGING_LIBDIR} install -m 0755 lib/libfget.h ${STAGING_INCDIR}/ } diff --git a/flex/flex_2.5.31.oe b/flex/flex_2.5.31.oe index 6a43597056..335bf91d59 100644 --- a/flex/flex_2.5.31.oe +++ b/flex/flex_2.5.31.oe @@ -8,6 +8,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/lex/flex-${PV}.tar.bz2 \ inherit autotools do_stage () { - install -m 0644 libfl.a ${STAGING_LIBDIR}/ + oe_libinstall -a libfl ${STAGING_LIBDIR} install -m 0644 FlexLexer.h ${STAGING_INCDIR}/ } diff --git a/gnome/gconf_2.6.1.oe b/gnome/gconf_2.6.1.oe index 7eed5a6bc4..04f906d401 100644 --- a/gnome/gconf_2.6.1.oe +++ b/gnome/gconf_2.6.1.oe @@ -12,8 +12,7 @@ inherit autotools pkgconfig HEADERS = "gconf.h gconf-changeset.h gconf-listeners.h gconf-schema.h gconf-value.h gconf-error.h gconf-engine.h gconf-client.h gconf-enum-types.h" do_stage() { - oe_soinstall gconf/.libs/libgconf-2.so.4.1.0 ${STAGING_LIBDIR}/ - install -m 0644 gconf/.libs/libgconf-2.lai ${STAGING_LIBDIR}/libgconf-2.la + oe_libinstall -so -C gconf libgconf-2 ${STAGING_LIBDIR} install -d ${STAGING_INCDIR}/gconf/2/gconf/ ( cd gconf; for i in ${HEADERS}; do install -m 0644 $i ${STAGING_INCDIR}/gconf/2/gconf/$i; done ) } diff --git a/gnome/orbit2_2.10.2.oe b/gnome/orbit2_2.10.2.oe index 6c90630ab3..d538807569 100644 --- a/gnome/orbit2_2.10.2.oe +++ b/gnome/orbit2_2.10.2.oe @@ -19,12 +19,10 @@ do_configure_prepend() { } do_stage() { - oe_soinstall src/orb/.libs/libORBit-2.so.0.0.0 ${STAGING_LIBDIR} - install -m 0644 src/orb/.libs/libORBit-2.lai ${STAGING_LIBDIR}/libORBit-2.la - oe_soinstall src/services/name/.libs/libORBitCosNaming-2.so.0.0.0 ${STAGING_LIBDIR} - install -m 0644 src/services/name/.libs/libORBitCosNaming-2.lai ${STAGING_LIBDIR}/libORBitCosNaming-2.la - oe_soinstall src/services/imodule/.libs/libORBit-imodule-2.so.0.0.0 ${STAGING_LIBDIR} - install -m 0644 src/services/imodule/.libs/libORBit-imodule-2.lai ${STAGING_LIBDIR}/libORBit-imodule-2.la + oe_libinstall -so -C src/orb libORBit-2 ${STAGING_LIBDIR} + oe_libinstall -so -C src/services/name libORBitCosNaming-2 ${STAGING_LIBDIR} + oe_libinstall -a -C src/services/name libname-server-2 ${STAGING_LIBDIR} + oe_libinstall -so -C src/services/imodule libORBit-imodule-2 ${STAGING_LIBDIR} for dir in orbit orbit/poa orbit/orb-core orbit/util orbit/dynamic; do install -d ${STAGING_INCDIR}/orbit-2.0/$dir @@ -35,6 +33,4 @@ do_stage() { install -m 0644 src/services/name/CosNaming.h ${STAGING_INCDIR}/orbit-2.0/ORBitservices/ install -m 0644 src/services/name/CosNaming_impl.h ${STAGING_INCDIR}/orbit-2.0/ORBitservices/ install -m 0644 src/services/imodule/orbit-imodule.h ${STAGING_INCDIR}/orbit-2.0/ORBitservices/ - - install -m 0644 src/services/name/libname-server-2.a ${STAGING_LIBDIR}/ } diff --git a/gpe-ownerinfo/gpe-ownerinfo_0.23.oe b/gpe-ownerinfo/gpe-ownerinfo_0.23.oe index 714b431afb..cc7c3909b4 100644 --- a/gpe-ownerinfo/gpe-ownerinfo_0.23.oe +++ b/gpe-ownerinfo/gpe-ownerinfo_0.23.oe @@ -9,6 +9,6 @@ DEPENDS = "gtk+ libgpewidget" SRC_URI = "http://gpe.handhelds.org/pub/projects/gpe/source/gpe-ownerinfo-${PV}.tar.gz" do_stage () { - install -m 0644 libgpe-ownerinfo.a ${STAGING_LIBDIR}/ + oe_libinstall -a libgpe-ownerinfo ${STAGING_LIBDIR} install -m 0644 gpe-ownerinfo.h ${STAGING_INCDIR}/ } diff --git a/libdes/libdes_4.01.oe b/libdes/libdes_4.01.oe index c213b81028..75143ebe1b 100644 --- a/libdes/libdes_4.01.oe +++ b/libdes/libdes_4.01.oe @@ -12,7 +12,6 @@ do_compile() { } do_stage() { - install -m 0755 libdes.a ${STAGING_LIBDIR}/ + oe_libinstall -a libdes ${STAGING_LIBDIR} install -m 0644 ${S}/des.h ${STAGING_INCDIR}/ } - diff --git a/liblockfile/liblockfile_1.05.oe b/liblockfile/liblockfile_1.05.oe index f8cded9a93..9ed2378a37 100644 --- a/liblockfile/liblockfile_1.05.oe +++ b/liblockfile/liblockfile_1.05.oe @@ -11,12 +11,9 @@ inherit autotools EXTRA_OECONF = "--enable-shared --enable-static" do_stage () { - install -m 644 ${S}/lockfile.h ${S}/maillock.h ${STAGING_INCDIR}/ - install -m 755 liblockfile.so \ - ${STAGING_LIBDIR}/liblockfile.so.1.0 - ln -sf liblockfile.so.1.0 ${STAGING_LIBDIR}/liblockfile.so - install -m 644 liblockfile.a ${STAGING_LIBDIR}/ -# install -m 755 nfslock.so.1.0 ${STAGING_LIBDIR}/ + install -m 644 ${S}/lockfile.h ${S}/maillock.h ${STAGING_INCDIR}/ + oe_libinstall -a -so liblockfile ${STAGING_LIBDIR} +# oe_libinstall -so nfslock ${STAGING_LIBDIR} } do_install () { diff --git a/libnet/libnet_1.0.2a.oe b/libnet/libnet_1.0.2a.oe index df33ed92c0..d22245fdf2 100644 --- a/libnet/libnet_1.0.2a.oe +++ b/libnet/libnet_1.0.2a.oe @@ -24,5 +24,5 @@ do_stage () { install -m 0644 include/libnet/libnet-macros.h ${STAGING_INCDIR}/libnet/ install -m 0644 include/libnet/libnet-asn1.h ${STAGING_INCDIR}/libnet/ install -m 0644 include/libnet/libnet-ospf.h ${STAGING_INCDIR}/libnet/ - install -m 0755 lib/libnet.a ${STAGING_LIBDIR}/ + oe_libinstall -a -C lib libnet ${STAGING_LIBDIR} } diff --git a/libnids/libnids_1.18.oe b/libnids/libnids_1.18.oe index d7ffdcdbab..c0ed37c9d0 100644 --- a/libnids/libnids_1.18.oe +++ b/libnids/libnids_1.18.oe @@ -14,5 +14,5 @@ EXTRA_OEMAKE = "'install_prefix=${D}'" do_stage () { install -m 0644 ${S}/src/nids.h ${STAGING_INCDIR}/ - install -m 0644 src/libnids.a ${STAGING_LIBDIR}/ + oe_libinstall -a -C src libnids ${STAGING_LIBDIR} } diff --git a/libsdl/libsdl-qpe_1.2.7.oe b/libsdl/libsdl-qpe_1.2.7.oe index 5c8f4f3079..baf130fd0f 100644 --- a/libsdl/libsdl-qpe_1.2.7.oe +++ b/libsdl/libsdl-qpe_1.2.7.oe @@ -24,7 +24,7 @@ EXTRA_OECONF = "--disable-debug --enable-cdrom --enable-threads --enable-timers do_stage() { oe_libinstall -so -C src libSDL ${STAGING_LIBDIR} ln -sf libSDL.so ${STAGING_LIBDIR}/libSDL-1.2.so - install -m 0644 src/main/libSDLmain.a ${STAGING_LIBDIR}/libSDLmain.a + oe_libinstall -a -C src/main libSDLmain ${STAGING_LIBDIR} install -d ${STAGING_INCDIR}/SDL for f in include/*.h diff --git a/libsdl/libsdl-x11_1.2.7.oe b/libsdl/libsdl-x11_1.2.7.oe index 900cc1d2ac..230e7cd9e6 100644 --- a/libsdl/libsdl-x11_1.2.7.oe +++ b/libsdl/libsdl-x11_1.2.7.oe @@ -23,7 +23,7 @@ EXTRA_OECONF = "--disable-debug --disable-cdrom --enable-threads --enable-timers do_stage() { oe_libinstall -so -C src libSDL ${STAGING_LIBDIR} ln -sf libSDL.so ${STAGING_LIBDIR}/libSDL-1.2.so - install -m 0644 src/main/libSDLmain.a ${STAGING_LIBDIR}/libSDLmain.a + oe_libinstall -a -C src/main libSDLmain ${STAGING_LIBDIR} install -d ${STAGING_INCDIR}/SDL for f in include/*.h diff --git a/libssh/libssh_0.1.oe b/libssh/libssh_0.1.oe index c2e79030bd..1a9ce23f11 100644 --- a/libssh/libssh_0.1.oe +++ b/libssh/libssh_0.1.oe @@ -17,7 +17,7 @@ do_stage () { for i in crypto.h libssh.h sftp.h ssh2.h; do install -m 0644 ${S}/include/libssh/$i ${STAGING_INCDIR}/libssh/ done - install -m 0755 libssh/libssh.so ${STAGING_LIBDIR}/ + oe_libinstall -so -C libssh libssh ${STAGING_LIBDIR} } do_install () { diff --git a/libtomcrypt/libtomcrypt_0.93.oe b/libtomcrypt/libtomcrypt_0.93.oe index abc9b17f03..db0580bfee 100644 --- a/libtomcrypt/libtomcrypt_0.93.oe +++ b/libtomcrypt/libtomcrypt_0.93.oe @@ -18,7 +18,6 @@ inherit autotools #FIXME add patch to make it shared do_stage() { - install -m 0755 libtomcrypt.a ${STAGING_LIBDIR}/ + oe_libinstall -a libtomcrypt ${STAGING_LIBDIR}/ install -m 0644 *.h ${STAGING_INCDIR}/ } - diff --git a/libvncserver/libvncserver_0.6.oe b/libvncserver/libvncserver_0.6.oe index abc3e9b15b..390efbaa5c 100644 --- a/libvncserver/libvncserver_0.6.oe +++ b/libvncserver/libvncserver_0.6.oe @@ -16,18 +16,19 @@ S = "${WORKDIR}/LibVNCServer-${PV}" inherit autotools do_stage () { - install -d ${STAGING_INCDIR}/rfb - install -m 0644 rfb/rfb.h rfb/rfbproto.h rfb/rfbint.h rfb/rfbconfig.h \ + install -d ${STAGING_INCDIR}/rfb + install -m 0644 rfb/rfb.h rfb/rfbproto.h rfb/rfbint.h rfb/rfbconfig.h \ rfb/rfbclient.h rfb/rfbregion.h rfb/keysym.h \ rfb/default8x16.h ${STAGING_INCDIR}/rfb - - install -m 0644 libvncserver.a libvncclient/libvncclient.a ${STAGING_LIBDIR} + + oe_libinstall -a -C libvncclient libvncclient ${STAGING_LIBDIR}/ + oe_libinstall -a libvncserver ${STAGING_LIBDIR}/ } do_install () { - install -d ${D}/${bindir} - install -m 0755 examples/storepasswd ${D}/${bindir} - install -d ${D}/${datadir}fbvncserver/classes - install -m 0644 classes/index.vnc ${D}/${datadir}fbvncserver/classes/ - install -m 0644 classes/VncViewer.jar ${D}/${datadir}fbvncserver/classes/ + install -d ${D}/${bindir} + install -m 0755 examples/storepasswd ${D}/${bindir} + install -d ${D}/${datadir}fbvncserver/classes + install -m 0644 classes/index.vnc ${D}/${datadir}fbvncserver/classes/ + install -m 0644 classes/VncViewer.jar ${D}/${datadir}fbvncserver/classes/ } diff --git a/lrzsz/lrzsz_0.12.20.oe b/lrzsz/lrzsz_0.12.20.oe index fb50cb209b..54a8eb0a6b 100644 --- a/lrzsz/lrzsz_0.12.20.oe +++ b/lrzsz/lrzsz_0.12.20.oe @@ -3,7 +3,9 @@ PRIORITY = "standard" DESCRIPTION = "Tools for zmodem/xmodem/ymodem file transfer" SRC_URI = "http://www.ohse.de/uwe/releases/lrzsz-${PV}.tar.gz \ - file://${FILESDIR}/makefile.patch;patch=1" + file://${FILESDIR}/autotools.patch;patch=1 \ + file://${FILESDIR}/makefile.patch;patch=1 \ + file://${FILESDIR}/m4.patch;patch=1" inherit autotools diff --git a/opie-libqrsync/opie-libqrsync_cvs.oe b/opie-libqrsync/opie-libqrsync_cvs.oe index 47301ba269..58bf306fa2 100644 --- a/opie-libqrsync/opie-libqrsync_cvs.oe +++ b/opie-libqrsync/opie-libqrsync_cvs.oe @@ -11,7 +11,6 @@ S = "${WORKDIR}/rsync" inherit opie do_stage() { - install -m 0644 libqrsync.a ${STAGING_LIBDIR}/ + oe_libinstall -a libqrsync ${STAGING_LIBDIR}/ install -m 0644 qrsync.h ${STAGING_INCDIR}/ } - diff --git a/snmp++/snmp++_3.2.10.oe b/snmp++/snmp++_3.2.10.oe index 6fcab6d96b..b6d66d6669 100644 --- a/snmp++/snmp++_3.2.10.oe +++ b/snmp++/snmp++_3.2.10.oe @@ -13,7 +13,7 @@ do_compile() { } do_stage() { - install -m 0755 ../lib/libsnmp++.a ${STAGING_LIBDIR}/ + oe_libinstall -a -C ../lib libsnmp++ ${STAGING_LIBDIR}/ install -d ${STAGING_INCDIR}/snmp++ install -m 0644 ../include/*.h ${STAGING_INCDIR}/snmp++ } diff --git a/transconnect/transconnect_1.2.oe b/transconnect/transconnect_1.2.oe index 761d594eec..1b59c6e6fd 100644 --- a/transconnect/transconnect_1.2.oe +++ b/transconnect/transconnect_1.2.oe @@ -14,5 +14,5 @@ do_install () { install -d ${D}/${sysconfdir} install -m 0644 tconn.conf ${D}/${sysconfdir}/ install -d ${D}/${libdir}/tconn - install -m 0755 tconn.so ${D}/${libdir}/tconn/ + oe_libinstall -so tconn ${D}/${libdir}/tconn/ } diff --git a/transconnect/transconnect_1.3-beta.oe b/transconnect/transconnect_1.3-beta.oe index 6b512cb22f..36b1dc3854 100644 --- a/transconnect/transconnect_1.3-beta.oe +++ b/transconnect/transconnect_1.3-beta.oe @@ -16,5 +16,5 @@ do_install () { install -d ${D}/${sysconfdir} install -m 0644 tconn.conf ${D}/${sysconfdir}/ install -d ${D}/${libdir}/tconn - install -m 0755 tconn.so ${D}/${libdir}/tconn/ + oe_libinstall -so tconn ${D}/${libdir}/tconn/ } diff --git a/uicmoc/uicmoc3-native_3.3.1.oe b/uicmoc/uicmoc3-native_3.3.1.oe index eeda60782d..a41fb7fe1e 100644 --- a/uicmoc/uicmoc3-native_3.3.1.oe +++ b/uicmoc/uicmoc3-native_3.3.1.oe @@ -22,7 +22,7 @@ do_configure() { do_stage() { install -m 0755 bin/moc ${STAGING_BINDIR}/moc3 install -m 0755 bin/uic ${STAGING_BINDIR}/uic3 - install lib/libqt.a ${STAGING_LIBDIR}/ + oe_libinstall -a -C lib libqt ${STAGING_LIBDIR} for f in include/*.h do install -m 0644 $f ${STAGING_INCDIR}/ diff --git a/usound/usound_0.2.0.oe b/usound/usound_0.2.0.oe index cdd90527ae..9aac128195 100644 --- a/usound/usound_0.2.0.oe +++ b/usound/usound_0.2.0.oe @@ -16,12 +16,11 @@ do_compile() { } do_stage() { - install lib/libusound.a ${STAGING_LIBDIR}/ - install -m 0644 lib/usound.h ${STAGING_INCDIR}/ + oe_libinstall -a -C lib libusound ${STAGING_LIBDIR} + install -m 0644 lib/usound.h ${STAGING_INCDIR}/ } do_install() { install -d ${D}${bindir} install -m 0755 daemon/usound ${D}${bindir} } - |