CompuExtreme/ViitorMake
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Anpassungen an V963, Einarbeitung der neuesten CLFS Version,

Browse Source 
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:
kueller 2011-03-03 16:57:37 +00:00
parent c1595e42de
commit 4acf3a26af
7 changed files with 39 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
BaseBuild/Basesys/dbus
View File

@ -77,17 +77,17 @@ SRCPATH=Base/System
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
cd ../Build-dbus
}
mk32() {
CC="gcc ${BUILDOPTIONS32}" USE_ARCH=$UARCH \
LDFLAGS="-L/usr/X11R7/lib" \
CC="gcc ${BUILDOPTIONS32}" \
USE_ARCH=32 \
../dbus*/configure --prefix=/usr \
--sysconfdir=/etc \
--libdir=/lib \
--sysconfdir=/etc/sysconfig \
--libexecdir=/usr/lib/dbus-1.0 \
--localstatedir=/var &&
make -j $NUMCPU &&
@ -100,18 +100,19 @@ mk32() {
}
mk() {
if [ "$MK64BIT" == "true" ]; then
ADDOPTIONS="--libdir=\${prefix}/lib64"
fi
CC="gcc $BUILDOPTIONS" USE_ARCH=$UARCH \
CC="gcc $BUILDOPTIONS" \
USE_ARCH=$UARCH \
../dbus*/configure --prefix=/usr \
--libdir=/$LIBDIR \
--sysconfdir=/etc/sysconfig \
--sysconfdir=/etc \
--libexecdir=/usr/$LIBDIR/dbus-1.0 \
--localstatedir=/var &&
make -j $NUMCPU &&
make -j $NUMCPU 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() {
@ -126,16 +127,16 @@ postmk() {
mkdir -p $TMPROOT/usr/lib
fi
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.0 $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
ln -s /lib/libdbus-1.so.3.5.4 $TMPROOT/usr/lib/libdbus-1.so.3
ln -s /lib/libdbus-1.so.3.5.4 $TMPROOT/usr/lib/libdbus-1.so.3.5.4
if [ "$MK64BIT" == "true" ]; then
if [ ! -d $TMPROOT/usr/lib64 ]; then
mkdir -p $TMPROOT/usr/lib64
fi
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.0 $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
ln -s /lib64/libdbus-1.so.3.5.4 $TMPROOT/usr/lib64/libdbus-1.so.3
ln -s /lib64/libdbus-1.so.3.5.4 $TMPROOT/usr/lib64/libdbus-1.so.3.5.4
fi
}

5
BaseBuild/Basesys/libnih
View File

@ -91,14 +91,11 @@ mk32() {
}
mk() {
if [ "$MK64BIT" == "true" ]; then
ADDOPTIONS="--libdir=\${prefix}/lib64"
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
USE_ARCH=$UARCH \
LDFLAGS="-L/$LIBDIR" \
./configure $ADDOPTIONS \
./configure --libdir=\${prefix}/${LIBDIR} \
--prefix=/ \
--sharedstatedir=/usr/share \
--includedir=/usr/include \

10
BaseBuild/Basesys/libxml2
View File

@ -90,21 +90,18 @@ mk32() {
make -j $NUMCPU &&
make -j $NUMCPU DESTDIR=$TMPROOT install
mv -v $TMPROOT/usr/bin/xml2-config{,-32}
mv $TMPROOT/usr/bin/xmlcatalog{,.32}
make distclean
}
#Hier wird der Make Prozess der Sourcen definiert
mk() {
if [ "$MK64BIT" == "true" ]; then
ADDOPTIONS="--libdir=/usr/lib64"
mv $TMPROOT/usr/bin/xmlcatalog{,.32}
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
USE_ARCH=$UARCH \
./configure --target=$TARGET \
--prefix=/usr \
$ADDOPTIONS &&
--libdir=/usr/${LIBDIR} &&
make -j $NUMCPU &&
make -j $NUMCPU DESTDIR=$TMPROOT install
if [ "$MK64BIT" == "true" ]; then
@ -120,4 +117,7 @@ postmk() {
mv $TMPROOT/usr/man $TMPROOT/usr/share
cd $TMPROOT/usr/include
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
}

2
BaseBuild/Basesys/pkgconfig
View File

@ -110,6 +110,6 @@ postmk() {
mv $TMPROOT/usr/man $TMPROOT/usr/share/man
ln -s pkg-config $TMPROOT/usr/bin/pkgconfig
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
}

3
BaseBuild/Basesys/tar
View File

@ -73,10 +73,11 @@ SRCPATH=Base/Utilities
#(( MKPKG = $MKPKG | 16 ))
premk() {
echo "Nothin to do for premk"
echo "Nothing to do for premk()"
}
mk() {
FORCE_UNSAFE_CONFIGURE=1 \
CC="gcc ${BUILDOPTIONS}" \
./configure --prefix=/usr \
--bindir=/bin \

5
BaseBuild/Basesys/texinfo
View File

@ -80,11 +80,10 @@ mk() {
}
postmk() {
for k in $TMPROOT/usr/share/info /usr/share/info; do
cd $k
pushd $TMPROOT/usr/share/info
rm dir
for f in *; do
install-info $f dir 2>/dev/null
done
done
popd
}

16
BaseBuild/Basesys/udev
View File

@ -78,10 +78,14 @@ premk() {
mk32() {
CC="gcc ${BUILDOPTIONS32}" \
CXX="g++ ${BUILDOPTIONS32}" \
USE_ARCH=32 \
./configure --prefix=/usr \
--exec-prefix= \
--exec-prefix="" \
--sysconfdir=/etc \
--with-libdir-name=lib
--libexecdir=/lib/udev \
--libdir=/usr/lib \
--disable-extras \
--disable-introspection
make -j $NUMCPU
make DESTDIR=$TMPROOT install
make clean
@ -91,11 +95,15 @@ mk() {
CC="gcc ${BUILDOPTIONS}" \
CXX="g++ ${BUILDOPTIONS}" \
./configure --prefix=/usr \
--exec_prefix= \
--exec_prefix="" \
--sysconfdir=/etc \
--with-libdir-name=$LIBDIR
--libexecdir=/lib/udev \
--libdir=/usr/${LIBDIR} \
--disable-extras \
--disable-introspection
make -j $NUMCPU
make DESTDIR=$TMPROOT install
install -dv $TMPROOT/lib/firmware
}
postmk() {