diff options
| author | Chris Larson <clarson@kergoth.com> | 2003-11-21 18:27:14 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2003-11-21 18:27:14 +0000 |
| commit | e9b171e0738c2acef0650328b7f2e1ae7cdc55cc (patch) | |
| tree | 8afdd2f094195bb88a7a9636f5b9bd9f53ebb492 /jpeg | |
| parent | acea8d73cb0c72991690d488915e426bf7e46675 (diff) | |
Numerous build fixes from an oemake -a run, including two more fixes for libtool 'libdir from .la file leaking into library search path' situations.
BKrev: 3fbe5902eywlLRHkRQ1FaDS5C01-jg
Diffstat (limited to 'jpeg')
| -rw-r--r-- | jpeg/jpeg-6b/ldflags.patch | 0 | ||||
| -rw-r--r-- | jpeg/jpeg_6b.oe | 33 |
2 files changed, 33 insertions, 0 deletions
diff --git a/jpeg/jpeg-6b/ldflags.patch b/jpeg/jpeg-6b/ldflags.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/jpeg/jpeg-6b/ldflags.patch diff --git a/jpeg/jpeg_6b.oe b/jpeg/jpeg_6b.oe index e69de29bb2..abc9900624 100644 --- a/jpeg/jpeg_6b.oe +++ b/jpeg/jpeg_6b.oe @@ -0,0 +1,33 @@ +SECTION="libs" +PRIORITY="required" +MAINTAINER="Chris Larson <kergoth@handhelds.org>" +RDEPENDS="libc6" +DEPENDS=virtual/libc + +SRC_URI = http://www.ijg.org/files/jpegsrc.v${PV}.tar.gz \ + file://${FILESDIR}/debian.patch;patch=1 \ + file://${FILESDIR}/ldflags.patch;patch=1 + +inherit autotools libtool + +EXTRA_OECONF="--enable-static --enable-shared" + +CFLAGS_append = " -D_REENTRANT" + +do_stage() { + install -m 644 -D jconfig.h ${STAGING_DIR}/target/include/jconfig.h + install -m 644 -D jpeglib.h ${STAGING_DIR}/target/include/jpeglib.h + install -m 644 -D jmorecfg.h ${STAGING_DIR}/target/include/jmorecfg.h + install -m 644 -D jerror.h ${STAGING_DIR}/target/include/jerror.h + install -m 644 -D jpegint.h ${STAGING_DIR}/target/include/jpegint.h + install -m 755 -D .libs/libjpeg.so.62.0.0 ${STAGING_LIBDIR}/libjpeg.so.62.0.0 + ln -sf libjpeg.so.62.0.0 ${STAGING_LIBDIR}/libjpeg.so.62 + ln -sf libjpeg.so.62.0.0 ${STAGING_LIBDIR}/libjpeg.so +} + +do_install() { + install -d ${D}/${bindir} ${D}/${includedir} \ + ${D}/${mandir}/man1 ${D}/${libdir} + oe_runmake 'prefix=${D}/${prefix}' 'exec_prefix=${D}/${exec_prefix}' \ + install +} |