summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Parpart <trapni@gentoo.org>2007-02-16 21:20:11 +0000
committerChristian Parpart <trapni@gentoo.org>2007-02-16 21:20:11 +0000
commit8bedfc735f8bd4fdae7f9115681b7e0b734c21e6 (patch)
treeb7d8cc29d7e7f535de43c0408a102a0f8aaf0b22 /media-libs
parentadded/restricted some deps and rearranged some env-vars (diff)
downloadoverlay-8bedfc735f8bd4fdae7f9115681b7e0b734c21e6.tar.gz
overlay-8bedfc735f8bd4fdae7f9115681b7e0b734c21e6.tar.bz2
overlay-8bedfc735f8bd4fdae7f9115681b7e0b734c21e6.zip
make the compilation progress still happy when having *old* (aka. stable) library dependencies (libX11/libGL) isntalled.
svn path=/overlay/; revision=27
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/libcaptury/Manifest8
-rw-r--r--media-libs/libcaptury/libcaptury-0.1.0.ebuild36
2 files changed, 28 insertions, 16 deletions
diff --git a/media-libs/libcaptury/Manifest b/media-libs/libcaptury/Manifest
index 306190c..382144e 100644
--- a/media-libs/libcaptury/Manifest
+++ b/media-libs/libcaptury/Manifest
@@ -1,8 +1,8 @@
DIST captury-0.1.0.tar.bz2 34881 RMD160 ee105288e16cd2dc120adfc533f21d01f9e68528 SHA1 1a0ecc20ee557f25584c0f8799581aa7263ed466 SHA256 74dfb36d8275e1c5e1a893b33a2bdd24080887d8441fd80aa1d450342ff1d9a9
-EBUILD libcaptury-0.1.0.ebuild 1646 RMD160 a14cb0235dc60f9a9e71be8598a7d756cdd9688a SHA1 17f002c2ed1876bf53a65d26fefa15a1f909f776 SHA256 ca153a5c286586c2e8cbefe537c3f9d159c59af32433d14d8b951a1f0b8ff94a
-MD5 7da2c5ae926644bce4d506db2e32cb19 libcaptury-0.1.0.ebuild 1646
-RMD160 a14cb0235dc60f9a9e71be8598a7d756cdd9688a libcaptury-0.1.0.ebuild 1646
-SHA256 ca153a5c286586c2e8cbefe537c3f9d159c59af32433d14d8b951a1f0b8ff94a libcaptury-0.1.0.ebuild 1646
+EBUILD libcaptury-0.1.0.ebuild 1931 RMD160 84b6f88fcd17c9b338a2494d8abdaa8aebcda0bd SHA1 db2731599114d3daba7c00358f725fb7af9eac55 SHA256 488617180a0cd796e0f9adbb4c5063fdbc2bd2a0587b245cfb9a82ce1585e50e
+MD5 98f2a6177ec203d3ddebfbe0b95c7d72 libcaptury-0.1.0.ebuild 1931
+RMD160 84b6f88fcd17c9b338a2494d8abdaa8aebcda0bd libcaptury-0.1.0.ebuild 1931
+SHA256 488617180a0cd796e0f9adbb4c5063fdbc2bd2a0587b245cfb9a82ce1585e50e libcaptury-0.1.0.ebuild 1931
MISC ChangeLog 186 RMD160 5872ae9a465d4945dc091199477c214f846116d9 SHA1 0ecc2f1b60f1efe824d759767f97403703340417 SHA256 cb1f8827777dff98664829d67a8ca59074a6e4342c751397f2edca2fb758eee1
MD5 6304595e350b0b4ba1b3c2ee4001b09c ChangeLog 186
RMD160 5872ae9a465d4945dc091199477c214f846116d9 ChangeLog 186
diff --git a/media-libs/libcaptury/libcaptury-0.1.0.ebuild b/media-libs/libcaptury/libcaptury-0.1.0.ebuild
index 43c3946..79c0225 100644
--- a/media-libs/libcaptury/libcaptury-0.1.0.ebuild
+++ b/media-libs/libcaptury/libcaptury-0.1.0.ebuild
@@ -16,9 +16,9 @@ RDEPEND="media-libs/xvid
x11-libs/libX11
virtual/opengl
amd64? (
- >=app-emulation/emul-linux-x86-xlibs-7.0-r8
- >=app-emulation/emul-linux-x86-medialibs-1.2-r1
- )"
+ app-emulation/emul-linux-x86-xlibs
+ app-emulation/emul-linux-x86-medialibs
+ )" # enforce old emul pkgs. for testing only!
DEPEND="${RDEPEND}
dev-util/pkgconfig"
@@ -28,15 +28,26 @@ RESTRICT="multilib-pkg-force"
S="${WORKDIR}/captury-${PV}/${PN}"
setup_env() {
- use debug && append-flags -O0 -g3
- use debug || append-flags -DNDEBUG=1
+ LD_LIBRARY_PATH=
+ LDFLAGS=
+
+ # keep backwards compatibility as long as I *have* to.
+ if use amd64 && [[ ${ABI} = "x86" ]]; then
+ if has_version '<app-emulation/emul-linux-x86-xlibs-7.0-r8'; then
+ LDFLAGS="-L/emul/linux/x86/usr/lib"
+ LD_LIBRARY_PATH="/emul/linux/x86/usr/lib"
+ fi
+ fi
-# export LD_LIBRARY_PATH=/usr/$(get_libdir)
-# append-ldflags -L/usr/$(get_libdir)
+ export LDFLAGS
+ export LD_LIBRARY_PATH
}
src_compile() {
if [[ -z ${OABI} ]] && has_multilib_profile; then
+ use debug && append-flags -O0 -g3
+ use debug || append-flags -DNDEBUG=1
+
einfo "Building multilib ${PN} for ABIs: $(get_install_abis)"
OABI=${ABI}
for ABI in $(get_install_abis); do
@@ -44,17 +55,20 @@ src_compile() {
src_compile
done
ABI=${OABI}
+ return
fi
+ cd ${S}
+
if [[ ! -f configure ]]; then
./autogen.sh || die "autogen.sh failed"
fi
- mkdir abi-${ABI}
- pushd abi-${ABI}
-
setup_env
+ mkdir abi-${ABI}
+ cd abi-${ABI}
+
../configure \
--prefix="/usr" \
--host="$(get_abi_CHOST ${ABI})" \
@@ -62,8 +76,6 @@ src_compile() {
|| die "./configure for ABI ${ABI} failed"
emake || die "make for ABI ${ABI} failed"
-
- popd
}
src_install() {