CompuExtreme/ViitorMake
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Dynamische Anpassung der lib Verzeichnisse. wahlweise lib oder lib64 je nachdem ob MK64BIT gesetzt ist oder nicht

Browse Source 
git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@4483 504e572c-2e33-0410-9681-be2bf7408885
This commit is contained in:
kueller 2008-05-07 16:35:48 +00:00
parent 79d6abcc62
commit 4ab26b4dbb
4 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
BaseBuild/crosschain/binutils
View File

@ -83,12 +83,17 @@ premk() {
} }
mk() { mk() {
if [ ${MK64BIT} == "true" ]; then
LIBDIR=lib64
else
LIBDIR=lib
fi
AR=ar \ AR=ar \
AS=as \ AS=as \
../binutils*/configure --host=$HOSTSYS \ ../binutils*/configure --host=$HOSTSYS \
--target=$TARGET \ --target=$TARGET \
--prefix=/cross-tools \ --prefix=/cross-tools \
--with-lib-path=/tools/lib \ --with-lib-path=/tools/$LIBDIR \
--disable-nls \ --disable-nls \
--enable-shared \ --enable-shared \
--enable-64-bit-bfd --enable-64-bit-bfd

9
BaseBuild/crosschain/gcc
View File

@ -75,6 +75,11 @@ SRCPATH=Base/Development
(( MKPKG = $MKPKG | 128 )) (( MKPKG = $MKPKG | 128 ))
premk() { premk() {
if [ ${MK64BIT} == "true" ]; then
LIBDIR=lib64
else
LIBDIR=lib
fi
ARCH=`echo $TARGET|cut -d"-" -f 1` ARCH=`echo $TARGET|cut -d"-" -f 1`
SrcPatch $MAKEDIR/gcc* $LFSSOURCE/$SRCPATH/gcc-*-branch_update-2.patch* SrcPatch $MAKEDIR/gcc* $LFSSOURCE/$SRCPATH/gcc-*-branch_update-2.patch*
if [ -f /tmp/crossgcc_stage1 ]; then if [ -f /tmp/crossgcc_stage1 ]; then
@ -91,14 +96,14 @@ premk() {
for i in $OUTFILE; do for i in $OUTFILE; do
echo " echo "
#undef STARTFILE_PREFIX_SPEC #undef STARTFILE_PREFIX_SPEC
#define STARTFILE_PREFIX_SPEC \"/tools/lib/\"" >>$i #define STARTFILE_PREFIX_SPEC \"/tools/$LIBDIR/\"" >>$i
done done
cp -v gcc/Makefile.in{,.orig} cp -v gcc/Makefile.in{,.orig}
sed -e "s@\(^CROSS_SYSTEM_HEADER_DIR =\).*@\1 /tools/include@g" \ sed -e "s@\(^CROSS_SYSTEM_HEADER_DIR =\).*@\1 /tools/include@g" \
gcc/Makefile.in.orig > gcc/Makefile.in gcc/Makefile.in.orig > gcc/Makefile.in
if [ -f /tmp/crossgcc_stage1 ]; then if [ -f /tmp/crossgcc_stage1 ]; then
cp -v configure{,.orig} cp -v configure{,.orig}
sed -e '/FLAGS_FOR_TARGET.*\/lib\//s@-B[^ ]*/lib/@@g' configure.orig >configure sed -e '/FLAGS_FOR_TARGET.*\/'$LIBDIR'\//s@-B[^ ]*/'$LIBDIR'/@@g' configure.orig >configure
fi fi
mkdir ../build-gcc mkdir ../build-gcc
cd ../build-gcc cd ../build-gcc

10
BaseBuild/crosschain/glibc
View File

@ -113,12 +113,14 @@ mk32() {
mk() { mk() {
echo "libc_cv_forced_unwind=yes" > config.cache echo "libc_cv_forced_unwind=yes" > config.cache
echo "libc_cv_c_cleanup=yes" >> config.cache echo "libc_cv_c_cleanup=yes" >> config.cache
if [ $MK64BIT == "true" ]; then if [ ${MK64BIT} == "true" ]; then
echo "slibdir=/tools/lib64" >> configparms LIBDIR=lib64
ADDCONFIGURE="--libdir=/tools/lib64"
if echo $ARCH|grep -q sparc; then if echo $ARCH|grep -q sparc; then
echo "libc_cv_sparc64_tls=yes" >>config.cache echo "libc_cv_sparc64_tls=yes" >>config.cache
fi fi
echo "slibdir=/tools/$LIBDIR" >> configparms
else
LIBDIR=lib
fi fi
BUILD_CC="gcc" \ BUILD_CC="gcc" \
CC="${TARGET}-gcc ${BUILDOPTIONS}" \ CC="${TARGET}-gcc ${BUILDOPTIONS}" \
@ -127,7 +129,7 @@ mk() {
../glibc*/configure --prefix=/tools \ ../glibc*/configure --prefix=/tools \
--host=$TARGET \ --host=$TARGET \
--build=$TARGET32 \ --build=$TARGET32 \
$ADDCONFIGURE \ --libdir=/tools/$LIBDIR \
--disable-profile \ --disable-profile \
--enable-add-ons \ --enable-add-ons \
--with-tls \ --with-tls \

9
BaseBuild/toolchain/binutils
View File

@ -83,13 +83,14 @@
SRCPATH=Base/Utilities SRCPATH=Base/Utilities
(( MKPKG = $MKPKG | 8 )) (( MKPKG = $MKPKG | 8 ))
(( MKPKG = $MKPKG | 16 )) (( MKPKG = $MKPKG | 16 ))
(( MKPKG = $MKPKG | 128 ))
premk() { premk() {
SrcPatch $MAKEDIR/binutils* $LFSSOURCE/$SRCPATH/binutils-*-posix*.patch* SrcPatch $MAKEDIR/binutils* $LFSSOURCE/$SRCPATH/binutils-*-posix*.patch*
SrcPatch $MAKEDIR/binutils* $LFSSOURCE/$SRCPATH/binutils-*-genscripts*.patch*
SrcPatch $MAKEDIR/binutils* $LFSSOURCE/$SRCPATH/binutils-*-branch_update-3* SrcPatch $MAKEDIR/binutils* $LFSSOURCE/$SRCPATH/binutils-*-branch_update-3*
SrcPatch $MAKEDIR/binutils* $LFSSOURCE/$SRCPATH/binutils-*-genscripts*.patch*
if [ "$MK64BIT" == "true" ]; then if [ ${MK64BIT} == "true" ]; then
BUILDOPTIONS="-m64" BUILDOPTIONS="-m64"
fi fi
mkdir ../build-binutils mkdir ../build-binutils
@ -97,7 +98,7 @@ premk() {
} }
mk() { mk() {
if [ "$MK64BIT" == "true" ]; then if [ ${MK64BIT} == "true" ]; then
LIBDIR=lib64 LIBDIR=lib64
else else
LIBDIR=lib LIBDIR=lib
@ -108,7 +109,7 @@ mk() {
--build=$HOSTSYS \ --build=$HOSTSYS \
--prefix=/tools \ --prefix=/tools \
--libdir=/tools/$LIBDIR --libdir=/tools/$LIBDIR
--with-lib-path=/tools/lib \ --with-lib-path=/tools/$LIBDIR \
--disable-nls \ --disable-nls \
--enable-shared \ --enable-shared \
--enable-64-bit-bfd --enable-64-bit-bfd