Anpassung an neue Version
git-svn-id: svn://svn.compuextreme.de/Viitor/V963/ViitorMake@6152 504e572c-2e33-0410-9681-be2bf7408885
This commit is contained in:
parent
fad1e2c59f
commit
c05de0c06c
@ -92,6 +92,7 @@ mk() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
postmk() {
|
postmk() {
|
||||||
|
ClearHostSysNameing $TMPROOT
|
||||||
rm /lib/cpp
|
rm /lib/cpp
|
||||||
mkdir -p $TMPROOT/usr/doc/swftools
|
mkdir -p $TMPROOT/usr/doc/swftools
|
||||||
cp doc/* $TMPROOT/usr/doc/swftools
|
cp doc/* $TMPROOT/usr/doc/swftools
|
||||||
|
@ -56,10 +56,10 @@
|
|||||||
# frisch installierten Packet verwendet (wie z.B. postgresql)
|
# frisch installierten Packet verwendet (wie z.B. postgresql)
|
||||||
# 64 : sourcetree aufräumen nach packeterstellung unterbinden.
|
# 64 : sourcetree aufräumen nach packeterstellung unterbinden.
|
||||||
#
|
#
|
||||||
#Module zur Erstellung des Packetes: kdelibs-experimental
|
#Module zur Erstellung des Packetes: kuickshow
|
||||||
#Quelle der Source Archive: www.kde.org
|
#Quelle der Source Archive: www.kde.org
|
||||||
#Kurzbeschreibung:
|
#Kurzbeschreibung:
|
||||||
#Support Library für das Kommon Desktop Environment (KDE)
|
#Bild Betrachter fuer den KDE
|
||||||
#
|
#
|
||||||
#Letzte Änderung von: $Author$
|
#Letzte Änderung von: $Author$
|
||||||
#Datum der letzten Änderung: $Date: 2010-01-10 17:32:14 +0100 (So, 10. Jan 2010) $
|
#Datum der letzten Änderung: $Date: 2010-01-10 17:32:14 +0100 (So, 10. Jan 2010) $
|
||||||
@ -96,6 +96,7 @@ mk32() {
|
|||||||
-DOPENGL_gl_LIBRARY=/usr/X11R7/lib \
|
-DOPENGL_gl_LIBRARY=/usr/X11R7/lib \
|
||||||
-DOPENGL_glu_LIBRARY=/usr/X11R7/lib \
|
-DOPENGL_glu_LIBRARY=/usr/X11R7/lib \
|
||||||
-DOPENGL_xmesa_INCLUDE_DIR=/usr/X11R7/include/GL \
|
-DOPENGL_xmesa_INCLUDE_DIR=/usr/X11R7/include/GL \
|
||||||
|
-DCMAKE_SKIP_RPATH:BOOL=YES \
|
||||||
-DLIB_SUFFIX= \
|
-DLIB_SUFFIX= \
|
||||||
.. &&
|
.. &&
|
||||||
sed -i "s/\(CXX_FLAGS =.*$\)/\1 -I\/usr\/X11R7\/include/" \
|
sed -i "s/\(CXX_FLAGS =.*$\)/\1 -I\/usr\/X11R7\/include/" \
|
||||||
|
@ -79,14 +79,11 @@ premk() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
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 -L/usr/$LIBDIR -L/usr/X11R7/$LIBDIR" \
|
LDFLAGS="-L/$LIBDIR -L/usr/$LIBDIR -L/usr/X11R7/$LIBDIR" \
|
||||||
./configure $ADDOPTIONS \
|
./configure --libdir=\${prefix}/${LIBDIR} \
|
||||||
--prefix=/usr \
|
--prefix=/usr \
|
||||||
--enable-lzo \
|
--enable-lzo \
|
||||||
--with-lzo-includes=/usr/include/lzo \
|
--with-lzo-includes=/usr/include/lzo \
|
||||||
@ -102,9 +99,8 @@ mk() {
|
|||||||
--enable-vorbis \
|
--enable-vorbis \
|
||||||
--enable-libdv \
|
--enable-libdv \
|
||||||
--enable-libxml2
|
--enable-libxml2
|
||||||
sed -i "s%\(/lib\)\([/ ]\)%\164\2/g" libtool
|
make -j $NUMCPU &&
|
||||||
make &&
|
make DESTDIR=$TMPROOT install
|
||||||
make prefix=$TMPROOT/usr install
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#Funktion wird nach Ablauf des Make Prozesses ausgeführt, und kann
|
#Funktion wird nach Ablauf des Make Prozesses ausgeführt, und kann
|
||||||
|
@ -72,17 +72,6 @@
|
|||||||
SRCPATH=Network/Servers
|
SRCPATH=Network/Servers
|
||||||
|
|
||||||
premk() {
|
premk() {
|
||||||
# acl.h stored in xfs for Viitor
|
|
||||||
#mv src/filed/acl.c src/filed/acl.c.orig
|
|
||||||
#sed -e "s/sys\/acl.h/xfs\/sys\/acl.h/g" src/filed/acl.c.orig >src/filed/acl.c
|
|
||||||
|
|
||||||
# Linkbug in wx-config
|
|
||||||
#/bin/ls -l /usr/X11R7/bin/wx-config | grep -q tmpinstsys
|
|
||||||
#if [ $? -eq 0 ]; then
|
|
||||||
# LINKDEST=`/bin/ls -l /usr/X11R7/bin/wx-config | awk '{ print $10; }' | sed -e "s/\/usr\/tmpinstsys\/.*\/usr/\/usr/g"`
|
|
||||||
# rm /usr/X11R7/bin/wx-config
|
|
||||||
# ln -s $LINKDEST /usr/X11R7/bin/wx-config
|
|
||||||
#fi
|
|
||||||
if ! getent group bacula; then
|
if ! getent group bacula; then
|
||||||
groupadd -g 26 bacula
|
groupadd -g 26 bacula
|
||||||
BACULAGROUP=true
|
BACULAGROUP=true
|
||||||
@ -94,17 +83,13 @@ premk() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
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 \
|
||||||
./configure $ADDOPTIONS \
|
./configure --libdir=\${prefix}/${LIBDIR} \
|
||||||
--with-x \
|
--with-x \
|
||||||
--x-includes=/usr/X11R7/include \
|
--x-includes=/usr/X11R7/include \
|
||||||
--x-libraries=/usr/X11R7/$LIBDIR \
|
--x-libraries=/usr/X11R7/$LIBDIR \
|
||||||
--enable-gnome \
|
|
||||||
--enable-wx-console \
|
--enable-wx-console \
|
||||||
--enable-tray-monitor \
|
--enable-tray-monitor \
|
||||||
--with-openssl \
|
--with-openssl \
|
||||||
|
Loading…
Reference in New Issue
Block a user