From 82f9f2f5d69a3772429e98298b2966d4a61882a8 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Mon, 27 Sep 2010 17:02:54 +0000 Subject: [PATCH] Move gcc4 libs to B_COMMON_LIB_DIRECTORY/gcc4 for SDL and libs. --- media-libs/libsdl/libsdl-1.2-hg.bep | 10 +++++++++- media-libs/libsdl/libsdl-1.3-hg.bep | 12 ++++++++++-- media-libs/sdl-gfx/sdl-gfx-2.0.20.bep | 10 +++++++++- media-libs/sdl-image/sdl-image-1.2.10.bep | 13 +++++++++++-- media-libs/sdl-mixer/sdl-mixer-1.2.11.bep | 10 +++++++++- media-libs/sdl-net/sdl-net-1.2.7.bep | 10 +++++++++- media-libs/sdl-rtf/sdl-rtf-0.1.0.bep | 10 +++++++++- media-libs/sdl-sound/sdl-sound-1.0.3.bep | 10 +++++++++- media-libs/sdl-ttf/sdl-ttf-2.0.10.bep | 10 +++++++++- 9 files changed, 84 insertions(+), 11 deletions(-) diff --git a/media-libs/libsdl/libsdl-1.2-hg.bep b/media-libs/libsdl/libsdl-1.2-hg.bep index 4be5ddd69..3322c2dbb 100644 --- a/media-libs/libsdl/libsdl-1.2-hg.bep +++ b/media-libs/libsdl/libsdl-1.2-hg.bep @@ -13,7 +13,15 @@ BUILD { libtoolize --force --copy --install aclocal -I acinclude ./autogen.sh - ./configure --prefix=/boot/common + MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + if [ -n "$(setgcc | grep '2')" ]; then + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` + else + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4 + fi + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --libdir=$LIBDIR \ + --mandir=$MANDIR make } diff --git a/media-libs/libsdl/libsdl-1.3-hg.bep b/media-libs/libsdl/libsdl-1.3-hg.bep index 29ef0e22b..37763a8ee 100644 --- a/media-libs/libsdl/libsdl-1.3-hg.bep +++ b/media-libs/libsdl/libsdl-1.3-hg.bep @@ -9,7 +9,15 @@ DEPEND="" BUILD { cd libsdl-1.3-hg ./autogen.sh - ./configure --prefix=/boot/common + MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + if [ -n "$(setgcc | grep '2')" ]; then + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` + else + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4 + fi + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --libdir=$LIBDIR \ + --mandir=$MANDIR make } @@ -18,4 +26,4 @@ INSTALL { make install } LICENSE="GNU LGPL v2.1" -COPYRIGHT="1997-2009 Sam Lantinga" +COPYRIGHT="1997-2010 Sam Lantinga" diff --git a/media-libs/sdl-gfx/sdl-gfx-2.0.20.bep b/media-libs/sdl-gfx/sdl-gfx-2.0.20.bep index e213cea68..b70b95a2b 100644 --- a/media-libs/sdl-gfx/sdl-gfx-2.0.20.bep +++ b/media-libs/sdl-gfx/sdl-gfx-2.0.20.bep @@ -11,7 +11,15 @@ BUILD { aclocal autoconf automake - ./configure --prefix=/boot/common + MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + if [ -n "$(setgcc | grep '2')" ]; then + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` + else + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4 + fi + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --libdir=$LIBDIR \ + --mandir=$MANDIR make } diff --git a/media-libs/sdl-image/sdl-image-1.2.10.bep b/media-libs/sdl-image/sdl-image-1.2.10.bep index 30e274ea8..2a39de186 100644 --- a/media-libs/sdl-image/sdl-image-1.2.10.bep +++ b/media-libs/sdl-image/sdl-image-1.2.10.bep @@ -18,9 +18,18 @@ BUILD { libtoolize --force --copy --install aclocal -I acinclude ./autogen.sh - ./configure --prefix=/boot/common --enable-bmp --enable-lbm --enable-pcx \ + MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + if [ -n "$(setgcc | grep '2')" ]; then + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` + else + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4 + fi + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --enable-bmp --enable-lbm --enable-pcx \ --enable-pnm --enable-tga --enable-xcf --enable-xpm --enable-xv \ - --enable-gif --enable-jpg --disable-jpg-shared + --enable-gif --enable-jpg --disable-jpg-shared \ + --libdir=$LIBDIR \ + --mandir=$MANDIR make } diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.11.bep b/media-libs/sdl-mixer/sdl-mixer-1.2.11.bep index c89af94b2..94bf7b638 100644 --- a/media-libs/sdl-mixer/sdl-mixer-1.2.11.bep +++ b/media-libs/sdl-mixer/sdl-mixer-1.2.11.bep @@ -21,7 +21,15 @@ BUILD { cp /boot/common/share/aclocal/ltsugar.m4 acinclude cp /boot/common/share/aclocal/lt~obsolete.m4 acinclude ./autogen.sh - ./configure --prefix=/boot/common + MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + if [ -n "$(setgcc | grep '2')" ]; then + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` + else + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4 + fi + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --libdir=$LIBDIR \ + --mandir=$MANDIR make } diff --git a/media-libs/sdl-net/sdl-net-1.2.7.bep b/media-libs/sdl-net/sdl-net-1.2.7.bep index a1750a213..30fabc651 100644 --- a/media-libs/sdl-net/sdl-net-1.2.7.bep +++ b/media-libs/sdl-net/sdl-net-1.2.7.bep @@ -10,7 +10,15 @@ BUILD { cp /boot/common/share/aclocal/libtool.m4 acinclude/libtool.m4 libtoolize --copy --force --install ./autogen.sh - ./configure --prefix=/boot/common + MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + if [ -n "$(setgcc | grep '2')" ]; then + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` + else + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4 + fi + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --libdir=$LIBDIR \ + --mandir=$MANDIR make } diff --git a/media-libs/sdl-rtf/sdl-rtf-0.1.0.bep b/media-libs/sdl-rtf/sdl-rtf-0.1.0.bep index 1d291e58e..4969b8626 100644 --- a/media-libs/sdl-rtf/sdl-rtf-0.1.0.bep +++ b/media-libs/sdl-rtf/sdl-rtf-0.1.0.bep @@ -19,7 +19,15 @@ BUILD { libtoolize --copy --force --install aclocal -I m4 ./autogen.sh - ./configure --prefix=/boot/common + MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + if [ -n "$(setgcc | grep '2')" ]; then + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` + else + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4 + fi + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --libdir=$LIBDIR \ + --mandir=$MANDIR make } diff --git a/media-libs/sdl-sound/sdl-sound-1.0.3.bep b/media-libs/sdl-sound/sdl-sound-1.0.3.bep index bdd06345e..2d5728428 100644 --- a/media-libs/sdl-sound/sdl-sound-1.0.3.bep +++ b/media-libs/sdl-sound/sdl-sound-1.0.3.bep @@ -8,7 +8,15 @@ BUILD { cd sdl-sound-1.0.3 libtoolize --copy --force --install ./bootstrap - ./configure --prefix=/boot/common + MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + if [ -n "$(setgcc | grep '2')" ]; then + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` + else + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4 + fi + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --libdir=$LIBDIR \ + --mandir=$MANDIR make } diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0.10.bep b/media-libs/sdl-ttf/sdl-ttf-2.0.10.bep index 00d4981a3..cc30da81f 100644 --- a/media-libs/sdl-ttf/sdl-ttf-2.0.10.bep +++ b/media-libs/sdl-ttf/sdl-ttf-2.0.10.bep @@ -17,7 +17,15 @@ BUILD { cp /boot/common/share/aclocal/lt~obsolete.m4 acinclude echo "AC_CONFIG_MACRO_DIR([acinclude]) > configure.in" ./autogen.sh - ./configure --prefix=/boot/common + MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + if [ -n "$(setgcc | grep '2')" ]; then + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` + else + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4 + fi + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --libdir=$LIBDIR \ + --mandir=$MANDIR make }