elf_i386 durch die korrektere angabe elf32_i386 ersetzt

git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@4965 504e572c-2e33-0410-9681-be2bf7408885
This commit is contained in:
kueller 2009-12-24 11:09:10 +00:00
parent 54a9f6134b
commit 3019ec4e4b
12 changed files with 34 additions and 28 deletions

View File

@ -86,10 +86,10 @@ fi
mk32() {
cd icap
sed -e "s/ld /ld -melf_i386 /" Makefile >Makefile.32
sed -e "s/ld /ld -melf32_i386 /" Makefile >Makefile.32
make -f Makefile.32 CC="gcc $BUILDOPTIONS32" LDFLAGS="-m32" &&
cd ../mstore
sed -e "s/ld /ld -melf_i386 /" Makefile >Makefile.32
sed -e "s/ld /ld -melf32_i386 /" Makefile >Makefile.32
make -f Makefile.32 CC="gcc $BUILDOPTIONS32" LDFLAGS="-m32" &&
cd ..
chmod 777 *

View File

@ -99,7 +99,7 @@ mk32() {
--with-CXX \
--with-gnu-ld \
--enable-syslog &&
sed -e "s/^LD .*$/LD = \/usr\/bin\/ld -melf_i386/" src/Makefile.global >/tmp/Makefile.global &&
sed -e "s/^LD .*$/LD = \/usr\/bin\/ld -melf32_i386/" src/Makefile.global >/tmp/Makefile.global &&
mv /tmp/Makefile.global src/Makefile.global &&
make -j $NUMCPU &&
make -j $NUMCPU DESTDIR=$TMPROOT install

View File

@ -83,6 +83,7 @@ premk() {
mk32() {
export USE_ARCH=$UARCH
export LDEMULATION=elf32_i386
perl-32 Makefile.PL PREFIX=$TMPROOT/usr CC="gcc $BUILDOPTIONS32" CXX="g++ $BUILDOPTIONS32"
CheckError "Configurescript failed !" 1
@ -96,10 +97,12 @@ mk32() {
CheckError "Make install process failed !" 1
make distclean
unset USE_ARCH
unset LDEMULATION
}
mk() {
export USE_ARCH=$UARCH
export LDEMULATION=elf64-x86-64
perl Makefile.PL PREFIX=$TMPROOT/usr
CheckError "Configurescript failed !" 1

View File

@ -84,20 +84,20 @@ mk32() {
CXX="g++ -fPIC $BUILDOPTIONS32" \
LDFLAGS="-L/lib -L/usr/lib -L/usr/X11R7/lib" \
USE_ARCH=$UARCH \
LDEMULATION=elf_i386 \
LDEMULATION=elf32_i386 \
../ImageMagick*/configure --target=$TARGET32 \
--prefix=/usr \
--enable-shared \
--with-modules \
--with-x &&
make -j $NUMCPU CC="gcc -fPIC $BUILDOPTIONS32" \
LDEMULATION=elf_i386 \
LDEMULATION=elf32_i386 \
LD="gcc -m32" &&
make -j $NUMCPU CC="gcc -fPIC $BUILDOPTIONS32" install \
LDEMULATION=elf_i386 \
LDEMULATION=elf32_i386 \
LD="gcc -m32" &&
make -j $NUMCPU CC="gcc -fPIC $BUILDOPTIONS32" \
LDEMULATION=elf_i386 \
LDEMULATION=elf32_i386 \
DESTDIR=$TMPROOT \
LD="gcc -m32" install
#make distclean
@ -118,6 +118,7 @@ mk() {
CC="gcc -fPIC $BUILDOPTIONS" \
CXX="g++ -fPIC $BUILDOPTIONS" \
USE_ARCH=$UARCH \
LDEMULATION=elf64-x86-64 \
../ImageMagick*/configure --target=$TARGET \
--prefix=/usr \
$ADDOPTIONS \

View File

@ -87,12 +87,12 @@ mk32() {
find . -name "Makefile" -exec sed -i -e "s/lib64/lib/" {} \;
sed -i -e "s/static void.*freeFlow/void freeFlow/" server/dia/auutil.c
make -j $NUMCPU \
LDEMULATION=elf_i386 \
LDEMULATION=elf32_i386 \
CC="gcc $BUILDOPTIONS32 -L/usr/X11R7/lib" \
CXX="g++ $BUILDOPTIONS32 -L/usr/X11R7/lib" \
CPP="cpp $BUILDOPTIONS32 -L/usr/X11R7/lib" \
World &&
make LDEMULATION=elf_i386 \
make LDEMULATION=elf32_i386 \
CC="gcc $BUILDOPTIONS32 -L/usr/X11R7/lib" \
CXX="g++ $BUILDOPTIONS32 -L/usr/X11R7/lib" \
CPP="cpp $BUILDOPTIONS32 -L/usr/X11R7/lib" \

View File

@ -79,7 +79,7 @@ mk32() {
CC="gcc $BUILDOPTIONS32" \
CXX="g++ $BUILDOPTIONS32" \
USE_ARCH=$UARCH \
LDEMULATION=elf_i386 \
LDEMULATION=elf32_i386 \
./configure --target=$TARGET32 \
--with-socks \
--with-textui \
@ -89,8 +89,8 @@ mk32() {
--with-gc \
--sysconfdir=/etc \
--prefix=/usr
make -j $NUMCPU LDEMULATION=elf_i386
make -j $NUMCPU DESTDIR=$TMPROOT install
make -j $NUMCPU LDEMULATION=elf32_i386
make -j $NUMCPU LDEMULATION=elf32_i386 DESTDIR=$TMPROOT install
make distclean
}

View File

@ -121,9 +121,9 @@ mk32() {
--with-tls \
--with-mp \
--with-gnu-ld
make LDEMULATION=elf_i386 depend
make -j $NUMCPU LDEMULATION=elf_i386
make -j $NUMCPU LDEMULATION=elf_i386 DESTDIR=$TMPROOT install
make LDEMULATION=elf32_i386 depend
make -j $NUMCPU LDEMULATION=elf32_i386
make -j $NUMCPU LDEMULATION=elf32_i386 DESTDIR=$TMPROOT install
cd ../openldap*
rm -r ../build-openldap
mkdir ../build-openldap

View File

@ -98,7 +98,7 @@ mk32() {
CC="gcc $BUILDOPTIONS32" \
CXX="g++ $BUILDOPTIONS32" \
USE_ARCH=$UARCH \
LDEMULATION=elf_i386 \
LDEMULATION=elf32_i386 \
./configure --target=$TARGET32 \
--with-configdir=/etc/samba \
--sysconfdir=/etc/samba \
@ -121,7 +121,7 @@ mk32() {
--with-syslog \
--with-libsmbclient &&
sed -i -e "s/lib64/lib/g" Makefile
make -j $NUMCPU LDEMULATION=elf_i386
make -j $NUMCPU LDEMULATION=elf32_i386
make DESTDIR=$TMPROOT install
make DESTDIR=$TMPROOT installclientlib
make distclean

View File

@ -83,8 +83,8 @@ mk32() {
./configure --target=$TARGET32 \
--prefix=/usr/ \
--libexecdir=/usr/lib/dbus-glib
make -j $NUMCPU
make -j $NUMCPU DESTDIR=$TMPROOT install
make USE_ARCH=$UARCH LDEMULATION=elf32_i386 -j $NUMCPU
make USE_ARCH=$UARCH LDEMULATION=elf32_i386 -j $NUMCPU DESTDIR=$TMPROOT install
make distclean
ClearHostSysNameing32 $TMPROOT
}
@ -100,8 +100,8 @@ mk() {
$ADDOPTIONS \
--prefix=/usr/ \
--libexecdir=/usr/$LIBDIR/dbus-glib
make -j $NUMCPU
make -j $NUMCPU DESTDIR=$TMPROOT install
make USE_ARCH=$UARCH -j $NUMCPU
make USE_ARCH=$UARCH -j $NUMCPU DESTDIR=$TMPROOT install
}
postmk() {

View File

@ -79,9 +79,9 @@ premk() {
#Hier wird der Make Prozess der Sourcen definiert
mk() {
make -k -j $NUMCPU PREFIX=/usr \
make -k -j $NUMCPU USE_ARCH=$UARCH PREFIX=/usr \
PERL=/usr/bin/perl
make -k PREFIX=$TMPROOT/usr \
make -k USE_ARCH=$UARCH PREFIX=$TMPROOT/usr \
PERL=/usr/bin/perl install
}

View File

@ -81,9 +81,10 @@ mk32() {
CC="gcc $BUILDOPTIONS32" \
CXX="g++ $BUILDOPTIONS32" \
USE_ARCH=32 \
LDEMULATION=elf32_i386 \
./configure --prefix=/usr
make -j $NUMCPU -k
make -j $NUMCPU -k DESTDIR=$TMPROOT install
make USE_ARCH=32 LDEMULATION=elf32_i386 -j $NUMCPU -k
make USE_ARCH=32 LDEMULATION=elf32_i386 -j $NUMCPU -k DESTDIR=$TMPROOT install
make distclean
}
@ -94,10 +95,11 @@ mk() {
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
USE_ARCH=$UARCH \
LDEMULATION=elf64-x86-64 \
./configure $ADDOPTIONS \
--prefix=/usr
make -j $NUMCPU -k
make -j $NUMCPU -k DESTDIR=$TMPROOT install
make USE_ARCH=$UARCH LDEMULATION=elf64-x86-64 -j $NUMCPU -k
make USE_ARCH=$UARCH LDEMULATION=elf64-x86-64 -j $NUMCPU -k DESTDIR=$TMPROOT install
}
postmk() {

View File

@ -94,7 +94,7 @@ mk32() {
--with-perl=/usr/bin/perl \
--with-py=/usr/bin/python \
--with-tcl=/usr/X11R7/bin/tclsh &&
make -j $NUMCPU LDEMULATION=elf_i386 &&
make -j $NUMCPU LDEMULATION=elf32_i386 &&
make -j $NUMCPU prefix=$TMPROOT/usr/X11R7 install &&
make distclean
mv $TMPROOT/usr/X11R7/bin/pdflib-config{,-32}