Removed gcc4 libdir for several packages in the libpak.

This commit is contained in:
Scott McCreary
2010-10-30 21:56:59 +00:00
parent ad5ad4d86f
commit 765716a4ce
22 changed files with 28 additions and 113 deletions

View File

@@ -9,11 +9,7 @@ BUILD {
cd flac-1.2.1 cd flac-1.2.1
libtoolize --force --copy --install libtoolize --force --copy --install
MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
if [ -n "$(setgcc | grep '2')" ]; then
LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`
else
LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4
fi
./autogen.sh --prefix=`finddir B_COMMON_DIRECTORY` \ ./autogen.sh --prefix=`finddir B_COMMON_DIRECTORY` \
--libdir=$LIBDIR \ --libdir=$LIBDIR \
--mandir=$MANDIR --mandir=$MANDIR

View File

@@ -18,11 +18,7 @@ BUILD {
cp /boot/common/share/aclocal/lt~obsolete.m4 acinclude cp /boot/common/share/aclocal/lt~obsolete.m4 acinclude
./autogen.sh ./autogen.sh
MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
if [ -n "$(setgcc | grep '2')" ]; then
LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`
else
LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4
fi
./configure --prefix=`finddir B_COMMON_DIRECTORY` \ ./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--libdir=$LIBDIR \ --libdir=$LIBDIR \
--mandir=$MANDIR --mandir=$MANDIR

View File

@@ -11,13 +11,8 @@ BUILD {
aclocal aclocal
automake automake
autoconf autoconf
MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
if [ -n "$(setgcc | grep '2')" ]; then
LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`
else
LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4
fi
./configure --prefix=`finddir B_COMMON_DIRECTORY` \ ./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--libdir=$LIBDIR \ --libdir=$LIBDIR \
--mandir=$MANDIR \ --mandir=$MANDIR \

View File

@@ -12,11 +12,7 @@ BUILD {
autoconf autoconf
automake automake
MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
if [ -n "$(setgcc | grep '2')" ]; then
LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`
else
LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4
fi
./configure --prefix=`finddir B_COMMON_DIRECTORY` \ ./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--libdir=$LIBDIR \ --libdir=$LIBDIR \
--mandir=$MANDIR --mandir=$MANDIR

View File

@@ -10,11 +10,7 @@ BUILD {
libtoolize --force --copy --install libtoolize --force --copy --install
autoreconf -i autoreconf -i
MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
if [ -n "$(setgcc | grep '2')" ]; then
LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`
else
LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4
fi
./configure --prefix=`finddir B_COMMON_DIRECTORY` \ ./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--libdir=$LIBDIR \ --libdir=$LIBDIR \
--mandir=$MANDIR --mandir=$MANDIR

View File

@@ -11,11 +11,7 @@ BUILD {
aclocal aclocal
autoconf autoconf
MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
if [ -n "$(setgcc | grep '2')" ]; then
LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`
else
LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4
fi
./configure --prefix=`finddir B_COMMON_DIRECTORY` \ ./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--libdir=$LIBDIR \ --libdir=$LIBDIR \
--mandir=$MANDIR --mandir=$MANDIR

View File

@@ -19,11 +19,7 @@ BUILD {
autoconf autoconf
automake --add-missing automake --add-missing
MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
if [ -n "$(setgcc | grep '2')" ]; then
LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`
else
LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4
fi
./configure --prefix=`finddir B_COMMON_DIRECTORY` \ ./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--libdir=$LIBDIR \ --libdir=$LIBDIR \
--mandir=$MANDIR --mandir=$MANDIR

View File

@@ -17,11 +17,7 @@ BUILD {
# LDFLAGS=-L/boot/common/lib \ # LDFLAGS=-L/boot/common/lib \
# CPPFLAGS=-I/boot/common/include # CPPFLAGS=-I/boot/common/include
MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
if [ -n "$(setgcc | grep '2')" ]; then
LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`
else
LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4
fi
./configure --prefix=`finddir B_COMMON_DIRECTORY` \ ./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--libdir=$LIBDIR \ --libdir=$LIBDIR \
--mandir=$MANDIR --mandir=$MANDIR

View File

@@ -12,11 +12,7 @@ BUILD {
autoconf autoconf
automake automake
MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
if [ -n "$(setgcc | grep '2')" ]; then
LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`
else
LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4
fi
./configure --prefix=`finddir B_COMMON_DIRECTORY` \ ./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--libdir=$LIBDIR \ --libdir=$LIBDIR \
--mandir=$MANDIR \ --mandir=$MANDIR \

View File

@@ -14,11 +14,7 @@ BUILD {
aclocal -I acinclude aclocal -I acinclude
./autogen.sh ./autogen.sh
MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
if [ -n "$(setgcc | grep '2')" ]; then
LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`
else
LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4
fi
./configure --prefix=`finddir B_COMMON_DIRECTORY` \ ./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--libdir=$LIBDIR \ --libdir=$LIBDIR \
--mandir=$MANDIR --mandir=$MANDIR

View File

@@ -11,11 +11,7 @@ BUILD {
aclocal -I m4 aclocal -I m4
autoconf autoconf
MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
if [ -n "$(setgcc | grep '2')" ]; then
LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`
else
LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4
fi
./configure --prefix=`finddir B_COMMON_DIRECTORY` \ ./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--libdir=$LIBDIR \ --libdir=$LIBDIR \
--mandir=$MANDIR \ --mandir=$MANDIR \

View File

@@ -12,11 +12,7 @@ BUILD {
autoconf autoconf
automake automake
MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
if [ -n "$(setgcc | grep '2')" ]; then
LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`
else
LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4
fi
./configure --prefix=`finddir B_COMMON_DIRECTORY` \ ./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--libdir=$LIBDIR \ --libdir=$LIBDIR \
--mandir=$MANDIR --mandir=$MANDIR

View File

@@ -19,11 +19,7 @@ BUILD {
aclocal -I acinclude aclocal -I acinclude
./autogen.sh ./autogen.sh
MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
if [ -n "$(setgcc | grep '2')" ]; then
LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`
else
LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4
fi
./configure --prefix=`finddir B_COMMON_DIRECTORY` \ ./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--enable-bmp --enable-lbm --enable-pcx \ --enable-bmp --enable-lbm --enable-pcx \
--enable-pnm --enable-tga --enable-xcf --enable-xpm --enable-xv \ --enable-pnm --enable-tga --enable-xcf --enable-xpm --enable-xv \

View File

@@ -22,11 +22,7 @@ BUILD {
cp /boot/common/share/aclocal/lt~obsolete.m4 acinclude cp /boot/common/share/aclocal/lt~obsolete.m4 acinclude
./autogen.sh ./autogen.sh
MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
if [ -n "$(setgcc | grep '2')" ]; then
LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`
else
LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4
fi
./configure --prefix=`finddir B_COMMON_DIRECTORY` \ ./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--libdir=$LIBDIR \ --libdir=$LIBDIR \
--mandir=$MANDIR --mandir=$MANDIR

View File

@@ -11,11 +11,7 @@ BUILD {
libtoolize --copy --force --install libtoolize --copy --force --install
./autogen.sh ./autogen.sh
MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
if [ -n "$(setgcc | grep '2')" ]; then
LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`
else
LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4
fi
./configure --prefix=`finddir B_COMMON_DIRECTORY` \ ./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--libdir=$LIBDIR \ --libdir=$LIBDIR \
--mandir=$MANDIR --mandir=$MANDIR

View File

@@ -20,11 +20,7 @@ BUILD {
aclocal -I m4 aclocal -I m4
./autogen.sh ./autogen.sh
MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
if [ -n "$(setgcc | grep '2')" ]; then
LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`
else
LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4
fi
./configure --prefix=`finddir B_COMMON_DIRECTORY` \ ./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--libdir=$LIBDIR \ --libdir=$LIBDIR \
--mandir=$MANDIR --mandir=$MANDIR

View File

@@ -9,11 +9,7 @@ BUILD {
libtoolize --copy --force --install libtoolize --copy --force --install
./bootstrap ./bootstrap
MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
if [ -n "$(setgcc | grep '2')" ]; then
LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`
else
LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4
fi
./configure --prefix=`finddir B_COMMON_DIRECTORY` \ ./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--libdir=$LIBDIR \ --libdir=$LIBDIR \
--mandir=$MANDIR --mandir=$MANDIR

View File

@@ -18,11 +18,7 @@ BUILD {
echo "AC_CONFIG_MACRO_DIR([acinclude]) > configure.in" echo "AC_CONFIG_MACRO_DIR([acinclude]) > configure.in"
./autogen.sh ./autogen.sh
MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
if [ -n "$(setgcc | grep '2')" ]; then
LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`
else
LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4
fi
./configure --prefix=`finddir B_COMMON_DIRECTORY` \ ./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--libdir=$LIBDIR \ --libdir=$LIBDIR \
--mandir=$MANDIR --mandir=$MANDIR

View File

@@ -20,11 +20,7 @@ BUILD {
automake --foreign --add-missing automake --foreign --add-missing
autoconf autoconf
MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
if [ -n "$(setgcc | grep '2')" ]; then
LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`
else
LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4
fi
./configure --prefix=`finddir B_COMMON_DIRECTORY` \ ./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--libdir=$LIBDIR \ --libdir=$LIBDIR \
--mandir=$MANDIR --mandir=$MANDIR

View File

@@ -19,11 +19,7 @@ BUILD {
automake --foreign --add-missing automake --foreign --add-missing
autoconf autoconf
MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
if [ -n "$(setgcc | grep '2')" ]; then
LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`
else
LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4
fi
./configure --prefix=`finddir B_COMMON_DIRECTORY` \ ./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--libdir=$LIBDIR \ --libdir=$LIBDIR \
--mandir=$MANDIR --mandir=$MANDIR

View File

@@ -11,11 +11,7 @@ BUILD {
echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac
autogen.sh --prefix=`finddir B_COMMON_DIRECTORY` autogen.sh --prefix=`finddir B_COMMON_DIRECTORY`
MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
if [ -n "$(setgcc | grep '2')" ]; then
LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`
else
LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4
fi
./configure --prefix=`finddir B_COMMON_DIRECTORY` \ ./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--libdir=$LIBDIR \ --libdir=$LIBDIR \
--mandir=$MANDIR --mandir=$MANDIR

View File

@@ -153,23 +153,23 @@ BUILD {
haikuporter -y -z sdl-sound-1.0.3 haikuporter -y -z sdl-sound-1.0.3
mv ${HPLOC}/media-libs/sdl-sound/*.xz ${HPLOC}/packs/optionalpackages/sources mv ${HPLOC}/media-libs/sdl-sound/*.xz ${HPLOC}/packs/optionalpackages/sources
# haikuporter -y -d -i allegro-4.4.1.1 haikuporter -y -d -i allegro-4.4.1.1
# mv ${HPLOC}/media-libs/allegro/*.zip ${HPLOC}/packs/libpak/zips mv ${HPLOC}/media-libs/allegro/*.zip ${HPLOC}/packs/libpak/zips
haikuporter -y -d -i dumb-0.9.3 haikuporter -y -d -i dumb-0.9.3
mv ${HPLOC}/media-libs/dumb/*.zip ${HPLOC}/packs/libpak/zips mv ${HPLOC}/media-libs/dumb/*.zip ${HPLOC}/packs/libpak/zips
# haikuporter -y -d -i jgmod-0.99 haikuporter -y -d -i jgmod-0.99
# mv ${HPLOC}/media-libs/jgmod/*.zip ${HPLOC}/packs/libpak/zips mv ${HPLOC}/media-libs/jgmod/*.zip ${HPLOC}/packs/libpak/zips
setgcc gcc4 setgcc gcc4
haikuporter -y -d -i readline-6.0 haikuporter -c -y -d -i readline-6.1
mv ${HPLOC}/sys-libs/readline/*.zip ${HPLOC}/packs/libpak/zips mv ${HPLOC}/sys-libs/readline/*.zip ${HPLOC}/packs/libpak/zips
haikuporter -y -d -i lua-5.1.4 haikuporter -c -y -d -i lua-5.1.4
mv ${HPLOC}/dev-lang/lua/*.zip ${HPLOC}/packs/libpak/zips mv ${HPLOC}/dev-lang/lua/*.zip ${HPLOC}/packs/libpak/zips
haikuporter -y -d -i physfs-2.0.1 haikuporter -c -y -d -i physfs-2.0.1
mv ${HPLOC}/dev-games/physfs/*.zip ${HPLOC}/packs/libpak/zips mv ${HPLOC}/dev-games/physfs/*.zip ${HPLOC}/packs/libpak/zips
haikuporter -c -y -d -i fribidi-0.19.2 haikuporter -c -y -d -i fribidi-0.19.2