Und wieder einige Module angepasst
git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@4856 504e572c-2e33-0410-9681-be2bf7408885
This commit is contained in:
kueller
parent
5ed072bb56
commit
d0d7e5e2b1
@ -68,23 +68,22 @@
|
||||
#
|
||||
#
|
||||
|
||||
SRCPATH=X11/lib
|
||||
SRCPATH=GuiBased/Lib
|
||||
|
||||
#Funktion wird nach dem Entpacken der Sourcen, im Tree der Sourcen
|
||||
#ausgeführt (sprich unpack src; cd src; premk)
|
||||
#Hier kann z.B. das Makefile gepatcht werden (SED lässt grüssen
|
||||
|
||||
premk() {
|
||||
ldconfig
|
||||
export PATH=$PATH:/usr/X11R7/bin
|
||||
X11R7_Fix
|
||||
echo "Nothing to do for premk()"
|
||||
}
|
||||
|
||||
mk32() {
|
||||
CC="gcc $BUILDOPTIONS32" \
|
||||
CXX="g++ $BUILDOPTIONS32" \
|
||||
CC="gcc $BUILDOPTIONS32 -fPIC" \
|
||||
CXX="g++ $BUILDOPTIONS32 -fPIC" \
|
||||
USE_ARCH=$UARCH \
|
||||
LDFLAGS="-L/usr/lib -L/usr/X11R7/lib" \
|
||||
./configure --target=$TARGET32 \
|
||||
./configure --build=$TARGET32 \
|
||||
--prefix=/usr/X11R7 \
|
||||
--datadir=/usr/share \
|
||||
--with-gnu-ld \
|
||||
@ -93,16 +92,19 @@ mk32() {
|
||||
make -j $NUMCPU &&
|
||||
make -j $NUMCPU DESTDIR=$TMPROOT install
|
||||
make distclean
|
||||
mv $TMPROOT/usr/X11R7/bin/gtk-config{,-32}
|
||||
GenDynLib32 $TMPROOT/usr/X11R7/lib/libgdk.a 1.2.10
|
||||
GenDynLib32 $TMPROOT/usr/X11R7/lib/libgtk.a 1.2.10
|
||||
}
|
||||
|
||||
#Hier wird der Make Prozess der Sourcen definiert
|
||||
mk() {
|
||||
if [ "$MK64BIT" == "true" ]; then
|
||||
ADDOPTIONS="--libdir=/usr/X11R7/lib64"
|
||||
export LDFLAGS="-L/usr/lib64 -L/usr/X11R7/lib64"
|
||||
fi
|
||||
CC="gcc $BUILDOPTIONS" \
|
||||
CXX="g++ $BUILDOPTIONS" \
|
||||
CC="gcc $BUILDOPTIONS -fPIC" \
|
||||
CXX="g++ $BUILDOPTIONS -fPIC" \
|
||||
LDFLAGS="-L/usr/$LIBDIR -L/usr/X11R7/$LIBDIR" \
|
||||
./configure --target=$TARGET \
|
||||
--prefix=/usr/X11R7 \
|
||||
$ADDOPTIONS \
|
||||
@ -112,10 +114,15 @@ mk() {
|
||||
--with-x &&
|
||||
make -j $NUMCPU &&
|
||||
make -j $NUMCPU DESTDIR=$TMPROOT install
|
||||
GenDynLib $TMPROOT/usr/X11R7/$LIBDIR/libgdk.a 1.2.10
|
||||
GenDynLib $TMPROOT/usr/X11R7/$LIBDIR/libgtk.a 1.2.10
|
||||
}
|
||||
|
||||
#Funktion wird nach Ablauf des Make Prozesses ausgeführt, und kann
|
||||
#in $TMPROOT noch einiges korrigieren
|
||||
postmk() {
|
||||
echo "Nothing to do for postmk()"
|
||||
if [ "$MK64BIT" == "true" ]; then
|
||||
mv $TMPROOT/usr/X11R7/bin/gtk-config{,-64}
|
||||
ln -s /usr/bin/multiarch_wrapper $TMPROOT/usr/X11R7/bin/gtk-config
|
||||
fi
|
||||
}
|
||||
@ -70,7 +70,7 @@
|
||||
#
|
||||
#
|
||||
|
||||
SRCPATH=Tools/MultiMedia
|
||||
SRCPATH=MultiMedia/Apps
|
||||
|
||||
premk() {
|
||||
echo "Nothing to do for premk()"
|
||||
@ -81,7 +81,7 @@ premk() {
|
||||
mk32() {
|
||||
CC="gcc $BUILDOPTIONS32" \
|
||||
CXX="g++ $BUILDOPTIONS32" \
|
||||
LDFLAGS="-L/lib -L/usr/lib -L/usr/X11R7/lib" \
|
||||
LDFLAGS="-L/lib -L/usr/lib -L/usr/X11R7/lib -liconv" \
|
||||
USE_ARCH=$UARCH \
|
||||
./configure --build=$TARGET32 \
|
||||
--prefix=/usr \
|
||||
@ -98,7 +98,7 @@ mk() {
|
||||
fi
|
||||
CC="gcc $BUILDOPTIONS" \
|
||||
CXX="g++ $BUILDOPTIONS" \
|
||||
LDFLAGS="-L/lib64 -L/usr/lib64 -L/usr/X11R7/lib64" \
|
||||
LDFLAGS="-L/lib64 -L/usr/lib64 -L/usr/X11R7/lib64 -liconv" \
|
||||
USE_ARCH=$UARCH \
|
||||
./configure --build=$TARGET \
|
||||
--prefix=/usr \
|
||||
|
||||
@ -69,7 +69,7 @@
|
||||
#
|
||||
#
|
||||
|
||||
SRCPATH=X11/MultiMedia
|
||||
SRCPATH=MultiMedia/Apps
|
||||
|
||||
premk() {
|
||||
echo "Nothing to do for premk()"
|
||||
@ -78,8 +78,8 @@ premk() {
|
||||
mk() {
|
||||
CC="gcc $BUILDOPTIONS" \
|
||||
CXX="g++ $BUILDOPTIONS" \
|
||||
./configure --target=$TARGET \
|
||||
--prefix=/usr/X11R6
|
||||
./configure --build=$TARGET \
|
||||
--prefix=/usr/X11R7
|
||||
make -j $NUMCPU
|
||||
mv Makefile.rules Makefile.oldrules
|
||||
<Makefile.oldrules >Makefile.rules sed -e "s/DEST_DIR=/DEST_DIR=\$TMPROOT/g"
|
||||
@ -69,16 +69,63 @@
|
||||
#
|
||||
#
|
||||
|
||||
SRCPATH=Tools/lib
|
||||
SRCPATH=Security/Lib
|
||||
|
||||
premk() {
|
||||
mkdir -p $TMPROOT/opt/mozilla/nspr
|
||||
mkdir -p $TMPROOT/usr/X11R7/bin
|
||||
cd mozilla/nsprpub
|
||||
}
|
||||
|
||||
mk32() {
|
||||
CC="gcc $BUILDOPTIONS32" \
|
||||
CXX="g++ $BUILDOPTIONS32" \
|
||||
USE_ARCH=$UARCH \
|
||||
./configure --prefix=/usr/X11R7 \
|
||||
--enable-strip \
|
||||
--with-pthreads \
|
||||
--with-dist-prefix=$TMPROOT
|
||||
make -j $NUMCPU
|
||||
cd $TMPROOT
|
||||
cp -rpvL lib usr/X11R7
|
||||
rm -r {lib,include,bin}
|
||||
cd -
|
||||
sed -e "s/lib64/lib/" config/nspr-config >\
|
||||
$TMPROOT/usr/X11R7/bin/nspr-config-32
|
||||
chmod 755 $TMPROOT/usr/X11R7/bin/nspr-config-32
|
||||
make distclean
|
||||
}
|
||||
|
||||
mk() {
|
||||
cp -a * $TMPROOT/opt/mozilla/nspr
|
||||
if [ "$MK64BIT" == "true" ]; then
|
||||
ADDOPTIONS="--enable-64bit"
|
||||
fi
|
||||
CC="gcc $BUILDOPTIONS" \
|
||||
CXX="g++ $BUILDOPTIONS" \
|
||||
USE_ARCH=$UARCH \
|
||||
./configure --prefix=/usr/X11R7 \
|
||||
--enable-strip \
|
||||
$ADDOPTIONS \
|
||||
--with-pthreads \
|
||||
--with-dist-prefix=$TMPROOT
|
||||
make -j $NUMCPU
|
||||
cd $TMPROOT
|
||||
if [ "$MK64BIT" == "true" ]; then
|
||||
mv lib $LIBDIR
|
||||
fi
|
||||
cp -rpvL $LIBDIR usr/X11R7
|
||||
cp -rpvL include usr/X11R7
|
||||
rm -r {lib*,include,bin}
|
||||
cd -
|
||||
if [ "$MK64BIT" == "true" ]; then
|
||||
sed -e "s/lib$/lib64/" config/nspr-config >\
|
||||
$TMPROOT/usr/X11R7/bin/nspr-config-64
|
||||
chmod 755 $TMPROOT/usr/X11R7/bin/nspr-config-64
|
||||
ln -s /usr/bin/multiarch_wrapper $TMPROOT/usr/X11R7/bin/nspr-config
|
||||
else
|
||||
cp config/nspr-config $TMPROOT/usr/X11R7/bin
|
||||
fi
|
||||
}
|
||||
|
||||
postmk() {
|
||||
GetSVN Viitor_nspr $TMPROOT
|
||||
echo "Nothing to do for premk()"
|
||||
}
|
||||
@ -67,7 +67,7 @@
|
||||
#
|
||||
#
|
||||
|
||||
SRCPATH=Tools/lib
|
||||
SRCPATH=Tools/Lib
|
||||
|
||||
#Funktion wird nach dem Entpacken der Sourcen, im Tree der Sourcen
|
||||
#ausgeführt (sprich unpack src; cd src; premk)
|
||||
@ -78,39 +78,50 @@ premk() {
|
||||
}
|
||||
|
||||
mk32() {
|
||||
CC="gcc $BUILDOPTIONS32" \
|
||||
CXX="g++ $BUILDOPTIONS32" \
|
||||
./configure --target=$TARGET32 \
|
||||
--host=$TARGET32 \
|
||||
CC="gcc $BUILDOPTIONS32 -fPIC" \
|
||||
CXX="g++ $BUILDOPTIONS32 -fPIC" \
|
||||
USE_ARCH=$UARCH \
|
||||
./configure --build=$TARGET32 \
|
||||
--with-libiconv \
|
||||
--prefix=/usr/X11R7 &&
|
||||
--prefix=/usr &&
|
||||
make -j $NUMCPU
|
||||
cd glib/.libs
|
||||
gcc -shared -fPIC -m32 -Wl,-soname,libglib-1.3.so.15.0.0 -o libglib-1.3.so.15.0.0 libglib-1.3.a
|
||||
cd -
|
||||
make -j $NUMCPU
|
||||
make -j $NUMCPU DESTDIR=$TMPROOT install
|
||||
make distclean
|
||||
for i in libglib.a \
|
||||
libgthread.a \
|
||||
libgmodule.a ; do
|
||||
GenDynLib32 $TMPROOT/usr/lib/$i 1.2.10
|
||||
done
|
||||
mv $TMPROOT/usr/bin/glib-config{,-32}
|
||||
|
||||
}
|
||||
|
||||
#Hier wird der Make Prozess der Sourcen definiert
|
||||
mk() {
|
||||
if [ "$MK64BIT" == "true" ]; then
|
||||
ADDOPTIONS="--libdir=/usr/X11R7/lib64"
|
||||
ADDOPTIONS="--libdir=/usr/lib64"
|
||||
fi
|
||||
CC="gcc $BUILDOPTIONS" \
|
||||
CXX="g++ $BUILDOPTIONS" \
|
||||
./configure --target=$TARGET \
|
||||
--host=$TARGET \
|
||||
CC="gcc $BUILDOPTIONS -fPIC" \
|
||||
CXX="g++ $BUILDOPTIONS -fPIC" \
|
||||
USE_ARCH=$UARCH \
|
||||
./configure --build=$TARGET \
|
||||
--with-libiconv \
|
||||
$ADDOPTIONS \
|
||||
--prefix=/usr/X11R7 &&
|
||||
make -j $NUMCPU -k
|
||||
make -j $NUMCPU -k DESTDIR=$TMPROOT install
|
||||
--prefix=/usr &&
|
||||
make -j $NUMCPU
|
||||
make -j $NUMCPU DESTDIR=$TMPROOT install
|
||||
for i in libglib.a \
|
||||
libgthread.a \
|
||||
libgmodule.a ; do
|
||||
GenDynLib $TMPROOT/usr/$LIBDIR/$i 1.2.10
|
||||
done
|
||||
}
|
||||
|
||||
#Funktion wird nach Ablauf des Make Prozesses ausgeführt, und kann
|
||||
#in $TMPROOT noch einiges korrigieren
|
||||
postmk() {
|
||||
echo "Nothing to do for postmk()"
|
||||
if [ "$MK64BIT" == "true" ]; then
|
||||
mv $TMPROOT/usr/bin/glib-config{,-64}
|
||||
ln -s /usr/bin/multiarch_wrapper $TMPROOT/usr/bin/glib-config
|
||||
fi
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user