Anpassungen an V963, Einarbeitung der neuesten CLFS Version,
Update für pkgconfig git-svn-id: svn://svn.compuextreme.de/Viitor/V963/ViitorMake@6022 504e572c-2e33-0410-9681-be2bf7408885
This commit is contained in:
parent
c1595e42de
commit
4acf3a26af
@ -77,17 +77,17 @@ SRCPATH=Base/System
|
|||||||
|
|
||||||
|
|
||||||
premk() {
|
premk() {
|
||||||
sed -i "1i\#include <syslog.h>" dbus/dbus-sysdeps-util-unix.c &&
|
# sed -i "1i\#include <syslog.h>" dbus/dbus-sysdeps-util-unix.c &&
|
||||||
mkdir ../Build-dbus
|
mkdir ../Build-dbus
|
||||||
cd ../Build-dbus
|
cd ../Build-dbus
|
||||||
}
|
}
|
||||||
|
|
||||||
mk32() {
|
mk32() {
|
||||||
CC="gcc ${BUILDOPTIONS32}" USE_ARCH=$UARCH \
|
CC="gcc ${BUILDOPTIONS32}" \
|
||||||
LDFLAGS="-L/usr/X11R7/lib" \
|
USE_ARCH=32 \
|
||||||
../dbus*/configure --prefix=/usr \
|
../dbus*/configure --prefix=/usr \
|
||||||
|
--sysconfdir=/etc \
|
||||||
--libdir=/lib \
|
--libdir=/lib \
|
||||||
--sysconfdir=/etc/sysconfig \
|
|
||||||
--libexecdir=/usr/lib/dbus-1.0 \
|
--libexecdir=/usr/lib/dbus-1.0 \
|
||||||
--localstatedir=/var &&
|
--localstatedir=/var &&
|
||||||
make -j $NUMCPU &&
|
make -j $NUMCPU &&
|
||||||
@ -100,18 +100,19 @@ mk32() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
mk() {
|
mk() {
|
||||||
if [ "$MK64BIT" == "true" ]; then
|
CC="gcc $BUILDOPTIONS" \
|
||||||
ADDOPTIONS="--libdir=\${prefix}/lib64"
|
USE_ARCH=$UARCH \
|
||||||
fi
|
|
||||||
CC="gcc $BUILDOPTIONS" USE_ARCH=$UARCH \
|
|
||||||
../dbus*/configure --prefix=/usr \
|
../dbus*/configure --prefix=/usr \
|
||||||
--libdir=/$LIBDIR \
|
--libdir=/$LIBDIR \
|
||||||
--sysconfdir=/etc/sysconfig \
|
--sysconfdir=/etc \
|
||||||
--libexecdir=/usr/$LIBDIR/dbus-1.0 \
|
--libexecdir=/usr/$LIBDIR/dbus-1.0 \
|
||||||
--localstatedir=/var &&
|
--localstatedir=/var &&
|
||||||
make -j $NUMCPU &&
|
make -j $NUMCPU &&
|
||||||
make -j $NUMCPU install &&
|
make -j $NUMCPU install &&
|
||||||
make -j $NUMCPU DESTDIR=$TMPROOT install
|
make -j $NUMCPU DESTDIR=$TMPROOT install
|
||||||
|
install -v -m755 -d $TMPROOT/usr/share/doc/dbus-1.4.6
|
||||||
|
install -v -m644 doc/{TODO,*,{dtd,xml,xsl,txt,c}} \
|
||||||
|
/usr/share/doc/dbus-1.4.6
|
||||||
}
|
}
|
||||||
|
|
||||||
postmk() {
|
postmk() {
|
||||||
@ -126,16 +127,16 @@ postmk() {
|
|||||||
mkdir -p $TMPROOT/usr/lib
|
mkdir -p $TMPROOT/usr/lib
|
||||||
fi
|
fi
|
||||||
mv $TMPROOT/lib/pkgconfig $TMPROOT/usr/lib
|
mv $TMPROOT/lib/pkgconfig $TMPROOT/usr/lib
|
||||||
ln -s /lib/libdbus-1.so.3.5.0 $TMPROOT/usr/lib/libdbus-1.so
|
ln -s /lib/libdbus-1.so.3.5.4 $TMPROOT/usr/lib/libdbus-1.so
|
||||||
ln -s /lib/libdbus-1.so.3.5.0 $TMPROOT/usr/lib/libdbus-1.so.3
|
ln -s /lib/libdbus-1.so.3.5.4 $TMPROOT/usr/lib/libdbus-1.so.3
|
||||||
ln -s /lib/libdbus-1.so.3.5.0 $TMPROOT/usr/lib/libdbus-1.so.3.5.0
|
ln -s /lib/libdbus-1.so.3.5.4 $TMPROOT/usr/lib/libdbus-1.so.3.5.4
|
||||||
if [ "$MK64BIT" == "true" ]; then
|
if [ "$MK64BIT" == "true" ]; then
|
||||||
if [ ! -d $TMPROOT/usr/lib64 ]; then
|
if [ ! -d $TMPROOT/usr/lib64 ]; then
|
||||||
mkdir -p $TMPROOT/usr/lib64
|
mkdir -p $TMPROOT/usr/lib64
|
||||||
fi
|
fi
|
||||||
mv $TMPROOT/lib64/pkgconfig $TMPROOT/usr/lib64
|
mv $TMPROOT/lib64/pkgconfig $TMPROOT/usr/lib64
|
||||||
ln -s /lib64/libdbus-1.so.3.5.0 $TMPROOT/usr/lib64/libdbus-1.so
|
ln -s /lib64/libdbus-1.so.3.5.4 $TMPROOT/usr/lib64/libdbus-1.so
|
||||||
ln -s /lib64/libdbus-1.so.3.5.0 $TMPROOT/usr/lib64/libdbus-1.so.3
|
ln -s /lib64/libdbus-1.so.3.5.4 $TMPROOT/usr/lib64/libdbus-1.so.3
|
||||||
ln -s /lib64/libdbus-1.so.3.5.0 $TMPROOT/usr/lib64/libdbus-1.so.3.5.0
|
ln -s /lib64/libdbus-1.so.3.5.4 $TMPROOT/usr/lib64/libdbus-1.so.3.5.4
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
@ -91,14 +91,11 @@ mk32() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
mk() {
|
mk() {
|
||||||
if [ "$MK64BIT" == "true" ]; then
|
|
||||||
ADDOPTIONS="--libdir=\${prefix}/lib64"
|
|
||||||
fi
|
|
||||||
CC="gcc $BUILDOPTIONS" \
|
CC="gcc $BUILDOPTIONS" \
|
||||||
CXX="g++ $BUILDOPTIONS" \
|
CXX="g++ $BUILDOPTIONS" \
|
||||||
USE_ARCH=$UARCH \
|
USE_ARCH=$UARCH \
|
||||||
LDFLAGS="-L/$LIBDIR" \
|
LDFLAGS="-L/$LIBDIR" \
|
||||||
./configure $ADDOPTIONS \
|
./configure --libdir=\${prefix}/${LIBDIR} \
|
||||||
--prefix=/ \
|
--prefix=/ \
|
||||||
--sharedstatedir=/usr/share \
|
--sharedstatedir=/usr/share \
|
||||||
--includedir=/usr/include \
|
--includedir=/usr/include \
|
||||||
|
@ -90,21 +90,18 @@ mk32() {
|
|||||||
make -j $NUMCPU &&
|
make -j $NUMCPU &&
|
||||||
make -j $NUMCPU DESTDIR=$TMPROOT install
|
make -j $NUMCPU DESTDIR=$TMPROOT install
|
||||||
mv -v $TMPROOT/usr/bin/xml2-config{,-32}
|
mv -v $TMPROOT/usr/bin/xml2-config{,-32}
|
||||||
|
mv $TMPROOT/usr/bin/xmlcatalog{,.32}
|
||||||
make distclean
|
make distclean
|
||||||
}
|
}
|
||||||
|
|
||||||
#Hier wird der Make Prozess der Sourcen definiert
|
#Hier wird der Make Prozess der Sourcen definiert
|
||||||
mk() {
|
mk() {
|
||||||
if [ "$MK64BIT" == "true" ]; then
|
|
||||||
ADDOPTIONS="--libdir=/usr/lib64"
|
|
||||||
mv $TMPROOT/usr/bin/xmlcatalog{,.32}
|
|
||||||
fi
|
|
||||||
CC="gcc $BUILDOPTIONS" \
|
CC="gcc $BUILDOPTIONS" \
|
||||||
CXX="g++ $BUILDOPTIONS" \
|
CXX="g++ $BUILDOPTIONS" \
|
||||||
USE_ARCH=$UARCH \
|
USE_ARCH=$UARCH \
|
||||||
./configure --target=$TARGET \
|
./configure --target=$TARGET \
|
||||||
--prefix=/usr \
|
--prefix=/usr \
|
||||||
$ADDOPTIONS &&
|
--libdir=/usr/${LIBDIR} &&
|
||||||
make -j $NUMCPU &&
|
make -j $NUMCPU &&
|
||||||
make -j $NUMCPU DESTDIR=$TMPROOT install
|
make -j $NUMCPU DESTDIR=$TMPROOT install
|
||||||
if [ "$MK64BIT" == "true" ]; then
|
if [ "$MK64BIT" == "true" ]; then
|
||||||
@ -120,4 +117,7 @@ postmk() {
|
|||||||
mv $TMPROOT/usr/man $TMPROOT/usr/share
|
mv $TMPROOT/usr/man $TMPROOT/usr/share
|
||||||
cd $TMPROOT/usr/include
|
cd $TMPROOT/usr/include
|
||||||
ln -s libxml2/libxml libxml
|
ln -s libxml2/libxml libxml
|
||||||
|
if [ -f $TMPROOT/usr/bin/xmlcatalog.32 ]; then
|
||||||
|
mv -v $TMPROOT/usr/bin/xmlcatalog.32 $TMPROOT/usr/bin/xmlcatalog
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
@ -110,6 +110,6 @@ postmk() {
|
|||||||
mv $TMPROOT/usr/man $TMPROOT/usr/share/man
|
mv $TMPROOT/usr/man $TMPROOT/usr/share/man
|
||||||
ln -s pkg-config $TMPROOT/usr/bin/pkgconfig
|
ln -s pkg-config $TMPROOT/usr/bin/pkgconfig
|
||||||
if [ ! -d /var/install/pkgconfig* ]; then
|
if [ ! -d /var/install/pkgconfig* ]; then
|
||||||
echo "export PKG_CONFIG_PATH=\"/usr/${LIBDIR}/pkgconfig\"" >>/root/.bash_profile
|
echo "export PKG_CONFIG_PATH=\"/usr/lib/pkgconfig\"" >>/root/.bash_profile
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
@ -73,10 +73,11 @@ SRCPATH=Base/Utilities
|
|||||||
#(( MKPKG = $MKPKG | 16 ))
|
#(( MKPKG = $MKPKG | 16 ))
|
||||||
|
|
||||||
premk() {
|
premk() {
|
||||||
echo "Nothin to do for premk"
|
echo "Nothing to do for premk()"
|
||||||
}
|
}
|
||||||
|
|
||||||
mk() {
|
mk() {
|
||||||
|
FORCE_UNSAFE_CONFIGURE=1 \
|
||||||
CC="gcc ${BUILDOPTIONS}" \
|
CC="gcc ${BUILDOPTIONS}" \
|
||||||
./configure --prefix=/usr \
|
./configure --prefix=/usr \
|
||||||
--bindir=/bin \
|
--bindir=/bin \
|
||||||
|
@ -80,11 +80,10 @@ mk() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
postmk() {
|
postmk() {
|
||||||
for k in $TMPROOT/usr/share/info /usr/share/info; do
|
pushd $TMPROOT/usr/share/info
|
||||||
cd $k
|
|
||||||
rm dir
|
rm dir
|
||||||
for f in *; do
|
for f in *; do
|
||||||
install-info $f dir 2>/dev/null
|
install-info $f dir 2>/dev/null
|
||||||
done
|
done
|
||||||
done
|
popd
|
||||||
}
|
}
|
||||||
|
@ -78,10 +78,14 @@ premk() {
|
|||||||
mk32() {
|
mk32() {
|
||||||
CC="gcc ${BUILDOPTIONS32}" \
|
CC="gcc ${BUILDOPTIONS32}" \
|
||||||
CXX="g++ ${BUILDOPTIONS32}" \
|
CXX="g++ ${BUILDOPTIONS32}" \
|
||||||
|
USE_ARCH=32 \
|
||||||
./configure --prefix=/usr \
|
./configure --prefix=/usr \
|
||||||
--exec-prefix= \
|
--exec-prefix="" \
|
||||||
--sysconfdir=/etc \
|
--sysconfdir=/etc \
|
||||||
--with-libdir-name=lib
|
--libexecdir=/lib/udev \
|
||||||
|
--libdir=/usr/lib \
|
||||||
|
--disable-extras \
|
||||||
|
--disable-introspection
|
||||||
make -j $NUMCPU
|
make -j $NUMCPU
|
||||||
make DESTDIR=$TMPROOT install
|
make DESTDIR=$TMPROOT install
|
||||||
make clean
|
make clean
|
||||||
@ -91,11 +95,15 @@ mk() {
|
|||||||
CC="gcc ${BUILDOPTIONS}" \
|
CC="gcc ${BUILDOPTIONS}" \
|
||||||
CXX="g++ ${BUILDOPTIONS}" \
|
CXX="g++ ${BUILDOPTIONS}" \
|
||||||
./configure --prefix=/usr \
|
./configure --prefix=/usr \
|
||||||
--exec_prefix= \
|
--exec_prefix="" \
|
||||||
--sysconfdir=/etc \
|
--sysconfdir=/etc \
|
||||||
--with-libdir-name=$LIBDIR
|
--libexecdir=/lib/udev \
|
||||||
|
--libdir=/usr/${LIBDIR} \
|
||||||
|
--disable-extras \
|
||||||
|
--disable-introspection
|
||||||
make -j $NUMCPU
|
make -j $NUMCPU
|
||||||
make DESTDIR=$TMPROOT install
|
make DESTDIR=$TMPROOT install
|
||||||
|
install -dv $TMPROOT/lib/firmware
|
||||||
}
|
}
|
||||||
|
|
||||||
postmk() {
|
postmk() {
|
||||||
|
Loading…
Reference in New Issue
Block a user