Diverse Updates und Anpassungan an V962
git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@4692 504e572c-2e33-0410-9681-be2bf7408885
This commit is contained in:
parent
e55d1f5d1f
commit
5ad2d1279d
@ -74,8 +74,7 @@
|
|||||||
SRCPATH=Tools/Net
|
SRCPATH=Tools/Net
|
||||||
|
|
||||||
premk() {
|
premk() {
|
||||||
mv Makefile Makefile.orig
|
sed -i -e "s%/usr/local%/usr%g" common.mak
|
||||||
sed -e "s/\/usr\/local/$\(DESTDIR\)\/usr/g" < Makefile.orig >Makefile
|
|
||||||
}
|
}
|
||||||
|
|
||||||
mk() {
|
mk() {
|
||||||
|
@ -95,6 +95,7 @@ mk32() {
|
|||||||
rm -r ../Build-dbus &&
|
rm -r ../Build-dbus &&
|
||||||
mkdir ../Build-dbus &&
|
mkdir ../Build-dbus &&
|
||||||
cd ../Build-dbus
|
cd ../Build-dbus
|
||||||
|
make distclean
|
||||||
}
|
}
|
||||||
|
|
||||||
mk() {
|
mk() {
|
||||||
|
@ -83,6 +83,8 @@ premk() {
|
|||||||
mk() {
|
mk() {
|
||||||
# Hier die ./configure --build=$HOSTSYS --target=$HOSTSYS-Optionen eintragen.
|
# Hier die ./configure --build=$HOSTSYS --target=$HOSTSYS-Optionen eintragen.
|
||||||
# Den \ nicht vergessen !
|
# Den \ nicht vergessen !
|
||||||
|
CC="gcc $BUILDOPTIONS" \
|
||||||
|
CXX="g++ $BUILDOPTIONS" \
|
||||||
./configure --host=$TARGET \
|
./configure --host=$TARGET \
|
||||||
--prefix=/usr
|
--prefix=/usr
|
||||||
|
|
||||||
|
@ -82,6 +82,7 @@ premk() {
|
|||||||
mk32() {
|
mk32() {
|
||||||
CC="gcc $BUILDOPTIONS32" \
|
CC="gcc $BUILDOPTIONS32" \
|
||||||
CXX="g++ $BUILDOPTIONS32" \
|
CXX="g++ $BUILDOPTIONS32" \
|
||||||
|
USE_ARCH=$UARCH \
|
||||||
./configure --host=$TARGET32 \
|
./configure --host=$TARGET32 \
|
||||||
--prefix=/usr \
|
--prefix=/usr \
|
||||||
--with-gnu-ld &&
|
--with-gnu-ld &&
|
||||||
@ -98,6 +99,7 @@ mk() {
|
|||||||
fi
|
fi
|
||||||
CC="gcc $BUILDOPTIONS" \
|
CC="gcc $BUILDOPTIONS" \
|
||||||
CXX="g++ $BUILDOPTIONS" \
|
CXX="g++ $BUILDOPTIONS" \
|
||||||
|
USE_ARCH=$UARCH \
|
||||||
./configure --host=$TARGET \
|
./configure --host=$TARGET \
|
||||||
--prefix=/usr \
|
--prefix=/usr \
|
||||||
$ADDOPTIONS \
|
$ADDOPTIONS \
|
||||||
|
@ -76,32 +76,33 @@ SRCPATH=Tools/Net
|
|||||||
#Hier kann z.B. das Makefile gepatcht werden (SED lässt grüssen
|
#Hier kann z.B. das Makefile gepatcht werden (SED lässt grüssen
|
||||||
|
|
||||||
premk() {
|
premk() {
|
||||||
sed -e "s%PREFIX:=/usr/local%PREFIX:=/usr%" Makefile >/tmp/Makefile
|
echo "Nothing to do for premk"
|
||||||
if [ "$MK64BIT" == "true" ]; then
|
}
|
||||||
sed -e "s%LIBDIR:=\$(PREFIX)/lib%LIBDIR:=\$(PREFIX)/lib64%" \
|
|
||||||
/tmp/Makefile >Makefile
|
mk32() {
|
||||||
else
|
CC="gcc $BUILDOPTIONS32" \
|
||||||
mv /tmp/Makefile .
|
CXX="g++ $BUILDOPTIONS32" \
|
||||||
fi
|
USE_ARCH=$UARCH \
|
||||||
|
./configure --prefix=/usr \
|
||||||
|
--libdir=/usr/$LIBDIR
|
||||||
|
make -j $NUMCPU
|
||||||
|
make -j $NUMCPU DESTDIR=$TMPROOT install
|
||||||
|
make distclean
|
||||||
}
|
}
|
||||||
|
|
||||||
#Hier wird der Make Prozess der Sourcen definiert
|
#Hier wird der Make Prozess der Sourcen definiert
|
||||||
mk() {
|
mk() {
|
||||||
make CC="gcc $BUILDOPTIONS" \
|
CC="gcc $BUILDOPTIONS" \
|
||||||
CXX="g++ $BUILDOPTIONS" &&
|
CXX="g++ $BUILDOPTIONS" \
|
||||||
|
USE_ARCH=$UARCH \
|
||||||
|
./configure --prefix=/usr \
|
||||||
|
--libdir=/usr/$LIBDIR
|
||||||
|
make -j $NUMCPU
|
||||||
make -j $NUMCPU DESTDIR=$TMPROOT install
|
make -j $NUMCPU DESTDIR=$TMPROOT install
|
||||||
if [ ! -d $TMPROOT/usr/share ]; then
|
|
||||||
mkdir -p $TMPROOT/usr/share
|
|
||||||
fi
|
|
||||||
mv $TMPROOT/man $TMPROOT/usr/share
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#Funktion wird nach Ablauf des Make Prozesses ausgeführt, und kann
|
#Funktion wird nach Ablauf des Make Prozesses ausgeführt, und kann
|
||||||
#in $TMPROOT noch einiges korrigieren
|
#in $TMPROOT noch einiges korrigieren
|
||||||
postmk() {
|
postmk() {
|
||||||
if [ ! -d $TMPROOT/usr/share ]; then
|
|
||||||
mkdir $TMPROOT/usr/share/
|
|
||||||
fi
|
|
||||||
mv $TMPROOT/man $TMPROOT/usr/share
|
|
||||||
GetSVN Viitor_iptables $TMPROOT
|
GetSVN Viitor_iptables $TMPROOT
|
||||||
}
|
}
|
||||||
|
@ -76,9 +76,10 @@ premk() {
|
|||||||
echo "Nothing to do for premk()"
|
echo "Nothing to do for premk()"
|
||||||
}
|
}
|
||||||
|
|
||||||
mk() {
|
mk32() {
|
||||||
CC="gcc $BUILDOPTIONS" \
|
CC="gcc $BUILDOPTIONS32" \
|
||||||
CXX="g++ $BUILDOPTIONS" \
|
CXX="g++ $BUILDOPTIONS32" \
|
||||||
|
USE_ARCH=$UARCH \
|
||||||
./configure --target=$TARGET \
|
./configure --target=$TARGET \
|
||||||
--sysconfdir=/etc \
|
--sysconfdir=/etc \
|
||||||
--localstatedir=/var/lib/pksd \
|
--localstatedir=/var/lib/pksd \
|
||||||
@ -87,6 +88,22 @@ mk() {
|
|||||||
--prefix=/usr
|
--prefix=/usr
|
||||||
make -j $NUMCPU
|
make -j $NUMCPU
|
||||||
make -j $NUMCPU DESTDIR=$TMPROOT install
|
make -j $NUMCPU DESTDIR=$TMPROOT install
|
||||||
|
make distclean
|
||||||
|
mv $TMPROOT/usr/lib{,-32}
|
||||||
|
}
|
||||||
|
|
||||||
|
mk() {
|
||||||
|
CC="gcc $BUILDOPTIONS" \
|
||||||
|
CXX="g++ $BUILDOPTIONS" \
|
||||||
|
USE_ARCH=$UARCH \
|
||||||
|
./configure --target=$TARGET \
|
||||||
|
--sysconfdir=/etc \
|
||||||
|
--localstatedir=/var/lib/pksd \
|
||||||
|
--datadir=/var/lib/pksd \
|
||||||
|
--libdir=/usr/$LIBDIR \
|
||||||
|
--prefix=/usr
|
||||||
|
make -j $NUMCPU
|
||||||
|
make -j $NUMCPU DESTDIR=$TMPROOT install
|
||||||
}
|
}
|
||||||
|
|
||||||
postmk() {
|
postmk() {
|
||||||
@ -94,4 +111,8 @@ postmk() {
|
|||||||
for i in MRHKP NEWS README UPGRADING; do
|
for i in MRHKP NEWS README UPGRADING; do
|
||||||
cp $i $TMPROOT/usr/share/doc/pks
|
cp $i $TMPROOT/usr/share/doc/pks
|
||||||
done
|
done
|
||||||
|
if [ "$MK64BIT" == "true" ]; then
|
||||||
|
mv $TMPROOT/usr/lib{,64}
|
||||||
|
mv $TMPROOT/usr/lib-32 $TMPROOT/usr/lib
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
@ -83,6 +83,7 @@ premk() {
|
|||||||
mk32() {
|
mk32() {
|
||||||
CC="gcc $BUILDOPTIONS32" \
|
CC="gcc $BUILDOPTIONS32" \
|
||||||
CXX="g++ $BUILDOPTIONS32" \
|
CXX="g++ $BUILDOPTIONS32" \
|
||||||
|
USE_ARCH=$UARCH \
|
||||||
./configure --target=$TARGET32 \
|
./configure --target=$TARGET32 \
|
||||||
--prefix=/usr &&
|
--prefix=/usr &&
|
||||||
make -j $NUMCPU &&
|
make -j $NUMCPU &&
|
||||||
@ -97,6 +98,7 @@ mk() {
|
|||||||
fi
|
fi
|
||||||
CC="gcc $BUILDOPTIONS" \
|
CC="gcc $BUILDOPTIONS" \
|
||||||
CXX="g++ $BUILDOPTIONS" \
|
CXX="g++ $BUILDOPTIONS" \
|
||||||
|
USE_ARCH=$UARCH \
|
||||||
./configure --target=$TARGET \
|
./configure --target=$TARGET \
|
||||||
$ADDOPTIONS \
|
$ADDOPTIONS \
|
||||||
--prefix=/usr &&
|
--prefix=/usr &&
|
||||||
|
@ -74,13 +74,39 @@ premk() {
|
|||||||
echo "Nothing to do for premk()"
|
echo "Nothing to do for premk()"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
mk32() {
|
||||||
|
# Hier die ./configure --build=$HOSTSYS --target=$HOSTSYS-Optionen eintragen.
|
||||||
|
# Den \ nicht vergessen !
|
||||||
|
CC="gcc $BUILDOPTIONS32" \
|
||||||
|
CXX="g++ $BUILDOPTIONS32" \
|
||||||
|
USE_ARCH=$UARCH \
|
||||||
|
./configure --host=$TARGET32 \
|
||||||
|
--target=$TARGET32
|
||||||
|
|
||||||
|
CheckError "Configurescript failed !" 1
|
||||||
|
|
||||||
|
# Make-Optionen eintragen
|
||||||
|
make -j $NUMCPU CC="gcc $BUILDOPTIONS32"
|
||||||
|
CheckError "Makeprocess failed !" 1
|
||||||
|
|
||||||
|
# Make install Optionen eintragen
|
||||||
|
make -j $NUMCPU DESTDIR=$TMPROOT install
|
||||||
|
CheckError "Make install process failed !" 1
|
||||||
|
make clean
|
||||||
|
echo "ready"
|
||||||
|
read
|
||||||
|
}
|
||||||
|
|
||||||
mk() {
|
mk() {
|
||||||
# Hier die ./configure --build=$HOSTSYS --target=$HOSTSYS-Optionen eintragen.
|
# Hier die ./configure --build=$HOSTSYS --target=$HOSTSYS-Optionen eintragen.
|
||||||
# Den \ nicht vergessen !
|
# Den \ nicht vergessen !
|
||||||
|
find . -name "[mM]akefile*" -exec sed -i -e "s%/lib%/$LIBDIR%g" {} \;
|
||||||
CC="gcc $BUILDOPTIONS" \
|
CC="gcc $BUILDOPTIONS" \
|
||||||
CXX="g++ $BUILDOPTIONS" \
|
CXX="g++ $BUILDOPTIONS" \
|
||||||
|
USE_ARCH=$UARCH \
|
||||||
./configure --host=$TARGET \
|
./configure --host=$TARGET \
|
||||||
--target=$TARGET
|
--target=$TARGET \
|
||||||
|
--libdir=$LIBDIR
|
||||||
|
|
||||||
CheckError "Configurescript failed !" 1
|
CheckError "Configurescript failed !" 1
|
||||||
|
|
||||||
|
@ -81,9 +81,25 @@ premk() {
|
|||||||
CheckError "premk() failed !" 1
|
CheckError "premk() failed !" 1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
mk32() {
|
||||||
|
export USE_ARCH=$UARCH
|
||||||
|
perl-32 Makefile.PL PREFIX=$TMPROOT/usr CC="gcc $BUILDOPTIONS32" CXX="g++ $BUILDOPTIONS32"
|
||||||
|
CheckError "Configurescript failed !" 1
|
||||||
|
|
||||||
|
# Make-Optionen eintragen
|
||||||
|
make -j $NUMCPU
|
||||||
|
make -j $NUMCPU doctest
|
||||||
|
CheckError "Makeprocess failed !" 1
|
||||||
|
|
||||||
|
# Make install Optionen eintragen
|
||||||
|
make -j $NUMCPU PREFIX=$TMPROOT/usr install
|
||||||
|
CheckError "Make install process failed !" 1
|
||||||
|
make distclean
|
||||||
|
unset USE_ARCH
|
||||||
|
}
|
||||||
|
|
||||||
mk() {
|
mk() {
|
||||||
# Hier die ./configure --build=$HOSTSYS --target=$HOSTSYS-Optionen eintragen.
|
export USE_ARCH=$UARCH
|
||||||
# Den \ nicht vergessen !
|
|
||||||
perl Makefile.PL PREFIX=$TMPROOT/usr
|
perl Makefile.PL PREFIX=$TMPROOT/usr
|
||||||
CheckError "Configurescript failed !" 1
|
CheckError "Configurescript failed !" 1
|
||||||
|
|
||||||
@ -95,6 +111,7 @@ mk() {
|
|||||||
# Make install Optionen eintragen
|
# Make install Optionen eintragen
|
||||||
make -j $NUMCPU PREFIX=$TMPROOT/usr install
|
make -j $NUMCPU PREFIX=$TMPROOT/usr install
|
||||||
CheckError "Make install process failed !" 1
|
CheckError "Make install process failed !" 1
|
||||||
|
unset USE_ARCH
|
||||||
}
|
}
|
||||||
|
|
||||||
postmk() {
|
postmk() {
|
||||||
|
@ -80,8 +80,8 @@ mk32() {
|
|||||||
CC="gcc $BUILDOPTIONS32" \
|
CC="gcc $BUILDOPTIONS32" \
|
||||||
CXX="g++ $BUILDOPTIONS32" \
|
CXX="g++ $BUILDOPTIONS32" \
|
||||||
USE_ARCH=$UARCH \
|
USE_ARCH=$UARCH \
|
||||||
./configure --target=$TARGET \
|
./configure --target=$TARGET32 \
|
||||||
--prefix=/usr/X11R7
|
--prefix=/usr/
|
||||||
make -j $NUMCPU
|
make -j $NUMCPU
|
||||||
make -j $NUMCPU DESTDIR=$TMPROOT install
|
make -j $NUMCPU DESTDIR=$TMPROOT install
|
||||||
make distclean
|
make distclean
|
||||||
@ -97,7 +97,7 @@ mk() {
|
|||||||
USE_ARCH=$UARCH \
|
USE_ARCH=$UARCH \
|
||||||
./configure --target=$TARGET \
|
./configure --target=$TARGET \
|
||||||
$ADDOPTIONS \
|
$ADDOPTIONS \
|
||||||
--prefix=/usr/X11R7
|
--prefix=/usr/
|
||||||
make -j $NUMCPU
|
make -j $NUMCPU
|
||||||
make -j $NUMCPU DESTDIR=$TMPROOT install
|
make -j $NUMCPU DESTDIR=$TMPROOT install
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user