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:
parent
54a9f6134b
commit
3019ec4e4b
@ -86,10 +86,10 @@ fi
|
|||||||
|
|
||||||
mk32() {
|
mk32() {
|
||||||
cd icap
|
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" &&
|
make -f Makefile.32 CC="gcc $BUILDOPTIONS32" LDFLAGS="-m32" &&
|
||||||
cd ../mstore
|
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" &&
|
make -f Makefile.32 CC="gcc $BUILDOPTIONS32" LDFLAGS="-m32" &&
|
||||||
cd ..
|
cd ..
|
||||||
chmod 777 *
|
chmod 777 *
|
||||||
|
@ -99,7 +99,7 @@ mk32() {
|
|||||||
--with-CXX \
|
--with-CXX \
|
||||||
--with-gnu-ld \
|
--with-gnu-ld \
|
||||||
--enable-syslog &&
|
--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 &&
|
mv /tmp/Makefile.global src/Makefile.global &&
|
||||||
make -j $NUMCPU &&
|
make -j $NUMCPU &&
|
||||||
make -j $NUMCPU DESTDIR=$TMPROOT install
|
make -j $NUMCPU DESTDIR=$TMPROOT install
|
||||||
|
@ -83,6 +83,7 @@ premk() {
|
|||||||
|
|
||||||
mk32() {
|
mk32() {
|
||||||
export USE_ARCH=$UARCH
|
export USE_ARCH=$UARCH
|
||||||
|
export LDEMULATION=elf32_i386
|
||||||
perl-32 Makefile.PL PREFIX=$TMPROOT/usr CC="gcc $BUILDOPTIONS32" CXX="g++ $BUILDOPTIONS32"
|
perl-32 Makefile.PL PREFIX=$TMPROOT/usr CC="gcc $BUILDOPTIONS32" CXX="g++ $BUILDOPTIONS32"
|
||||||
CheckError "Configurescript failed !" 1
|
CheckError "Configurescript failed !" 1
|
||||||
|
|
||||||
@ -96,10 +97,12 @@ mk32() {
|
|||||||
CheckError "Make install process failed !" 1
|
CheckError "Make install process failed !" 1
|
||||||
make distclean
|
make distclean
|
||||||
unset USE_ARCH
|
unset USE_ARCH
|
||||||
|
unset LDEMULATION
|
||||||
}
|
}
|
||||||
|
|
||||||
mk() {
|
mk() {
|
||||||
export USE_ARCH=$UARCH
|
export USE_ARCH=$UARCH
|
||||||
|
export LDEMULATION=elf64-x86-64
|
||||||
perl Makefile.PL PREFIX=$TMPROOT/usr
|
perl Makefile.PL PREFIX=$TMPROOT/usr
|
||||||
CheckError "Configurescript failed !" 1
|
CheckError "Configurescript failed !" 1
|
||||||
|
|
||||||
|
@ -84,20 +84,20 @@ mk32() {
|
|||||||
CXX="g++ -fPIC $BUILDOPTIONS32" \
|
CXX="g++ -fPIC $BUILDOPTIONS32" \
|
||||||
LDFLAGS="-L/lib -L/usr/lib -L/usr/X11R7/lib" \
|
LDFLAGS="-L/lib -L/usr/lib -L/usr/X11R7/lib" \
|
||||||
USE_ARCH=$UARCH \
|
USE_ARCH=$UARCH \
|
||||||
LDEMULATION=elf_i386 \
|
LDEMULATION=elf32_i386 \
|
||||||
../ImageMagick*/configure --target=$TARGET32 \
|
../ImageMagick*/configure --target=$TARGET32 \
|
||||||
--prefix=/usr \
|
--prefix=/usr \
|
||||||
--enable-shared \
|
--enable-shared \
|
||||||
--with-modules \
|
--with-modules \
|
||||||
--with-x &&
|
--with-x &&
|
||||||
make -j $NUMCPU CC="gcc -fPIC $BUILDOPTIONS32" \
|
make -j $NUMCPU CC="gcc -fPIC $BUILDOPTIONS32" \
|
||||||
LDEMULATION=elf_i386 \
|
LDEMULATION=elf32_i386 \
|
||||||
LD="gcc -m32" &&
|
LD="gcc -m32" &&
|
||||||
make -j $NUMCPU CC="gcc -fPIC $BUILDOPTIONS32" install \
|
make -j $NUMCPU CC="gcc -fPIC $BUILDOPTIONS32" install \
|
||||||
LDEMULATION=elf_i386 \
|
LDEMULATION=elf32_i386 \
|
||||||
LD="gcc -m32" &&
|
LD="gcc -m32" &&
|
||||||
make -j $NUMCPU CC="gcc -fPIC $BUILDOPTIONS32" \
|
make -j $NUMCPU CC="gcc -fPIC $BUILDOPTIONS32" \
|
||||||
LDEMULATION=elf_i386 \
|
LDEMULATION=elf32_i386 \
|
||||||
DESTDIR=$TMPROOT \
|
DESTDIR=$TMPROOT \
|
||||||
LD="gcc -m32" install
|
LD="gcc -m32" install
|
||||||
#make distclean
|
#make distclean
|
||||||
@ -118,6 +118,7 @@ mk() {
|
|||||||
CC="gcc -fPIC $BUILDOPTIONS" \
|
CC="gcc -fPIC $BUILDOPTIONS" \
|
||||||
CXX="g++ -fPIC $BUILDOPTIONS" \
|
CXX="g++ -fPIC $BUILDOPTIONS" \
|
||||||
USE_ARCH=$UARCH \
|
USE_ARCH=$UARCH \
|
||||||
|
LDEMULATION=elf64-x86-64 \
|
||||||
../ImageMagick*/configure --target=$TARGET \
|
../ImageMagick*/configure --target=$TARGET \
|
||||||
--prefix=/usr \
|
--prefix=/usr \
|
||||||
$ADDOPTIONS \
|
$ADDOPTIONS \
|
||||||
|
@ -87,12 +87,12 @@ mk32() {
|
|||||||
find . -name "Makefile" -exec sed -i -e "s/lib64/lib/" {} \;
|
find . -name "Makefile" -exec sed -i -e "s/lib64/lib/" {} \;
|
||||||
sed -i -e "s/static void.*freeFlow/void freeFlow/" server/dia/auutil.c
|
sed -i -e "s/static void.*freeFlow/void freeFlow/" server/dia/auutil.c
|
||||||
make -j $NUMCPU \
|
make -j $NUMCPU \
|
||||||
LDEMULATION=elf_i386 \
|
LDEMULATION=elf32_i386 \
|
||||||
CC="gcc $BUILDOPTIONS32 -L/usr/X11R7/lib" \
|
CC="gcc $BUILDOPTIONS32 -L/usr/X11R7/lib" \
|
||||||
CXX="g++ $BUILDOPTIONS32 -L/usr/X11R7/lib" \
|
CXX="g++ $BUILDOPTIONS32 -L/usr/X11R7/lib" \
|
||||||
CPP="cpp $BUILDOPTIONS32 -L/usr/X11R7/lib" \
|
CPP="cpp $BUILDOPTIONS32 -L/usr/X11R7/lib" \
|
||||||
World &&
|
World &&
|
||||||
make LDEMULATION=elf_i386 \
|
make LDEMULATION=elf32_i386 \
|
||||||
CC="gcc $BUILDOPTIONS32 -L/usr/X11R7/lib" \
|
CC="gcc $BUILDOPTIONS32 -L/usr/X11R7/lib" \
|
||||||
CXX="g++ $BUILDOPTIONS32 -L/usr/X11R7/lib" \
|
CXX="g++ $BUILDOPTIONS32 -L/usr/X11R7/lib" \
|
||||||
CPP="cpp $BUILDOPTIONS32 -L/usr/X11R7/lib" \
|
CPP="cpp $BUILDOPTIONS32 -L/usr/X11R7/lib" \
|
||||||
|
@ -79,7 +79,7 @@ mk32() {
|
|||||||
CC="gcc $BUILDOPTIONS32" \
|
CC="gcc $BUILDOPTIONS32" \
|
||||||
CXX="g++ $BUILDOPTIONS32" \
|
CXX="g++ $BUILDOPTIONS32" \
|
||||||
USE_ARCH=$UARCH \
|
USE_ARCH=$UARCH \
|
||||||
LDEMULATION=elf_i386 \
|
LDEMULATION=elf32_i386 \
|
||||||
./configure --target=$TARGET32 \
|
./configure --target=$TARGET32 \
|
||||||
--with-socks \
|
--with-socks \
|
||||||
--with-textui \
|
--with-textui \
|
||||||
@ -89,8 +89,8 @@ mk32() {
|
|||||||
--with-gc \
|
--with-gc \
|
||||||
--sysconfdir=/etc \
|
--sysconfdir=/etc \
|
||||||
--prefix=/usr
|
--prefix=/usr
|
||||||
make -j $NUMCPU LDEMULATION=elf_i386
|
make -j $NUMCPU LDEMULATION=elf32_i386
|
||||||
make -j $NUMCPU DESTDIR=$TMPROOT install
|
make -j $NUMCPU LDEMULATION=elf32_i386 DESTDIR=$TMPROOT install
|
||||||
make distclean
|
make distclean
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -121,9 +121,9 @@ mk32() {
|
|||||||
--with-tls \
|
--with-tls \
|
||||||
--with-mp \
|
--with-mp \
|
||||||
--with-gnu-ld
|
--with-gnu-ld
|
||||||
make LDEMULATION=elf_i386 depend
|
make LDEMULATION=elf32_i386 depend
|
||||||
make -j $NUMCPU LDEMULATION=elf_i386
|
make -j $NUMCPU LDEMULATION=elf32_i386
|
||||||
make -j $NUMCPU LDEMULATION=elf_i386 DESTDIR=$TMPROOT install
|
make -j $NUMCPU LDEMULATION=elf32_i386 DESTDIR=$TMPROOT install
|
||||||
cd ../openldap*
|
cd ../openldap*
|
||||||
rm -r ../build-openldap
|
rm -r ../build-openldap
|
||||||
mkdir ../build-openldap
|
mkdir ../build-openldap
|
||||||
|
@ -98,7 +98,7 @@ mk32() {
|
|||||||
CC="gcc $BUILDOPTIONS32" \
|
CC="gcc $BUILDOPTIONS32" \
|
||||||
CXX="g++ $BUILDOPTIONS32" \
|
CXX="g++ $BUILDOPTIONS32" \
|
||||||
USE_ARCH=$UARCH \
|
USE_ARCH=$UARCH \
|
||||||
LDEMULATION=elf_i386 \
|
LDEMULATION=elf32_i386 \
|
||||||
./configure --target=$TARGET32 \
|
./configure --target=$TARGET32 \
|
||||||
--with-configdir=/etc/samba \
|
--with-configdir=/etc/samba \
|
||||||
--sysconfdir=/etc/samba \
|
--sysconfdir=/etc/samba \
|
||||||
@ -121,7 +121,7 @@ mk32() {
|
|||||||
--with-syslog \
|
--with-syslog \
|
||||||
--with-libsmbclient &&
|
--with-libsmbclient &&
|
||||||
sed -i -e "s/lib64/lib/g" Makefile
|
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 install
|
||||||
make DESTDIR=$TMPROOT installclientlib
|
make DESTDIR=$TMPROOT installclientlib
|
||||||
make distclean
|
make distclean
|
||||||
|
@ -83,8 +83,8 @@ mk32() {
|
|||||||
./configure --target=$TARGET32 \
|
./configure --target=$TARGET32 \
|
||||||
--prefix=/usr/ \
|
--prefix=/usr/ \
|
||||||
--libexecdir=/usr/lib/dbus-glib
|
--libexecdir=/usr/lib/dbus-glib
|
||||||
make -j $NUMCPU
|
make USE_ARCH=$UARCH LDEMULATION=elf32_i386 -j $NUMCPU
|
||||||
make -j $NUMCPU DESTDIR=$TMPROOT install
|
make USE_ARCH=$UARCH LDEMULATION=elf32_i386 -j $NUMCPU DESTDIR=$TMPROOT install
|
||||||
make distclean
|
make distclean
|
||||||
ClearHostSysNameing32 $TMPROOT
|
ClearHostSysNameing32 $TMPROOT
|
||||||
}
|
}
|
||||||
@ -100,8 +100,8 @@ mk() {
|
|||||||
$ADDOPTIONS \
|
$ADDOPTIONS \
|
||||||
--prefix=/usr/ \
|
--prefix=/usr/ \
|
||||||
--libexecdir=/usr/$LIBDIR/dbus-glib
|
--libexecdir=/usr/$LIBDIR/dbus-glib
|
||||||
make -j $NUMCPU
|
make USE_ARCH=$UARCH -j $NUMCPU
|
||||||
make -j $NUMCPU DESTDIR=$TMPROOT install
|
make USE_ARCH=$UARCH -j $NUMCPU DESTDIR=$TMPROOT install
|
||||||
}
|
}
|
||||||
|
|
||||||
postmk() {
|
postmk() {
|
||||||
|
@ -79,9 +79,9 @@ premk() {
|
|||||||
|
|
||||||
#Hier wird der Make Prozess der Sourcen definiert
|
#Hier wird der Make Prozess der Sourcen definiert
|
||||||
mk() {
|
mk() {
|
||||||
make -k -j $NUMCPU PREFIX=/usr \
|
make -k -j $NUMCPU USE_ARCH=$UARCH PREFIX=/usr \
|
||||||
PERL=/usr/bin/perl
|
PERL=/usr/bin/perl
|
||||||
make -k PREFIX=$TMPROOT/usr \
|
make -k USE_ARCH=$UARCH PREFIX=$TMPROOT/usr \
|
||||||
PERL=/usr/bin/perl install
|
PERL=/usr/bin/perl install
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -81,9 +81,10 @@ mk32() {
|
|||||||
CC="gcc $BUILDOPTIONS32" \
|
CC="gcc $BUILDOPTIONS32" \
|
||||||
CXX="g++ $BUILDOPTIONS32" \
|
CXX="g++ $BUILDOPTIONS32" \
|
||||||
USE_ARCH=32 \
|
USE_ARCH=32 \
|
||||||
|
LDEMULATION=elf32_i386 \
|
||||||
./configure --prefix=/usr
|
./configure --prefix=/usr
|
||||||
make -j $NUMCPU -k
|
make USE_ARCH=32 LDEMULATION=elf32_i386 -j $NUMCPU -k
|
||||||
make -j $NUMCPU -k DESTDIR=$TMPROOT install
|
make USE_ARCH=32 LDEMULATION=elf32_i386 -j $NUMCPU -k DESTDIR=$TMPROOT install
|
||||||
make distclean
|
make distclean
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -94,10 +95,11 @@ mk() {
|
|||||||
CC="gcc $BUILDOPTIONS" \
|
CC="gcc $BUILDOPTIONS" \
|
||||||
CXX="g++ $BUILDOPTIONS" \
|
CXX="g++ $BUILDOPTIONS" \
|
||||||
USE_ARCH=$UARCH \
|
USE_ARCH=$UARCH \
|
||||||
|
LDEMULATION=elf64-x86-64 \
|
||||||
./configure $ADDOPTIONS \
|
./configure $ADDOPTIONS \
|
||||||
--prefix=/usr
|
--prefix=/usr
|
||||||
make -j $NUMCPU -k
|
make USE_ARCH=$UARCH LDEMULATION=elf64-x86-64 -j $NUMCPU -k
|
||||||
make -j $NUMCPU -k DESTDIR=$TMPROOT install
|
make USE_ARCH=$UARCH LDEMULATION=elf64-x86-64 -j $NUMCPU -k DESTDIR=$TMPROOT install
|
||||||
}
|
}
|
||||||
|
|
||||||
postmk() {
|
postmk() {
|
||||||
|
@ -94,7 +94,7 @@ mk32() {
|
|||||||
--with-perl=/usr/bin/perl \
|
--with-perl=/usr/bin/perl \
|
||||||
--with-py=/usr/bin/python \
|
--with-py=/usr/bin/python \
|
||||||
--with-tcl=/usr/X11R7/bin/tclsh &&
|
--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 -j $NUMCPU prefix=$TMPROOT/usr/X11R7 install &&
|
||||||
make distclean
|
make distclean
|
||||||
mv $TMPROOT/usr/X11R7/bin/pdflib-config{,-32}
|
mv $TMPROOT/usr/X11R7/bin/pdflib-config{,-32}
|
||||||
|
Loading…
Reference in New Issue
Block a user