LIBDIR wird jetzt von SetConfig gesetzt. Diese Funktion wird von genpkg for mk und postmk mit passenden

Argumenten Aufgerufen. Nebenbei wird noch UARCH auf 32 oder 64 gesetzt - jenachdem ob ein 64 Build oder ein 32 
Build stattfindet



git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@4645 504e572c-2e33-0410-9681-be2bf7408885
This commit is contained in:
kueller 2009-04-28 13:53:56 +00:00
parent 0969800115
commit f7dce2e084
107 changed files with 74 additions and 405 deletions

View File

@ -81,11 +81,9 @@ premk() {
mk() {
if [ "$MK64BIT" == "true" ]; then
ADDOPTIONS="--libdir=/usr/lib64"
PKGLIBDIR="lib64"
mkdir -p $TMPROOT/lib64 $TMPROOT/usr/lib64
else
ADDOPTIONS="--libdir=/usr/lib"
PKGLIBDIR="lib"
fi
CC="gcc ${BUILDOPTIONS} -I/usr/include" \
CXX="g++ ${BUILDOPTIONS} -I/usr/include" \
@ -98,27 +96,27 @@ mk() {
mv /tmp/builddefs include/builddefs
make -j $NUMCPU
make -j $NUMCPU PKG_BIN_DIR=$TMPROOT/usr/bin \
PKG_LIB_DIR=$TMPROOT/usr/$PKGLIBDIR \
PKG_LIB_DIR=$TMPROOT/usr/$LIBDIR \
PKG_SBIN_DIR=$TMPROOT/sbin \
PKG_SLIB_DIR=$TMPROOT/$PKGLIBDIR \
PKG_SLIB_DIR=$TMPROOT/$LIBDIR \
PKG_INC_DIR=$TMPROOT/usr/include/xfs \
PKG_MAN_DIR=$TMPROOT/usr/share/man \
PKG_DOC_DIR=$TMPROOT/usr/share/doc/xfsprogs install
make -j $NUMCPU PKG_BIN_DIR=$TMPROOT/usr/bin \
PKG_LIB_DIR=$TMPROOT/usr/$PKGLIBDIR \
PKG_LIB_DIR=$TMPROOT/usr/$LIBDIR \
PKG_SBIN_DIR=$TMPROOT/sbin \
PKG_SLIB_DIR=$TMPROOT/$PKGLIBDIR \
PKG_SLIB_DIR=$TMPROOT/$LIBDIR \
PKG_INC_DIR=$TMPROOT/usr/include/xfs \
PKG_MAN_DIR=$TMPROOT/usr/share/man \
PKG_DOC_DIR=$TMPROOT/usr/share/doc/xfsprogs install-dev
rm $TMPROOT/usr/$PKGLIBDIR/libacl.a
cp libacl/.libs/libacl.{so,a} $TMPROOT/usr/$PKGLIBDIR
ln -sf ../usr/lib/libacl.a $TMPROOT/$PKGLIBDIR/libacl.a
ln -sf ../usr/lib/libacl.la $TMPROOT/$PKGLIBDIR/libacl.la
ln libacl.so.1 $TMPROOT/usr/$PKGLIBDIR/libacl.so
sed -e "s%libdir=.*$%libdir=\'/usr/$PKGLIBDIR\'%" $TMPROOT/usr/$PKGLIBDIR/libacl.la |\
sed -e "s%/usr/sbin/libattr.la%/$PKGLIBDIR/libattr.la%" >/tmp/libacl.la
mv /tmp/libacl.la $TMPROOT/usr/$PKGLIBDIR/libacl.la
rm $TMPROOT/usr/$LIBDIR/libacl.a
cp libacl/.libs/libacl.{so,a} $TMPROOT/usr/$LIBDIR
ln -sf ../usr/lib/libacl.a $TMPROOT/$LIBDIR/libacl.a
ln -sf ../usr/lib/libacl.la $TMPROOT/$LIBDIR/libacl.la
ln libacl.so.1 $TMPROOT/usr/$LIBDIR/libacl.so
sed -e "s%libdir=.*$%libdir=\'/usr/$LIBDIR\'%" $TMPROOT/usr/$LIBDIR/libacl.la |\
sed -e "s%/usr/sbin/libattr.la%/$LIBDIR/libattr.la%" >/tmp/libacl.la
mv /tmp/libacl.la $TMPROOT/usr/$LIBDIR/libacl.la
}
postmk() {

View File

@ -77,11 +77,9 @@ premk() {
mk() {
if [ "$MK64BIT" == "true" ]; then
ADDOPTIONS="--libdir=/usr/lib64"
PKGLIBDIR="lib64"
mkdir -p $TMPROOT/usr/lib64 $TMPROOT/lib64
else
ADDOPTIONS="--libdir=/usr/lib"
PKGLIBDIR="lib"
fi
CC="gcc ${BUILDOPTIONS}" \
CXX="g++ ${BUILDOPTIONS}" \
@ -96,38 +94,38 @@ mk() {
mv /tmp/builddefs include/builddefs
make -j $NUMCPU
make -j $NUMCPU PKG_BIN_DIR=$TMPROOT/usr/bin \
PKG_LIB_DIR=$TMPROOT/usr/$PKGLIBDIR \
PKG_LIB_DIR=$TMPROOT/usr/$LIBDIR \
PKG_SBIN_DIR=$TMPROOT/sbin \
PKG_SLIB_DIR=$TMPROOT/$PKGLIBDIR \
PKG_SLIB_DIR=$TMPROOT/$LIBDIR \
PKG_INC_DIR=$TMPROOT/usr/include/attr \
PKG_MAN_DIR=$TMPROOT/usr/share/man \
PKG_DOC_DIR=$TMPROOT/usr/share/doc/xfsprogs install
make -j $NUMCPU PKG_BIN_DIR=$TMPROOT/usr/bin \
PKG_LIB_DIR=$TMPROOT/usr/$PKGLIBDIR \
PKG_LIB_DIR=$TMPROOT/usr/$LIBDIR \
PKG_SBIN_DIR=$TMPROOT/sbin \
PKG_SLIB_DIR=$TMPROOT/$PKGLIBDIR \
PKG_SLIB_DIR=$TMPROOT/$LIBDIR \
PKG_INC_DIR=$TMPROOT/usr/include/attr \
PKG_MAN_DIR=$TMPROOT/usr/share/man \
PKG_DOC_DIR=$TMPROOT/usr/share/doc/xfsprogs install-lib
make -j $NUMCPU PKG_BIN_DIR=$TMPROOT/usr/bin \
PKG_LIB_DIR=$TMPROOT/usr/$PKGLIBDIR \
PKG_LIB_DIR=$TMPROOT/usr/$LIBDIR \
PKG_SBIN_DIR=$TMPROOT/sbin \
PKG_SLIB_DIR=$TMPROOT/$PKGLIBDIR \
PKG_SLIB_DIR=$TMPROOT/$LIBDIR \
PKG_INC_DIR=$TMPROOT/usr/include/attr \
PKG_MAN_DIR=$TMPROOT/usr/share/man \
PKG_DOC_DIR=$TMPROOT/usr/share/doc/xfsprogs install-dev
rm $TMPROOT/usr/$PKGLIBDIR/libattr.{a,la}
cp libattr/.libs/libattr.{so,a}* $TMPROOT/usr/$PKGLIBDIR
cp /libexec/libattr.la $TMPROOT/usr/$PKGLIBDIR
ln -sf ../usr/$PKGLIBDIR/libattr.a $TMPROOT/$PKGLIBDIR/libattr.a
ln -sf ../usr/$PKGLIBDIR/libattr.la $TMPROOT/$PKGLIBDIR/libattr.la
ln -sf ../../$PKGLIBDIR/libattr.so $TMPROOT/usr/$PKGLIBDIR/libattr.so
rm $TMPROOT/$PKGLIBDIR/libattr.so
ln -s ../usr/$PKGLIBDIR/libattr.so.1.1.0 $TMPROOT/$PKGLIBDIR/libattr.so
sed -e "s/libdir=.*$/libdir=\'\/$PKGLIBDIR\'/" $TMPROOT/$PKGLIBDIR/libattr.la >/tmp/libattr.la
mv /tmp/libattr.la $TMPROOT/$PKGLIBDIR/libattr.la
rm $TMPROOT/usr/$PKGLIBDIR/libattr.so
ln -s libattr.so.1.1.0 $TMPROOT/usr/$PKGLIBDIR/libattr.so
rm $TMPROOT/usr/$LIBDIR/libattr.{a,la}
cp libattr/.libs/libattr.{so,a}* $TMPROOT/usr/$LIBDIR
cp /libexec/libattr.la $TMPROOT/usr/$LIBDIR
ln -sf ../usr/$LIBDIR/libattr.a $TMPROOT/$LIBDIR/libattr.a
ln -sf ../usr/$LIBDIR/libattr.la $TMPROOT/$LIBDIR/libattr.la
ln -sf ../../$LIBDIR/libattr.so $TMPROOT/usr/$LIBDIR/libattr.so
rm $TMPROOT/$LIBDIR/libattr.so
ln -s ../usr/$LIBDIR/libattr.so.1.1.0 $TMPROOT/$LIBDIR/libattr.so
sed -e "s/libdir=.*$/libdir=\'\/$LIBDIR\'/" $TMPROOT/$LIBDIR/libattr.la >/tmp/libattr.la
mv /tmp/libattr.la $TMPROOT/$LIBDIR/libattr.la
rm $TMPROOT/usr/$LIBDIR/libattr.so
ln -s libattr.so.1.1.0 $TMPROOT/usr/$LIBDIR/libattr.so
}
postmk() {

View File

@ -77,11 +77,6 @@ premk() {
}
mk() {
if [ "$MK64BIT" == "true" ]; then
LIBDIR=lib64
else
LIBDIR=lib
fi
CC="gcc ${BUILDOPTIONS}" \
./configure --host=$TARGET \
--libexecdir=/usr/$LIBDIR/locate \

View File

@ -82,7 +82,6 @@ premk() {
mk() {
if [ "$MK64BIT" == "true" ]; then
ADDCONFIGURE="--libdir=/usr/lib64 --libexecdir=/usr/lib64"
LIBDIR=lib64
RPATH="/lib64:/lib"
else
ADDCONFIGURE="--libexecdir=/usr/lib"

View File

@ -100,9 +100,6 @@ mk32() {
mk() {
if [ "$MK64BIT" == "true" ]; then
ADDOPTIONS="--libdir=/usr/lib64"
LIBDIR=lib64
else
LIBDIR=lib
fi
CC="gcc -isystem /usr/include ${BUILDOPTIONS}" \
CXX="g++ -isystem /usr/include ${BUILDOPTIONS}" \

View File

@ -80,11 +80,6 @@ premk() {
#Hier wird der Make Prozess der Sourcen definiert
mk() {
if [ ${MK64BIT} == "true" ]; then
LIBDIR=lib64
else
LIBDIR=lib
fi
make -j $NUMCPU CC="gcc ${BUILDOPTIONS}" \
DESTDIR=/ \
LIBDIR=/usr/$LIBDIR \

View File

@ -93,11 +93,6 @@ mk() {
postmk() {
mv $TMPROOT/share $TMPROOT/usr/share
if [ "$MK64BIT" == "true" ]; then
LIBDIR=lib64
else
LIBDIR=lib
fi
rm $TMPROOT/$LIBDIR/kbd/keymaps/i386/qwerty/defkeymap.map.gz
ln -s i386/qwertz/de-latin1.map.gz $TMPROOT/$LIBDIR/kbd/keymaps/defkeymap.map.gz
mkdir -p $TMPROOT/bin

View File

@ -94,11 +94,6 @@ mk32() {
}
mk() {
if [ $MK64BIT == "true" ]; then
LIBDIR=lib64
else
LIBDIR=lib
fi
CC="gcc -isystem /usr/include ${BUILDOPTIONS}" \
CXX="g++ -isystem /usr/include ${BUILDOPTIONS}" \
LDFLAGS="-Wl,-rpath-link,/$LIBDIR ${BUILDOPTIONS}" \

View File

@ -106,16 +106,9 @@ mk32() {
}
mk() {
if [ "$MK64BIT" == "true" ]; then
ADDOPTIONS="--libdir=/lib64"
LIBDIR="lib64"
else
ADDOPTIONS="--libdir=/lib"
LIBDIR="lib"
fi
CC="gcc ${BUILDOPTIONS}" \
CXX="g++ ${BUILDOPTIONS}" \
../readline*/configure $ADDOPTIONS \
../readline*/configure --libdir=/$LIBDIR \
--prefix=/usr
make -j $NUMCPU &&
make -j $NUMCPU install &&

View File

@ -104,18 +104,11 @@ mk32() {
mk() {
if [ "$MK64BIT" == "true" ]; then
ADDOPTIONS="--libdir=/lib64"
LIBDIR=lib64
else
ADDOPTIONS="--libdir=/lib"
LIBDIR=lib
fi
CC="gcc ${BUILDOPTIONS}" \
CC="gcc ${BUILDOPTIONS}" \
../shadow*/configure --host=$TARGET \
--prefix=/usr \
$ADDOPTIONS \
--libdir=/$LIBDIR \
--sysconfdir=/etc \
--enable-shared \
--with-libpam \

View File

@ -76,11 +76,6 @@ premk() {
}
mk() {
if [ "$MK64BIT" == "true" ];then
LIBDIR=lib64
else
LIBDIR=lib
fi
CC="gcc $BUILDOPTIONS -fPIC" \
CXX="g++ $BUILDOPTIONS -fPIC" \
LDFLAGS="-L/$LIBDIR -L/usr/$LIBDIR -L/usr/X11R7/$LIBDIR" \

View File

@ -88,11 +88,6 @@ mk32() {
}
mk() {
if [ "$MK64BIT" == "true" ];then
LIBDIR=lib64
else
LIBDIR=lib
fi
CC="gcc ${BUILDOPTIONS}" \
CXX="g++ ${BUILDOPTIONS}" \
./configure --prefix=/usr \

View File

@ -75,11 +75,6 @@ premk() {
}
mk() {
if [ "$MK64BIT" == "true" ]; then
LIBDIR=lib64
else
LIBDIR=lib
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
./configure --target=$TARGET \

View File

@ -118,9 +118,6 @@ mk() {
if [ "$MK64BIT" == "true" ]; then
ADDOPTIONS="--libdir=/usr/lib64"
mkdir -p $TMPROOT/usr/lib64 $TMPROOT/lib64
PKGLIBDIR=lib64
else
PKGLIBDIR=lib
fi
CC="gcc ${BUILDOPTIONS}" \
CXX="g++ ${BUILDOPTIONS}" \
@ -131,25 +128,25 @@ mk() {
--enable-share-uuid=yes
make -j $NUMCPU &&
make -j $NUMCPU PKG_BIN_DIR=$TMPROOT/usr/bin \
PKG_LIB_DIR=$TMPROOT/usr/$PKGLIBDIR \
PKG_LIB_DIR=$TMPROOT/usr/$LIBDIR \
PKG_SBIN_DIR=$TMPROOT/sbin \
PKG_SLIB_DIR=$TMPROOT/$PKGLIBDIR \
PKG_SLIB_DIR=$TMPROOT/$LIBDIR \
PKG_INC_DIR=$TMPROOT/usr/include/xfs \
PKG_MAN_DIR=$TMPROOT/usr/share/man \
PKG_DOC_DIR=$TMPROOT/usr/doc/xfsprogs install
make -j $NUMCPU PKG_BIN_DIR=$TMPROOT/usr/bin \
PKG_LIB_DIR=$TMPROOT/usr/$PKGLIBDIR \
PKG_LIB_DIR=$TMPROOT/usr/$LIBDIR \
PKG_SBIN_DIR=$TMPROOT/sbin \
PKG_SLIB_DIR=$TMPROOT/$PKGLIBDIR \
PKG_SLIB_DIR=$TMPROOT/$LIBDIR \
PKG_INC_DIR=$TMPROOT/usr/include/xfs \
PKG_MAN_DIR=$TMPROOT/usr/share/man \
PKG_DOC_DIR=$TMPROOT/usr/doc/xfsprogs install-dev
rm $TMPROOT/usr/$PKGLIBDIR/libhandle.a
cp libhandle/.libs/libhandle.a $TMPROOT/usr/$PKGLIBDIR
rm $TMPROOT/usr/$LIBDIR/libhandle.a
cp libhandle/.libs/libhandle.a $TMPROOT/usr/$LIBDIR
rm $TMPROOT/usr/lib/libhandle.la
sed -e "s%^libdir.*$%libdir=\'/usr/$PKGLIBDIR\'%" \
libhandle/.libs/libhandle.la >$TMPROOT/usr/$PKGLIBDIR/libhandle.la
cp /libexec/{libdisk.a,libxcmd.a,libxfs.a,libxlog.a} $TMPROOT/usr/$PKGLIBDIR/
sed -e "s%^libdir.*$%libdir=\'/usr/$LIBDIR\'%" \
libhandle/.libs/libhandle.la >$TMPROOT/usr/$LIBDIR/libhandle.la
cp /libexec/{libdisk.a,libxcmd.a,libxfs.a,libxlog.a} $TMPROOT/usr/$LIBDIR/
}
#Funktion wird nach Ablauf des Make Prozesses ausgeführt, und kann

View File

@ -116,9 +116,6 @@ mk() {
if [ "$MK64BIT" == "true" ]; then
ADDOPTIONS="--libdir=/usr/lib64"
ADDMAKE="libdir=$TMPROOT/usr/lib64"
LIBDIR=lib64
else
LIBDIR=lib
fi
CC="gcc -isystem /usr/include ${BUILDOPTIONS} -fPIC" \
CXX="g++ -isystem /usr/include ${BUILDOPTIONS} -fPIC" \

View File

@ -113,12 +113,10 @@ mk() {
echo "libc_cv_c_cleanup=yes" >> config.cache
echo "libc_cv_gnu99_inline=yes" >> config.cache
if [ ${MK64BIT} == "true" ]; then
LIBDIR=lib64
if echo $ARCH|grep -q sparc; then
echo "libc_cv_sparc64_tls=yes" >>config.cache
fi
else
LIBDIR=lib
BUILDOPTIONS=$BUILDOPTIONS" -march=i486"
fi
echo "slibdir=/tools/$LIBDIR" >> configparms

View File

@ -88,10 +88,8 @@ premk() {
mk() {
if [ "$MK64BIT" == "true" ]; then
ADDCONFIGURE="--libdir=/tools/lib64"
LIBDIR=lib64
else
ADDCONFIGURE="--with-tcl=/tools/lib"
LIBDIR=lib
fi
CC="gcc ${BUILDFLAGS}" \
./configure --prefix=/tools \

View File

@ -96,10 +96,8 @@ premk() {
mk() {
if [ ${MK64BIT} == "true" ]; then
LIBDIR=lib64
ADDOPTIONS="--with-lib-path=/tools/lib64:/tools/lib"
else
LIBDIR=lib
ADDOPTIONS="--with-lib-path=/tools/lib"
fi
CC="${CC} ${BUILDOPTIONS}" \

View File

@ -82,11 +82,6 @@ premk() {
}
mk() {
if [ $MK64BIT == "true" ]; then
LIBDIR=lib64
else
LIBDIR=lib
fi
CC="${CC} ${BUILDOPTIONS}" \
CXX="${CXX} ${BUILDOPTIONS}" \
sed -i "s/ac_compiler -V/ac_compiler -v/" configure

View File

@ -81,11 +81,6 @@ premk() {
}
mk() {
if [ $MK64BIT == "true" ]; then
LIBDIR=lib64
else
LIBDIR=lib
fi
CC="${CC} ${BUILDOPTIONS}" \
CXX="${CC} ${BUILDOPTIONS}" \
./configure --host=$TARGET \

View File

@ -79,10 +79,7 @@ premk() {
mk() {
if [ "$MK64BIT" == "true" ]; then
LIBDIR=lib64
ADDOPTIONS="--libdir=/usr/lib64"
else
LIBDIR=lib
fi
CC="gcc $BUILDOPTIONS -fPIC" \
CXX="g++ $BUILDOPTIONS -fPIC" \

View File

@ -75,11 +75,6 @@ premk() {
}
mk() {
if [ "$MK64BIT" == "true" ]; then
LIBDIR=lib64
else
LIBDIR=lib
fi
PERLVERSION=`perl --version|grep " v"|sed -e "s/.*v//"|awk '{print $1}'`
mkdir -p $TMPROOT/usr/lib/site_perl/$PERLVERSION/Alien/Package
mkdir -p $TMPROOT/usr/bin

View File

@ -95,10 +95,7 @@ mk32() {
mk() {
if [ "$MK64BIT" == "true" ]; then
LIBDIR=lib64
ADDOPTIONS="--libdir=\${prefix}/lib64"
else
LIBDIR=lib
fi
for i in *; do
cd $i

View File

@ -79,11 +79,6 @@ premk() {
}
mk() {
if [ "$MK64BIT" == "true" ]; then
LIBDIR=lib64
else
LIBDIR=lib
fi
gcc $BUILDOPTIONS -o javaclassname javaclassname.c
mkdir -p $TMPROOT/usr/$LIBDIR/jdk/bin
mkdir -p $TMPROOT/etc/init.d/rc{3,4,5}.d

View File

@ -77,10 +77,7 @@ premk() {
mk() {
if [ "$MK64BIT" == "true" ]; then
LIBDIR=lib64
ADDOPTIONS="--libdir=/usr/lib64"
else
LIBDIR=lib
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \

View File

@ -79,9 +79,6 @@ premk() {
mk() {
if [ "$MK64BIT" == "true" ]; then
ADDOPTIONS="--libdir=/usr/lib64"
LIBDIR=lib64
else
LIBDIR=lib
fi
LDFLAGS="-Wl,-rpath-link,/usr/$LIBDIR" \
CC="gcc $BUILDOPTIONS" \

View File

@ -83,7 +83,7 @@ premk() {
}
mk32() {
CC="gcc ${BUILDOPTIONS32}" USE_ARCH=32 \
CC="gcc ${BUILDOPTIONS32}" USE_ARCH=$UARCH \
../dbus*/configure --prefix=/usr \
--sysconfdir=/etc/sysconfig/dbus \
--libexecdir=/usr/lib/dbus-1.0 \
@ -101,7 +101,7 @@ mk() {
if [ "$MK64BIT" == "true" ]; then
ADDOPTIONS="--libdir=\${prefix}/lib64"
fi
CC="gcc $BUILDOPTIONS" USE_ARCH=64 \
CC="gcc $BUILDOPTIONS" USE_ARCH=$UARCH \
../dbus*/configure --prefix=/usr \
$ADDOPTIONS \
--sysconfdir=/etc/sysconfig/dbus \

View File

@ -108,11 +108,6 @@ mk32() {
}
mk() {
if [ "$MK64BIT" == "true" ]; then
LIBDIR=lib64
else
LIBDIR=lib
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
LDFLAGS="-L/$LIBDIR -L/usr/$LIBDIR -L/usr/X11R7/$LIBDIR" \

View File

@ -104,9 +104,6 @@ mk32() {
mk() {
if [ "$MK64BIT" == "true" ]; then
ADDOPTIONS="--libdir=\${prefix}/lib64"
LIBDIR=lib64
else
LIBDIR=lib
fi
CFLAGS=$CFLAGS" -I/usr/include/openssl" \
CC="gcc $BUILDOPTIONS" \

View File

@ -88,11 +88,6 @@ mk32() {
}
mk() {
if [ "$MK64BIT" == "true" ]; then
LIBDIR=lib64
else
LIBDIR=lib
fi
mv src/osdep/unix/Makefile src/osdep/unix/Makefile.orig
sed -e "s/^SSLDIR=.*/SSLDIR=\/usr/g" src/osdep/unix/Makefile.orig >src/osdep/unix/Makefile
make CC="gcc $BUILDOPTIONS -fPIC" CXX="g++ $BUILDOPTIONS -fPIC" slx

View File

@ -78,9 +78,6 @@ premk() {
mk() {
if [ "$MK64BIT" == "true" ]; then
ADDOPTIONS="--libdir=\${prefix}/lib64"
LIBDIR=lib64
else
LIBDIR=lib
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \

View File

@ -100,9 +100,6 @@ mk32() {
mk() {
if [ "$MK64BIT" == "true" ]; then
ADDOPTIONS="--libdir=\${prefix}/lib64"
LIBDIR=lib64
else
LIBDIR=lib
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \

View File

@ -100,9 +100,6 @@ mk() {
if [ "$MK64BIT" == "true" ]; then
ADDOPTIONS="--libdir=\${prefix}/lib64"
export LDFLAGS="-L/lib64 -L/usr/lib64"
LIBDIR=lib64
else
LIBDIR=lib
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \

View File

@ -83,7 +83,7 @@ premk() {
mk32() {
CC="gcc $BUILDOPTIONS32" \
CXX="g++ $BUILDOPTIONS32" \
USE_ARCH=32 \
USE_ARCH=$UARCH \
./configure --target=$TARGET32 \
--prefix=/usr \
--without-python &&
@ -101,7 +101,7 @@ mk() {
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
USE_ARCH=64 \
USE_ARCH=$UARCH \
./configure --target=$TARGET \
--prefix=/usr \
$ADDOPTIONS &&

View File

@ -115,9 +115,6 @@ postmk() {
cd -
rm -r $TMPROOT/usr
mv $TMPROOT/usr32 $TMPROOT/usr
LIBDIR=lib64
else
LIBDIR=lib
fi
mkdir -p $TMPROOT/usr/$LIBDIR $TMPROOT/usr/include $TMPROOT/usr/share/doc/netpbm
if [ -h $TMPROOT/usr/link/libnetpbm.so ]; then

View File

@ -72,9 +72,6 @@
SRCPATH=Tools/lib
premk() {
# cd ../pwlib*
# PWLIBDIR=`pwd`
# cd -
echo "Nothing to do for premk()"
}

View File

@ -97,7 +97,7 @@ mk() {
CheckError "Configurescript failed !" 1
# Make-Optionen eintragen
USE_ARCH=32 CC="gcc ${BUILDOPTIONS}" ./configure --prefix=/usr --with-pc-path=/usr/share/pkgconfig &&
USE_ARCH=$UARCH CC="gcc ${BUILDOPTIONS}" ./configure --prefix=/usr --with-pc-path=/usr/share/pkgconfig &&
make -j $NUMCPU
CheckError "Makeprocess failed !" 1

View File

@ -88,9 +88,6 @@ mk32() {
mk() {
if [ "$MK64BIT" == "true" ]; then
ADDOPTIONS="--libdir=\${prefix}/lib64"
LIBDIR=lib64
else
LIBDIR=lib
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \

View File

@ -97,11 +97,6 @@ mk32() {
}
mk() {
if [ "$MK64BIT" == "true" ]; then
LIBDIR=lib64
else
LIBDIR=lib
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
./configure --target=$TARGET \

View File

@ -85,7 +85,7 @@ premk() {
mk32() {
CC="gcc $BUILDOPTIONS32" \
CXX="g++ $BUILDOPTIONS32" \
USE_ARCH=32 \
USE_ARCH=$UARCH \
./configure --host=$TARGET32 \
--prefix=/usr/X11R7 \
--enable-threads \
@ -102,7 +102,7 @@ mk() {
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
USE_ARCH=64 \
USE_ARCH=$UARCH \
./configure --host=$TARGET \
--prefix=/usr/X11R7 \
--enable-threads \

View File

@ -96,9 +96,6 @@ mk32() {
mk() {
if [ "$MK64BIT" == "true" ]; then
ADDOPTIONS="--libdir=\${prefix}/lib64"
LIBDIR=lib64
else
LIBDIR=lib
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \

View File

@ -82,11 +82,6 @@ mk32() {
}
mk() {
if [ "$MK64BIT" == "true" ] ;then
LIBDIR=lib64
else
LIBDIR=lib
fi
make CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
PREFIX=/usr \

View File

@ -84,11 +84,6 @@ mk32() {
}
mk() {
if [ "$MK64BIT" == "true" ]; then
LIBDIR=lib64
else
LIBDIR=lib
fi
cd build/generic
./configure
make CC="gcc $BUILDOPTIONS" -j $NUMCPU

View File

@ -91,12 +91,9 @@ mk() {
DSTPKGNAME=`basename $DSTPKGNAME`
PKGNAME=$DSTPKGNAME.tbz
if [ ${MK64BIT} == "true" ]; then
LIBDIR=lib64
mv usr/X11R6/lib usr/X11R6/lib64
mv usr/lib usr/lib64
mv usr/lib32 usr/lib
else
LIBDIR=lib
fi
mv usr/share/doc usr/share/nvidia
mkdir usr/share/doc

View File

@ -86,11 +86,9 @@ mk() {
if [ "$MK64BIT" == "true" ]; then
tar -C arch/x86_64 -cf - .|tar -C $TMPROOT -xvf -
tar -C x710_64a -cf - .|tar -C $TMPROOT -xvf -
LIBDIR=lib64
else
tar -C arch/x86 -cf - .|tar -C $TMPROOT -xvf -
tar -C x710 -cf - .|tar -C $TMPROOT -xvf -
LIBDIR=lib
fi
cp ATI_LICENSE.TXT $TMPROOT/usr/share/ati
mv $TMPROOT/usr/X11R6 $TMPROOT/usr/X11R7

View File

@ -78,7 +78,7 @@ premk() {
mk32() {
CC="gcc $BUILDOPTIONS32" \
CXX="g++ $BUILDOPTIONS32" \
USE_ARCH=32 \
USE_ARCH=$UARCH \
./configure --host=$TARGET32 \
--localstatedir=/var \
--infodir=/usr/share/info \
@ -95,7 +95,7 @@ mk() {
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
USE_ARCH=64 \
USE_ARCH=$UARCH \
./configure --host=$TARGET \
--localstatedir=/var \
--infodir=/usr/share/info \

View File

@ -78,7 +78,7 @@ premk() {
mk32() {
CC="gcc $BUILDOPTIONS32" \
CXX="g++ $BUILDOPTIONS32" \
USE_ARCH=32 \
USE_ARCH=$UARCH \
./configure --host=$TARGET32 \
--localstatedir=/var \
--infodir=/usr/share/info \
@ -97,7 +97,7 @@ mk() {
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
USE_ARCH=64 \
USE_ARCH=$UARCH \
./configure --host=$TARGET \
--localstatedir=/var \
--infodir=/usr/share/info \

View File

@ -79,7 +79,7 @@ premk() {
mk32() {
CC="gcc $BUILDOPTIONS32" \
CXX="g++ $BUILDOPTIONS32" \
USE_ARCH=32 \
USE_ARCH=$UARCH \
./configure --host=$TARGET32 \
--localstatedir=/var \
--infodir=/usr/share/info \
@ -96,7 +96,7 @@ mk() {
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
USE_ARCH=64 \
USE_ARCH=$UARCH \
./configure --host=$TARGET \
--localstatedir=/var \
--infodir=/usr/share/info \

View File

@ -92,9 +92,6 @@ mk32() {
mk() {
if [ "$MK64BIT" == "true" ]; then
ADDOPTIONS="--libdir=/usr/X11R7/lib64"
LIBDIR=lib64
else
LIBDIR=lib
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \

View File

@ -80,7 +80,7 @@ premk() {
mk32() {
CC="gcc $BUILDOPTIONS32" \
CXX="gcc $BUILDOPTIONS32" \
USE_ARCH=32 \
USE_ARCH=$UARCH \
./configure --host=$TARGET32 \
--build=$TARGET32 \
--localstatedir=/var \
@ -98,7 +98,7 @@ mk() {
fi
CC="gcc $BUILDOPTIONS" \
CXX="gcc $BUILDOPTIONS" \
USE_ARCH=64 \
USE_ARCH=$UARCH \
./configure --host=$TARGET \
--build=$TARGET \
--localstatedir=/var \

View File

@ -76,11 +76,6 @@ premk() {
}
mk() {
if [ "$MK64BIT" == "true" ]; then
LIBDIR=lib64
else
LIBDIR=lib
fi
mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts/TTF
cp *.ttf $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts/TTF
}

View File

@ -78,7 +78,7 @@ premk() {
mk32() {
CC="gcc $BUILDOPTIONS32" \
CXX="g++ $BUILDOPTIONS32" \
USE_ARCH=32 \
USE_ARCH=$UARCH \
./configure --host=$TARGET \
--localstatedir=/var \
--infodir=/usr/share/info \
@ -95,7 +95,7 @@ mk() {
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
USE_ARCH=64 \
USE_ARCH=$UARCH \
./configure --host=$TARGET \
--localstatedir=/var \
--infodir=/usr/share/info \

View File

@ -69,7 +69,7 @@
#
#
SRCPATH=XServ/Extras
SRCPATH=XServ/Data
premk() {
echo "Nothing to do for premk()"

View File

@ -78,7 +78,7 @@ premk() {
mk32() {
CC="gcc $BUILDOPTIONS32" \
CXX="g++ $BUILDOPTIONS32" \
USE_ARCH=32 \
USE_ARCH=$UARCH \
./configure --host=$TARGET \
--localstatedir=/var \
--infodir=/usr/share/info \
@ -95,7 +95,7 @@ mk() {
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
USE_ARCH=64 \
USE_ARCH=$UARCH \
./configure --host=$TARGET \
--localstatedir=/var \
--infodir=/usr/share/info \

View File

@ -82,9 +82,6 @@ premk() {
mk() {
if [ "$MK64BIT" == "true" ]; then
ADDOPTIONS="--libdir=/usr/X11R7/lib64"
LIBDIR=lib64
else
LIBDIR=lib
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \

View File

@ -77,10 +77,7 @@ premk() {
mk() {
if [ "$MK64BIT" == "true" ]; then
LIBDIR=lib64
ADDOPTIONS="--libdir=\${prefix}/lib64"
else
LIBDIR=lib
fi
ldconfig
export QTDIR=/usr/$LIBDIR/qt

View File

@ -124,9 +124,6 @@ mk() {
export QTDIR=$STQTDIR
if [ "$MK64BIT" == "true" ];then
ADDOPTIONS="--libdir=\${prefix}/lib64"
LIBDIR=lib64
else
LIBDIR=lib
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \

View File

@ -76,11 +76,6 @@ premk() {
}
mk() {
if [ "$MK64BIT" == "true" ]; then
LIBDIR=lib64
else
LIBDIR=lib
fi
LDFLAGS="-L/$LIBDIR -L/usr/$LIBDIR -L/usr/X11R7/$LIBDIR" \
./configure --prefix=/usr/X11R7 \
--libdir=\${PREFIX}/$LIBDIR \

View File

@ -76,11 +76,6 @@ premk() {
}
mk() {
if [ "$MK64BIT" == "true" ]; then
LIBDIR=lib64
else
LIBDIR=lib
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILdOPTIONS" \
CFLAGS="-L/$LIBDIR -L/usr/$LIBDIR -L/usr/X11R7/$LIBDIR" \

View File

@ -96,11 +96,6 @@ mk32() {
}
mk() {
if [ "$MK64BIT" == "true" ]; then
LIBDIR="lib64"
else
LIBDIR="lib"
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
./configure --target=$TARGET \

View File

@ -96,9 +96,6 @@ mk32() {
mk() {
if [ "$MK64BIT" == "true" ]; then
ADDOPTIONS="--libdir=\${prefix}/lib64"
LIBDIR=lib64
else
LIBDIR=lib
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \

View File

@ -102,10 +102,8 @@ mk32() {
mk() {
if [ "$MK64BIT" == "true" ];then
LIBDIR=lib64
ARCH=x86_64
else
LIBDIR=lib
ARCH=i386
fi
CC="gcc $BUILDOPTIONS" \

View File

@ -115,9 +115,6 @@ mk32() {
mk() {
if [ "$MK64BIT" == "true" ]; then
ADDOPTIONS="--libdir=\${prefix}/lib64"
LIBDIR=lib64
else
LIBDIR=lib
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \

View File

@ -80,11 +80,6 @@ premk() {
}
mk() {
if [ "$MK64BIT" == "true" ]; then
LIBDIR="lib64"
else
LIBDIR="lib"
fi
rm boecklin.pfb blippo.pfb spooky.pfb dos_____.pfb capri.pfb
rm linotext.pfb erasltra.pfb mazama.pfb old_town.pfb shf_____.pfb
rm postanti.pfb cooprblk.pfb

View File

@ -98,9 +98,6 @@ mk32() {
mk() {
if [ "$MK64BIT" == "true" ];then
ADDOPTIONS="--libdir=\${prefix}/lib64"
LIBDIR=lib64
else
LIBDIR=lib
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \

View File

@ -99,11 +99,6 @@ mk() {
postmk() {
ClearHostSysNameing $TMPROOT
if [ "$MK64BIT" == "true" ]; then
LIBDIR=lib64
else
LIBDIR=lib
fi
PLUGINDIR=/opt/firefox/$LIBDIR/firefox/plugins
mkdir -p $TMPROOT$PLUGINDIR
mv $TMPROOT/root/.firefox/plugins/* $TMPROOT$PLUGINDIR/

View File

@ -81,9 +81,6 @@ premk() {
mk() {
if [ "$MK64BIT" == "true" ]; then
ADDOPTIONS="--libdir=\${prefix}/lib64"
LIBDIR=lib64
else
LIBDIR=lib
fi
CC="gcc $BUILDOPTIONS" \
CXX="gcc $BUILDOPTIONS" \

View File

@ -82,11 +82,6 @@ premk() {
}
mk() {
if [ "$MK64BIT" == "true" ];then
LIBDIR=lib64
else
LIBDIR=lib
fi
make CC="gcc $BUILDOPTIONS" \
LDFLAGS="-L/$LIBDIR -L/usr/$LIBDIR -L/usr/X11R7/$LIBDIR" \
-j $NUMCPU

View File

@ -110,10 +110,8 @@ mk32() {
mk() {
if [ "$MK64BIT" == "true" ]; then
PKGTYPE=amd64
LIBDIR=lib64
else
PKGTYPE=i586
LIBDIR=lib
fi
mkdir -p $TMPROOT/usr/$LIBDIR
cd $TMPROOT/usr/$LIBDIR

View File

@ -84,10 +84,7 @@ premk() {
#Hier wird der Make Prozess der Sourcen definiert
mk() {
if [ "$MK64BIT" == "true" ]; then
LIBDIR=lib64
ADDOPTIONS="--libdir=\${prefix}/lib64"
else
LIBDIR=lib
fi
ldconfig
export QTDIR=/usr/$LIBDIR/qt

View File

@ -80,10 +80,7 @@ premk() {
mk() {
if [ "$MK64BIT" == "true" ]; then
LIBDIR=lib64
ADDOPTIONS="--libdir=\${prefix}/lib64"
else
LIBDIR=lib
fi
ldconfig
export QTDIR=/usr/$LIBDIR/qt

View File

@ -80,10 +80,7 @@ premk() {
#Hier wird der Make Prozess der Sourcen definiert
mk() {
if [ "$MK64BIT" == "true" ]; then
LIBDIR=lib64
ADDOPTIONS="--libdir=\${prefix}/lib64"
else
LIBDIR=lib
fi
ldconfig
export QTDIR=/usr/$LIBDIR/qt

View File

@ -80,10 +80,7 @@ premk() {
#Hier wird der Make Prozess der Sourcen definiert
mk() {
if [ "$MK64BIT" == "true" ]; then
LIBDIR=lib64
ADDOPTIONS="--libdir=\${prefix}/lib64"
else
LIBDIR=lib
fi
ldconfig
export QTDIR=/usr/$LIBDIR/qt

View File

@ -80,10 +80,7 @@ premk() {
#Hier wird der Make Prozess der Sourcen definiert
mk() {
if [ "$MK64BIT" == "true" ]; then
LIBDIR=lib64
ADDOPTIONS="--libdir=\${prefix}/lib64"
else
LIBDIR=lib
fi
ldconfig
export QTDIR=/usr/$LIBDIR/qt

View File

@ -80,10 +80,7 @@ premk() {
#Hier wird der Make Prozess der Sourcen definiert
mk() {
if [ "$MK64BIT" == "true" ]; then
LIBDIR=lib64
ADDOPTIONS="--libdir=\${prefix}/lib64"
else
LIBDIR=lib
fi
ldconfig
export QTDIR=/usr/$LIBDIR/qt

View File

@ -81,10 +81,7 @@ premk() {
#Hier wird der Make Prozess der Sourcen definiert
mk() {
if [ "$MK64BIT" == "true" ]; then
LIBDIR=lib64
ADDOPTIONS="--libdir=\${prefix}/lib64"
else
LIBDIR=lib
fi
ldconfig
export QTDIR=/usr/$LIBDIR/qt

View File

@ -80,10 +80,7 @@ premk() {
#Hier wird der Make Prozess der Sourcen definiert
mk() {
if [ "$MK64BIT" == "true" ]; then
LIBDIR=lib64
ADDOPTIONS="--libdir=\${prefix}/lib64"
else
LIBDIR=lib
fi
ldconfig
export QTDIR=/usr/$LIBDIR/qt

View File

@ -84,10 +84,7 @@ premk() {
#Hier wird der Make Prozess der Sourcen definiert
mk() {
if [ "$MK64BIT" == "true" ]; then
LIBDIR=lib64
ADDOPTIONS="--libdir=\${prefix}/lib64"
else
LIBDIR=lib
fi
ldconfig
export QTDIR=/usr/$LIBDIR/qt

View File

@ -80,10 +80,7 @@ premk() {
#Hier wird der Make Prozess der Sourcen definiert
mk() {
if [ "$MK64BIT" == "true" ]; then
LIBDIR=lib64
ADDOPTIONS="--libdir=\${prefix}/lib64"
else
LIBDIR=lib
fi
ldconfig
export QTDIR=/usr/$LIBDIR/qt

View File

@ -80,10 +80,7 @@ premk() {
#Hier wird der Make Prozess der Sourcen definiert
mk() {
if [ "$MK64BIT" == "true" ]; then
LIBDIR=lib64
ADDOPTIONS="--libdir=\${prefix}/lib64"
else
LIBDIR=lib
fi
ldconfig
export QTDIR=/usr/$LIBDIR/qt

View File

@ -80,10 +80,7 @@ premk() {
#Hier wird der Make Prozess der Sourcen definiert
mk() {
if [ "$MK64BIT" == "true" ]; then
LIBDIR=lib64
ADDOPTIONS="--libdir=\${prefix}/lib64"
else
LIBDIR=lib
fi
ldconfig
export QTDIR=/usr/$LIBDIR/qt

View File

@ -80,10 +80,7 @@ premk() {
#Hier wird der Make Prozess der Sourcen definiert
mk() {
if [ "$MK64BIT" == "true" ]; then
LIBDIR=lib64
ADDOPTIONS="--libdir=\${prefix}/lib64"
else
LIBDIR=lib
fi
ldconfig
export QTDIR=/usr/$LIBDIR/qt

View File

@ -80,10 +80,7 @@ premk() {
#Hier wird der Make Prozess der Sourcen definiert
mk() {
if [ "$MK64BIT" == "true" ]; then
LIBDIR=lib64
ADDOPTIONS="--libdir=\${prefix}/lib64"
else
LIBDIR=lib
fi
ldconfig
export QTDIR=/usr/$LIBDIR/qt

View File

@ -81,10 +81,7 @@ premk() {
#Hier wird der Make Prozess der Sourcen definiert
mk() {
if [ "$MK64BIT" == "true" ]; then
LIBDIR=lib64
ADDOPTIONS="--libdir=\${prefix}/lib64"
else
LIBDIR=lib
fi
ldconfig
export QTDIR=/usr/$LIBDIR/qt

View File

@ -82,10 +82,7 @@ premk() {
#Hier wird der Make Prozess der Sourcen definiert
mk() {
if [ "$MK64BIT" == "true" ]; then
LIBDIR=lib64
ADDOPTIONS="--libdir=\${prefix}/lib64"
else
LIBDIR=lib
fi
ldconfig
export QTDIR=/usr/$LIBDIR/qt

View File

@ -80,10 +80,7 @@ premk() {
#Hier wird der Make Prozess der Sourcen definiert
mk() {
if [ "$MK64BIT" == "true" ]; then
LIBDIR=lib64
ADDOPTIONS="--libdir=\${prefix}/lib64"
else
LIBDIR=lib
fi
ldconfig
export QTDIR=/usr/$LIBDIR/qt

View File

@ -80,10 +80,7 @@ premk() {
#Hier wird der Make Prozess der Sourcen definiert
mk() {
if [ "$MK64BIT" == "true" ]; then
LIBDIR=lib64
ADDOPTIONS="--libdir=\${prefix}/lib64"
else
LIBDIR=lib
fi
ldconfig
export QTDIR=/usr/$LIBDIR/qt

View File

@ -80,10 +80,7 @@ premk() {
#Hier wird der Make Prozess der Sourcen definiert
mk() {
if [ "$MK64BIT" == "true" ]; then
LIBDIR=lib64
ADDOPTIONS="--libdir=\${prefix}/lib64"
else
LIBDIR=lib
fi
ldconfig
export QTDIR=/usr/$LIBDIR/qt

View File

@ -81,10 +81,7 @@ premk() {
#Hier wird der Make Prozess der Sourcen definiert
mk() {
if [ "$MK64BIT" == "true" ]; then
LIBDIR=lib64
ADDOPTIONS="--libdir=\${prefix}/lib64"
else
LIBDIR=lib
fi
ldconfig
export QTDIR=/usr/$LIBDIR/qt

View File

@ -77,10 +77,7 @@ premk() {
#Hier wird der Make Prozess der Sourcen definiert
mk() {
if [ "$MK64BIT" == "true" ]; then
LIBDIR=lib64
ADDOPTIONS="--libdir=\${prefix}/lib64"
else
LIBDIR=lib
fi
ldconfig
export QTDIR=/usr/$LIBDIR/qt

View File

@ -85,10 +85,7 @@ premk() {
#Hier wird der Make Prozess der Sourcen definiert
mk() {
if [ "$MK64BIT" == "true" ]; then
LIBDIR=lib64
ADDOPTIONS="--libdir=\${prefix}/lib64"
else
LIBDIR=lib
fi
ldconfig
export QTDIR=/usr/$LIBDIR/qt

View File

@ -76,11 +76,6 @@ premk() {
}
mk() {
if [ "$MK64BIT" == "true" ]; then
LIBDIR=lib64
else
LIBDIR=lib
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
LDFLAGS="-L/$LIBDIR -L/usr/$LIBDIR -L/usr/X11R7/$LIBDIR" \

View File

@ -80,10 +80,7 @@ premk() {
#Hier wird der Make Prozess der Sourcen definiert
mk() {
if [ "$MK64BIT" == "true" ]; then
LIBDIR=lib64
ADDOPTIONS="--libdir=\${prefix}/lib64"
else
LIBDIR=lib
fi
ldconfig
export QTDIR=/usr/$LIBDIR/qt

View File

@ -80,10 +80,7 @@ premk() {
#Hier wird der Make Prozess der Sourcen definiert
mk() {
if [ "$MK64BIT" == "true" ]; then
LIBDIR=lib64
ADDOPTIONS="--libdir=\${prefix}/lib64"
else
LIBDIR=lib
fi
ldconfig
export QTDIR=/usr/$LIBDIR/qt

View File

@ -80,10 +80,7 @@ premk() {
#Hier wird der Make Prozess der Sourcen definiert
mk() {
if [ "$MK64BIT" == "true" ]; then
LIBDIR=lib64
ADDOPTIONS="--libdir=\${prefix}/lib64"
else
LIBDIR=lib
fi
ldconfig
export QTDIR=/usr/$LIBDIR/qt

View File

@ -77,10 +77,7 @@ premk() {
mk() {
if [ "$MK64BIT" == "true" ]; then
LIBDIR=lib64
ADDOPTIONS="--libdir=\${prefix}/lib64"
else
LIBDIR=lib
fi
ldconfig
export QTDIR=/usr/$LIBDIR/qt

View File

@ -85,9 +85,6 @@ premk() {
mk() {
if [ "$MK64BIT" == "true" ]; then
ADDOPTIONS="--libdir=\${prefix}/lib64"
LIBDIR=lib64
else
LIBDIR=lib
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \

View File

@ -130,15 +130,12 @@ mk32() {
mk() {
if [ "$MK64BIT" == "true" ]; then
ADDOPTIONS="-platform linux-g++-64"
LIBDIRS="lib64"
mkdir $TMPROOT/usr/lib64
else
LIBDIRS="lib"
fi
yes "yes"| \
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
../qt-*/configure -prefix /usr/$LIBDIRS/qt \
../qt-*/configure -prefix /usr/$LIBDIR/qt \
-qt-gif \
-plugin-sql-odbc \
-system-zlib \
@ -152,8 +149,8 @@ mk() {
-tablet &&
make -j $NUMCPU
make -j $NUMCPU install
cd /usr/$LIBDIRS/
tar -cf - qt | tar -C $TMPROOT/usr/$LIBDIRS -xf -
cd /usr/$LIBDIR/
tar -cf - qt | tar -C $TMPROOT/usr/$LIBDIR -xf -
cd -
}
@ -161,12 +158,10 @@ mk() {
#in $TMPROOT noch einiges korrigieren
postmk() {
if [ "$MK64BIT" == "true" ]; then
LIBDIRS="lib lib64"
LIBDIR="lib lib64"
ln -s /usr/lib64/qt/bin $TMPROOT/usr/lib/qt/bin
else
LIBDIR="lib"
fi
for i in $LIBDIRS; do
for i in $LIBDIR; do
cd $TMPROOT/usr/$i/qt/lib
REVISION=`echo libqt-mt.so.3.[0-9].[0-9]|awk -F. '{print $NF}'`
MINVER=`echo libqt-mt.so.3.[0-9].[0-9]|awk -F. '{print $(NF-1)}'`

View File

@ -80,10 +80,7 @@ premk() {
mk() {
if [ "$MK64BIT" == "true" ]; then
LIBDIR=lib64
ADDOPTIONS="--libdir=\${prefix}/lib64"
else
LIBDIR=lib
fi
ldconfig
export QTDIR=/usr/$LIBDIR/qt

View File

@ -79,11 +79,6 @@ premk() {
}
mk() {
if [ "$MK64BIT" == "true" ]; then
LIBDIR=lib64
else
LIBDIR=lib
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
./configure --target=$TARGET \

Some files were not shown because too many files have changed in this diff Show More