Anpassung an neue Version. Diverse neue Patches eingearbeitet.

Build Ueberarbeitungen. USE_ARCH hinzugefuegt



git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@4688 504e572c-2e33-0410-9681-be2bf7408885
This commit is contained in:
kueller 2009-05-13 17:50:57 +00:00
parent 5570d7d24a
commit aab0f58623
30 changed files with 178 additions and 63 deletions

View File

@ -78,6 +78,7 @@ premk() {
mk32() {
CC="gcc $BUILDOPTIONS32" \
CXX="g++ $BUILDOPTIONS32" \
USE_ARCH=$UARCH \
./configure --host=$TARGET32 \
--prefix=/usr
make -j $NUMCPU
@ -91,6 +92,7 @@ mk() {
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
USE_ARCH=$UARCH \
./configure --host=$TARGET \
$ADDOPTIONS \
--prefix=/usr

View File

@ -79,6 +79,7 @@ premk() {
mk32() {
CC="gcc $BUILDOPTIONS32" \
CXX="g++ $BUILDOPTIONS32" \
USE_ARCH=$UARCH \
./configure --host=$TARGET32 \
--prefix=/usr
make -j $NUMCPU
@ -92,6 +93,7 @@ mk() {
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
USE_ARCH=$UARCH \
./configure --host=$TARGET \
$ADDOPTIONS \
--prefix=/usr

View File

@ -73,12 +73,15 @@
SRCPATH=Tools/System
premk() {
echo "Nothing to do for premk()"
libtoolize && \
autoreconf && \
sed -i -e s/NULL/0/g src/Interest.h
}
mk32() {
CC="gcc $BUILDOPTIONS32" \
CXX="g++ $BUILDOPTIONS32" \
USE_ARCH=$UARCH \
./configure --host=$TARGET32 \
--prefix=/usr \
--sysconfdir=/etc
@ -93,6 +96,7 @@ mk() {
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
USE_ARCH=$UARCH \
./configure --host=$TARGET \
--prefix=/usr \
$ADDOPTIONS \

View File

@ -73,11 +73,13 @@ SRCPATH=Tools/Utilities
premk() {
echo "Nothing to do for premk()"
sed -i "s@iomanip.h@iomanip@g" ./configure
}
mk32() {
CC="gcc $BUILDOPTIONS32" \
CXX="g++ $BUILDOPTIONS32" \
USE_ARCH=$UARCH \
./configure --host=$TARGET32 \
--prefix=/usr
make -j $NUMCPU
@ -92,6 +94,7 @@ mk() {
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
USE_ARCH=$UARCH \
./configure --host=$TARGET \
$ADDOPTIONS \
--prefix=/usr

View File

@ -83,37 +83,42 @@ premk() {
}
mk32() {
CC="gcc $BUILDOPTIONS32" \
CXX="g++ $BUILDOPTIONS32" \
CC="gcc $BUILDOPTIONS32 -fPIC" \
CXX="g++ $BUILDOPTIONS32 -fPIC" \
USE_ARCH=$UARCH \
./configure --target=$TARGET32 \
--prefix=/usr \
--enable-static \
--enable-shared &&
make -j $NUMCPU &&
make -j $NUMCPU prefix=$TMPROOT/usr install
make -j $NUMCPU prefix=$TMPROOT/usr install-lib
make -j $NUMCPU prefix=$TMPROOT/usr install-headers
make -j $NUMCPU libdir=/usr/$LIBDIR DESTDIR=$TMPROOT install
make -j $NUMCPU libdir=/usr/$LIBDIR DESTDIR=$TMPROOT install-lib
make -j $NUMCPU libdir=/usr/$LIBDIR DESTDIR=$TMPROOT install-headers
cp jmemsys.h $TMPROOT/usr/include
make distclean
gcc -fPIC -m32 -shared -Wl,-soname,libjpeg.so.62.0.0 -o $TMPROOT/usr/lib/libjpeg6b.so.62.0.0 $TMPROOT/usr/lib/libjpeg.a
}
#Hier wird der Make Prozess der Sourcen definiert
mk() {
if [ "$MK64BIT" == "true" ]; then
ADDOPTIONS="--libdir=\${prefix}/lib64"
ADDOPTIONS="--libdir=/usr/lib64"
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
CC="gcc $BUILDOPTIONS -fPIC" \
CXX="g++ $BUILDOPTIONS -fPIC" \
LDFLAGS="-fPIC" \
USE_ARCH=$UARCH \
./configure --target=$TARGET \
--prefix=/usr \
$ADDOPTIONS \
--enable-static \
--enable-shared &&
sed -e "s%/lib$%/$LIBDIR%" Makefile >/tmp/Makefile
mv /tmp/Makefile .
make -j $NUMCPU &&
make -j $NUMCPU prefix=$TMPROOT/usr install
make -j $NUMCPU prefix=$TMPROOT/usr install-lib
make -j $NUMCPU prefix=$TMPROOT/usr install-headers
make -j $NUMCPU libdir=/usr/$LIBDIR &&
make -j $NUMCPU libdir=/usr/$LIBDIR DESTDIR=$TMPROOT install
make -j $NUMCPU libdir=/usr/$LIBDIR DESTDIR=$TMPROOT install-lib
make -j $NUMCPU libdir=/usr/$LIBDIR DESTDIR=$TMPROOT install-headers
cp jmemsys.h $TMPROOT/usr/include
gcc -fPIC -m$UARCH -shared -Wl,-soname,libjpeg.so.62.0.0 -o $TMPROOT/usr/$LIBDIR/libjpeg6b.so.62.0.0 $TMPROOT/usr/$LIBDIR/libjpeg.a
}
#Funktion wird nach Ablauf des Make Prozesses ausgeführt, und kann

View File

@ -78,6 +78,7 @@ premk() {
mk32() {
CC="gcc $BUILDOPTIONS32" \
CXX="g++ $BUILDOPTIONS32" \
USE_ARCH=$UARCH \
./configure --target=$TARGET32 \
--prefix=/usr
make -j $NUMCPU
@ -91,6 +92,7 @@ mk() {
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
USE_ARCH=$UARCH \
./configure --target=$TARGET \
$ADDOPTIONS \
--prefix=/usr

View File

@ -85,7 +85,9 @@ premk() {
mk32() {
CC="gcc $BUILDOPTIONS32" \
CXX="g++ $BUILDOPTIONS32" \
./configure --target=$TARGET32 \
USE_ARCH=$UARCH \
./configure --build=$TARGET32 \
--host=$TARGET32 \
--prefix=/usr \
--with-gnu-ld
make -j $NUMCPU
@ -102,8 +104,9 @@ mk() {
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
./configure --target=$TARGET \
--prefix=/usr \
USE_ARCH=$UARCH \
./configure --host=$TARGET \
--prefix=/usr \
$ADDOPTIONS \
--with-gnu-ld
make -j $NUMCPU

View File

@ -81,6 +81,7 @@ premk() {
mk32() {
CC="gcc $BUILDOPTIONS32" \
CXX="g++ $BUILDOPTIONS32" \
USE_ARCH=$UARCH \
./configure --host=$TARGET32 \
--prefix=/usr \
--with-gnu-ld \
@ -97,6 +98,7 @@ mk() {
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
USE_ARCH=$UARCH \
./configure --host=$TARGET \
--prefix=/usr \
$ADDOPTIONS \

View File

@ -78,6 +78,7 @@ premk() {
mk32() {
CC="gcc $BUILDOPTIONS32" \
CXX="g++ $BUILDOPTIONS32" \
USE_ARCH=$UARCH \
./configure --target=$TARGET32 \
--prefix=/usr
make -j $NUMCPU
@ -91,6 +92,7 @@ mk() {
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
USE_ARCH=$UARCH \
./configure --target=$TARGET \
$ADDOPTIONS \
--prefix=/usr

View File

@ -78,10 +78,12 @@ premk() {
mk32() {
CC="gcc -L/usr/lib $BUILDOPTIONS32" \
CXX="g++ -L/usr/lib $BUILDOPTIONS32" \
./configure --target=$TARGET32 \
USE_ARCH=$UARCH \
./configure --build=$TARGET32 \
--prefix=/usr
make -j $NUMCPU
make -j $NUMCPU DESTDIR=$TMPROOT install
mv $TMPROOT/usr/bin/libgcrypt-config{,-32}
make distclean
}
@ -91,7 +93,8 @@ mk() {
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
./configure --target=$TARGET \
USE_ARCH=$UARCH \
./configure --build=$TARGET \
$ADDOPTIONS \
--prefix=/usr
make -j $NUMCPU
@ -100,5 +103,9 @@ mk() {
postmk() {
ClearHostSysNameing $TMPROOT
if [ "$MK64BIT" == "true" ]; then
mv $TMPROOT/usr/bin/libgcrypt-config{,-64}
ln -s multiarch_wrapper $TMPROOT/usr/bin/libgcrypt-config
fi
}

View File

@ -84,6 +84,7 @@ premk() {
mk32() {
CC="gcc $BUILDOPTIONS32" \
CXX="g++ $BUILDOPTIONS32" \
USE_ARCH=$UARCH \
./configure --target=$TARGET32 \
--prefix=/usr/X11R7 \
--with-gnu-ld &&
@ -99,6 +100,7 @@ mk() {
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
USE_ARCH=$UARCH \
./configure --target=$TARGET \
--prefix=/usr/X11R7 \
$ADDOPTIONS \

View File

@ -78,10 +78,12 @@ premk() {
mk32() {
CC="gcc $BUILDOPTIONS32" \
CXX="g++ $BUILDOPTIONS32" \
USE_ARCH=$UARCH \
./configure --target=$TARGET32 \
--prefix=/usr
make -j $NUMCPU
make -j $NUMCPU DESTDIR=$TMPROOT install
mv $TMPROOT/usr/bin/gpg-error-config{,-32}
make distclean
}
@ -91,6 +93,7 @@ mk() {
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
USE_ARCH=$UARCH \
./configure --target=$TARGET \
$ADDOPTIONS \
--prefix=/usr
@ -99,5 +102,8 @@ mk() {
}
postmk() {
echo "Nothing to do for postmk()"
if [ "$MK64BIT" == "true" ]; then
mv $TMPROOT/usr/bin/gpg-error-config{,-64}
ln -s multiarch_wrapper $TMPROOT/usr/bin/gpg-error-config
fi
}

View File

@ -78,6 +78,7 @@ premk() {
mk32() {
CC="gcc $BUILDOPTIONS32" \
CXX="g++ $BUILDOPTIONS32" \
USE_ARCH=32 \
./configure --host=$TARGET32 \
--prefix=/usr
make -j $NUMCPU
@ -91,6 +92,7 @@ mk() {
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
USE_ARCH=32 \
./configure --host=$TARGET \
$ADDOPTIONS \
--prefix=/usr

View File

@ -80,6 +80,7 @@ premk() {
mk32() {
CC="gcc $BUILDOPTIONS32" \
CXX="g++ $BUILDOPTIONS32" \
USE_ARCH=$UARCH \
../libidn*/configure --host=$TARGET32 \
--prefix=/usr
make -j $NUMCPU
@ -96,6 +97,7 @@ mk() {
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
USE_ARCH=$UARCH \
../libidn*/configure --host=$TARGET \
$ADDOPTIONS \
--prefix=/usr

View File

@ -78,6 +78,7 @@ premk() {
mk32() {
CC="gcc $BUILDOPTIONS32" \
CXX="g++ $BUILDOPTIONS32" \
USE_ARCH=$UARCH \
./configure --target=$TARGET32 \
--sysconfdir=/etc \
--docdir=/usr/share/doc/libiec \
@ -93,6 +94,7 @@ mk() {
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
USE_ARCH=$UARCH \
./configure --target=$TARGET \
--sysconfdir=/etc \
--docdir=/usr/share/doc/libiec \

View File

@ -78,6 +78,7 @@ premk() {
mk32() {
CC="gcc $BUILDOPTIONS32" \
CXX="g++ $BUILDOPTIONS32" \
USE_ARCH=$UARCH \
./configure --host=$TARGET32 \
--prefix=/usr
make -j $NUMCPU
@ -91,6 +92,7 @@ mk() {
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
USE_ARCH=$UARCH \
./configure --host=$TARGET \
$ADDOPTIONS \
--prefix=/usr

View File

@ -70,6 +70,8 @@
#
#
(( MKPKG = $MKPKG | 128 ))
SRCPATH=Tools/lib
#Funktion wird nach dem Entpacken der Sourcen, im Tree der Sourcen
@ -77,34 +79,28 @@ SRCPATH=Tools/lib
#Hier kann z.B. das Makefile gepatcht werden (SED lässt grüssen
premk() {
sed -e "s%/usr/local%/usr%g" makefiles/makefile.linux >Makefile
mkdir -p $TMPROOT/usr/lib{,64} $TMPROOT/usr/include
cp makefiles/makefile.linux Makefile &&
SrcPatch $MAKEDIR/libmng* $LFSSOURCE/$SRCPATH/libmng-1.0.10-libdir-1.patch.*
}
mk32() {
make -j $NUMCPU \
CC="gcc $BUILDOPTIONS32 -fPIC" \
CXX="g++ $BUILDOPTIONS32 -fPIC" &&
make -j $NUMCPU prefix=$TMPROOT/usr install
make -j $NUMCPU CC="gcc ${BUILDOPTIONS32} -fPIC"
make -j $NUMCPU DESTDIR=$TMPROOT install
make clean
}
#Hier wird der Make Prozess der Sourcen definiert
mk() {
if [ "$MK64BIT" == "true" ]; then
sed -e "s%/lib%/lib64%" \
-e "s/lib64mng/libmng/g" Makefile >/tmp/Makefile~
mv /tmp/Makefile~ Makefile
fi
make -j $NUMCPU \
CC="gcc $BUILDOPTIONS -fPIC" \
CXX="g++ $BUILDOPTIONS -fPIC" \
LDFLAGS="-L/usr/lib64" &&
make -j $NUMCPU prefix=$TMPROOT/usr install
make -j $NUMCPU CC="gcc $BUILDOPTIONS -fPIC" libdir=/usr/$LIBDIR
make -j $NUMCPU libdir=/usr/$LIBDIR DESTDIR=$TMPROOT install
}
#Funktion wird nach Ablauf des Make Prozesses ausgeführt, und kann
#in $TMPROOT noch einiges korrigieren
postmk() {
echo "Nothing to do for postmk()"
install -dv -m755 $TMPROOT/usr/share/man/man{3,5} &&
install -v -m644 doc/man/*.3 $TMPROOT/usr/share/man/man3 &&
install -v -m644 doc/man/*.5 $TMPROOT/usr/share/man/man5 &&
install -dv -m755 $TMPROOT/usr/share/doc/libmng-1.0.10 &&
install -v -m644 doc/*.{png,txt} $TMPROOT/usr/share/doc/libmng-1.0.10
}

View File

@ -79,6 +79,7 @@ premk() {
mk32() {
CC="gcc $BUILDOPTIONS32" \
CXX="g++ $BUILDOPTIONS32" \
USE_ARCH=$UARCH \
./configure --host=$TARGET32 \
--prefix=/usr
make -j $NUMCPU
@ -92,6 +93,7 @@ mk() {
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
USE_ARCH=$UARCH \
./configure --host=$TARGET \
$ADDOPTIONS \
--prefix=/usr

View File

@ -82,10 +82,12 @@ premk() {
mk32() {
CC="gcc $BUILDOPTIONS32" \
CXX="g++ $BUILDOPTIONS32" \
USE_ARCH=$UARCH \
./configure --target=$TARGET32 \
--prefix=/usr
make -j $NUMCPU
make -j $NUMCPU DESTDIR=$TMPROOT install
ClearHostSysNameing32 $TMPROOT
make distclean
}
@ -95,6 +97,7 @@ mk() {
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
USE_ARCH=$UARCH \
./configure --target=$TARGET \
$ADDOPTIONS \
--prefix=/usr

View File

@ -80,6 +80,7 @@ premk() {
mk32() {
CC="gcc $BUILDOPTIONS32" \
CXX="g++ $BUILDOPTIONS32" \
USE_ARCH=$UARCH \
./configure --host=$TARGET32 \
--prefix=/usr \
--with-gnu-ld &&
@ -95,6 +96,7 @@ mk() {
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
USE_ARCH=$UARCH \
./configure --host=$TARGET32 \
$ADDOPTIONS \
--prefix=/usr \

View File

@ -78,6 +78,7 @@ premk() {
mk32() {
CC="gcc $BUILDOPTIONS32" \
CXX="g++ $BUILDOPTIONS32" \
USE_ARCH=$UARCH \
./configure --target=$TARGET32 \
--prefix=/usr
make -j $NUMCPU
@ -91,6 +92,7 @@ mk() {
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
USE_ARCH=$UARCH \
./configure --target=$TARGET \
$ADDOPTIONS \
--prefix=/usr

View File

@ -78,10 +78,12 @@ premk() {
mk32() {
CC="gcc $BUILDOPTIONS32" \
CXX="g++ $BUILDOPTIONS32" \
USE_ARCH=$UARCH \
./configure --target=$TARGET32 \
--prefix=/usr
make -j $NUMCPU
make -j $NUMCPU DESTDIR=$TMPROOT install
ClearHostSysNameing32 $TMPROOT
make distclean
}
@ -91,6 +93,7 @@ mk() {
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
USE_ARCH=$UARCH \
./configure --target=$TARGET \
$ADDOPTIONS \
--prefix=/usr

View File

@ -58,7 +58,7 @@
# 128 : Patches zu den Sourcen nicht einspielen - Module muss sich darum
# kümmern
#Module zur Erstellung des Packetes:
#Module zur Erstellung des Packetes: libsidplay
#Quelle der Source Archive: http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/linux.html
#Kurzbeschreibung: Library für sidplay und xsidplay, Programme zum Abspielen von c64 Musik
#
@ -78,6 +78,7 @@ premk() {
mk32() {
CC="gcc $BUILDOPTIONS32" \
CXX="g++ $BUILDOPTIONS32" \
USE_ARCH=$UARCH \
./configure --host=$TARGET32 \
--prefix=/usr
make -j $NUMCPU
@ -91,6 +92,7 @@ mk() {
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
USE_ARCH=$UARCH \
./configure --host=$TARGET \
$ADDOPTIONS \
--prefix=/usr

View File

@ -82,6 +82,7 @@ premk() {
mk32() {
CC="gcc $BUILDOPTIONS32" \
CXX="g++ $BUILDOPTIONS32" \
USE_ARCH=$UARCH \
./configure --host=$TARGET32 \
--prefix=/usr \
--enable-smi \
@ -98,6 +99,7 @@ mk() {
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
USE_ARCH=$UARCH \
./configure --host=$TARGET \
$ADDOPTIONS \
--prefix=/usr \

View File

@ -80,6 +80,7 @@ premk() {
mk32() {
CC="gcc $BUILDOPTIONS32" \
CXX="g++ $BUILDOPTIONS32" \
USE_ARCH=$UARCH \
./configure --host=$TARGET32 \
--prefix=/usr \
--with-gnu-ld &&
@ -97,6 +98,7 @@ mk() {
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
USE_ARCH=$UARCH \
./configure --host=$TARGET \
$ADDOPTIONS \
--prefix=/usr \

View File

@ -81,6 +81,7 @@ premk() {
mk32() {
CC="gcc $BUILDOPTIONS32" \
CXX="g++ $BUILDOPTIONS32" \
USE_ARCH=$UARCH \
./configure --host=$TARET32 \
--prefix=/usr \
--enable-shared \
@ -97,6 +98,7 @@ mk() {
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
USE_ARCH=$UARCH \
./configure --host=$TARET \
--prefix=/usr \
$ADDOPTIONS \

View File

@ -78,6 +78,19 @@ premk() {
echo "Nothing to do for premk()"
}
mk32() {
CC="gcc $BUILDOPTIONS32" \
CXX="g++ $BUILDOPTIONS32" \
./configure --target=$TARGET32 \
--prefix=/usr \
--disable-Werror \
--without-readline \
--enable-device-mapper
make -j $NUMCPU
make -j $NUMCPU DESTDIR=$TMPROOT install
make clean
}
mk() {
if [ "$MK64BIT" == "true" ]; then
ADDOPTIONS="--libdir=\${prefix}/lib64"
@ -87,6 +100,8 @@ mk() {
./configure --target=$TARGET \
$ADDOPTIONS \
--prefix=/usr \
--disable-Werror \
--without-readline \
--enable-device-mapper
make -j $NUMCPU
make -j $NUMCPU DESTDIR=$TMPROOT install

View File

@ -80,10 +80,12 @@ premk() {
mk32() {
CC="gcc $BUILDOPTIONS32" \
CXX="g++ $BUILDOPTIONS32" \
USE_ARCH=$UARCH \
./configure --host=$TARGET32 \
--prefix=/usr &&
make &&
make DESTDIR=$TMPROOT install
mv $TMPROOT/usr/bin/pcre-config{,-32}
make distclean
}
@ -94,6 +96,7 @@ mk() {
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
USE_ARCH=$UARCH \
./configure --host=$TARGET \
$ADDOPTIONS \
--prefix=/usr &&
@ -106,12 +109,21 @@ mk() {
postmk() {
mkdir -p $TMPROOT/usr/share
mv $TMPROOT/usr/man $TMPROOT/usr/share
cd $TMPROOT/usr/lib
MAJOR=`ls -l libpcre.so |awk '{ print $10 }'|awk -F"." '{ print $3 }'`
MIDDLE=`ls -l libpcre.so |awk '{ print $10 }'|awk -F"." '{ print $4 }'`
MINOR=`ls -l libpcre.so |awk '{ print $10 }'|awk -F"." '{ print $5 }'`
ln -s libpcre.so.$MAJOR.$MIDDLE.$MINOR libpcreposix.so
ln -s libpcre.so.$MAJOR.$MIDDLE.$MINOR libpcreposix.so.$MAJOR
ln -s libpcre.so.$MAJOR.$MIDDLE.$MINOR libpcreposix.so.$MAJOR.$MIDDLE
ln -s libpcre.so.$MAJOR.$MIDDLE.$MINOR libpcreposix.so.$MAJOR.$MIDDLE.$MINOR
for i in $TMPROOT/usr/lib $TMPROOT/usr/lib64; do
if [ -d $i ]; then
cd $i
MAJOR=`ls -l libpcre.so |awk '{ print $10 }'|awk -F"." '{ print $3 }'`
MIDDLE=`ls -l libpcre.so |awk '{ print $10 }'|awk -F"." '{ print $4 }'`
MINOR=`ls -l libpcre.so |awk '{ print $10 }'|awk -F"." '{ print $5 }'`
ln -s libpcre.so.$MAJOR.$MIDDLE.$MINOR libpcreposix.so
ln -s libpcre.so.$MAJOR.$MIDDLE.$MINOR libpcreposix.so.$MAJOR
ln -s libpcre.so.$MAJOR.$MIDDLE.$MINOR libpcreposix.so.$MAJOR.$MIDDLE
ln -s libpcre.so.$MAJOR.$MIDDLE.$MINOR libpcreposix.so.$MAJOR.$MIDDLE.$MINOR
cd -
fi
done
if [ "$MK64BIT" == "true" ]; then
mv $TMPROOT/usr/bin/pcre-config{,-64}
ln -s multiarch_wrapper $TMPROOT/usr/bin/pcre-config
fi
}

View File

@ -79,50 +79,67 @@ SRCPATH=Tools/lib
premk() {
mkdir -p $TMPROOT/usr/{include,lib,man,bin,share}
mkdir $TMPROOT/etc
sed -i -e "s/^INSTALLMODULE/#INSTALLMODULE/" Makefile.cfg
cp Makefile.cfg{,.orig}
}
mk32() {
# Make install Optionen eintragen
sed -e "s%^prefix.*$%prefix = /usr%" Makefile.cfg.orig >Makefile.cfg
USE_ARCH=$UARCH \
make CC="gcc $BUILDOPTIONS32" \
CXX="g++ $BUILDOPTIONS32" \
-k install
sed -e "s%TOPDIR=%TOPDIR=$TMPROOT%" Makefile.cfg | \
sed -e "s%^prefix.*$%prefix = \$\(TOPDIR\)/usr%" >Makefile.cfg.tmp
mv Makefile.cfg.tmp Makefile.cfg
install
cp Makefile.cfg.orig Makefile.cfg
sed -e "s%TOPDIR=%TOPDIR=$TMPROOT%" Makefile.cfg.orig | \
sed -e "s%^prefix.*$%prefix = \$\(TOPDIR\)/usr%" >Makefile.cfg
make -j $NUMCPU \
CC="gcc $BUILDOPTIONS32" \
CXX="g++ $BUILDOPTIONS32" \
-k install
install
CheckError "Make install process failed !" 1
mv Makefile.cfg.orig Makefile.cfg
make distclean
cp Makefile.cfg{,.orig}
}
mk() {
# Make install Optionen eintragen
sed -e "s%^prefix.*$%prefix = /usr%" Makefile.cfg.orig >Makefile.cfg
make CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
install
cp Makefile.cfg.orig Makefile.cfg
if [ "$MK64BIT" == "true" ]; then
sed -e "s%/lib$%/lib64%" Makefile.cfg >Makefile.cfg.tmp
mv Makefile.cfg.tmp Makefile.cfg
else
sed -e "s%TOPDIR=%TOPDIR=$TMPROOT%" Makefile.cfg | \
sed -e "s%^prefix.*$%prefix = \$\(TOPDIR\)/usr%" >Makefile.cfg.tmp
mv Makefile.cfg.tmp Makefile.cfg
sed -i -e "s%/lib$%/lib64%" Makefile.cfg
fi
sed -i -e "s%TOPDIR=%TOPDIR=$TMPROOT%" Makefile.cfg
sed -i -e "s%^prefix.*$%prefix = \$\(TOPDIR\)/usr%" Makefile.cfg
USE_ARCH=$UARCH \
make -j $NUMCPU \
-k \
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
install
make -j $NUMCPU CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
demoprogs
find demos -perm +100 -exec cp {} $TMPROOT/usr/bin \;
CheckError "Make install process failed !" 1
}
postmk() {
mv /etc/vga $TMPROOT/etc/
mv /usr/include/vga* $TMPROOT/usr/include
mv /usr/lib/libvga* $TMPROOT/usr/lib
mv $TMPROOT/usr/man $TMPROOT/usr/share
if [ ! -d $TMPROOT/usr/share/man ]; then
mkdir -p $TMPROOT/usr/share/man
fi
tar -C $TMPROOT/usr/man -cf - .|tar -C $TMPROOT/usr/share/man -xvf -
rm -r $TMPROOT/usr/man
CheckError "postmk() failed !" 1
cd /usr/bin
rm cc
ln gcc cc
cd -
if [ ! -d $TMPROOT/lib/modules ]; then
mkdir -p $TMPROOT/lib/modules
fi
tar -C kernel -cf - svgalib_helper|tar -C $TMPROOT/lib/modules -xvf -
}

View File

@ -80,12 +80,14 @@ premk() {
mk32() {
CC="gcc $BUILDOPTIONS32" \
CXX="g++ $BUILDOPTIONS32" \
USE_ARCH=$UARCH \
./configure --target=$TARGET32 \
--prefix=/usr
make -j $NUMCPU
make -j $NUMCPU DESTDIR=$TMPROOT install
make distclean
ClearHostSysNameing32 $TMPROOT
mv $TMPROOT/usr/bin/taglib-config{,-32}
}
mk() {
@ -94,6 +96,7 @@ mk() {
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
USE_ARCH=$UARCH \
./configure --target=$TARGET \
$ADDOPTIONS \
--prefix=/usr
@ -103,4 +106,8 @@ mk() {
postmk() {
ClearHostSysNameing $TMPROOT
if [ "$MK64BIT" == "true" ]; then
mv $TMPROOT/usr/bin/taglib-config{,-64}
ln -s multiarch_wrapper $TMPROOT/usr/bin/taglib-config
fi
}