Anpassungen an neue Version
git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@4691 504e572c-2e33-0410-9681-be2bf7408885
This commit is contained in:
parent
291e32d7f2
commit
e55d1f5d1f
@ -1,57 +1,52 @@
|
||||
#0 tools/pkgconfig
|
||||
#0 tools/libusb
|
||||
#0 tools/expat
|
||||
#0 tools/libpng
|
||||
#1 tools/libxml2
|
||||
#0 tools/libxslt
|
||||
#0 tools/libsigc++
|
||||
#0 tools/parted
|
||||
#0 tools/libmad
|
||||
#0 tools/libid3tag
|
||||
#0 tools/taglib
|
||||
#0 tools/fam
|
||||
#0 tools/libnet
|
||||
#0 tools/svgalib
|
||||
#0 tools/openssl
|
||||
#0 tools/pcre
|
||||
#0 tools/alsa-lib
|
||||
#1 tools/bluez-libs
|
||||
#0 tools/libsidplay
|
||||
#0 tools/libraw1394
|
||||
#0 tools/libavc1394
|
||||
#0 tools/libiec61883
|
||||
#0 tools/libsamplerate
|
||||
#0 tools/libao
|
||||
#0 tools/libogg
|
||||
#0 tools/libvorbis
|
||||
#0 tools/libiconv
|
||||
#0 tools/id3lib
|
||||
#0 tools/libidn
|
||||
#0 tools/libgpg-error
|
||||
#0 tools/libgcrypt
|
||||
#0 tools/libsmi
|
||||
#0 tools/lzo
|
||||
#0 tools/libghttp
|
||||
#0 tools/jpegsrc
|
||||
#0 tools/lcms
|
||||
#0 tools/libmng
|
||||
#0 tools/glib-2
|
||||
#0 tools/libIDL
|
||||
#0 xsys/libmpeg3
|
||||
#0 tools/libfame
|
||||
0 tools/libquicktime
|
||||
0 tools/pkgconfig
|
||||
0 tools/libusb
|
||||
0 tools/expat
|
||||
0 tools/libpng
|
||||
1 tools/libxml2
|
||||
0 tools/libxslt
|
||||
0 tools/libsigc++
|
||||
0 tools/parted
|
||||
0 tools/libmad
|
||||
0 tools/libid3tag
|
||||
0 tools/taglib
|
||||
0 tools/fam
|
||||
0 tools/libnet
|
||||
0 tools/svgalib
|
||||
0 tools/openssl
|
||||
0 tools/pcre
|
||||
0 tools/alsa-lib
|
||||
1 tools/bluez-libs
|
||||
0 tools/libsidplay
|
||||
0 tools/libraw1394
|
||||
0 tools/libavc1394
|
||||
0 tools/libiec61883
|
||||
0 tools/libsamplerate
|
||||
0 tools/libao
|
||||
0 tools/libogg
|
||||
0 tools/libvorbis
|
||||
0 tools/libiconv
|
||||
0 tools/id3lib
|
||||
0 tools/libidn
|
||||
0 tools/libgpg-error
|
||||
0 tools/libgcrypt
|
||||
0 tools/libsmi
|
||||
0 tools/lzo
|
||||
0 tools/libghttp
|
||||
0 tools/jpegsrc
|
||||
0 tools/lcms
|
||||
0 tools/libmng
|
||||
0 tools/glib-2
|
||||
0 tools/libIDL
|
||||
0 xsys/libmpeg3
|
||||
0 tools/libfame
|
||||
0 tools/libdvdcss
|
||||
0 xsys/dbus-glib
|
||||
0 tools/libcdio
|
||||
0 xsys/dist99
|
||||
0 xsys/pdflib
|
||||
0 tools/libart_lgpl
|
||||
0 tools/libsoup
|
||||
0 xsys/libcroco
|
||||
0 tools/libexif
|
||||
0 tools/libdvdread
|
||||
0 xsys/liboil
|
||||
0 xsys/boost
|
||||
#brauch cmake damits lefft
|
||||
#0 tools/libmusicbrainz
|
||||
#Keine Abhängigkeiten finden können
|
||||
@ -63,3 +58,8 @@
|
||||
#0 xsys/libmcal
|
||||
#wird vorraussichtlich durch Libquicktime ersetzt
|
||||
#0 tools/openquicktime
|
||||
#Braucht natuerlich dbus damits lefft
|
||||
#0 xsys/dbus-glib
|
||||
#Braucht php,python usw...
|
||||
#0 xsys/pdflib
|
||||
#0 xsys/boost
|
||||
|
@ -1,4 +1,5 @@
|
||||
|
||||
libsoup
|
||||
ORBit2
|
||||
GNOME Doc-Utils
|
||||
shared-MIME-Info
|
||||
|
@ -998,7 +998,7 @@
|
||||
0 tools/lame
|
||||
0 tools/toolame
|
||||
0 tools/libfame
|
||||
0 tools/openquicktime
|
||||
0 xsys/libquicktime
|
||||
0 xsys/libdv
|
||||
0 tools/cdrdao
|
||||
0 xsys/libungif
|
||||
|
@ -84,7 +84,7 @@ mk32() {
|
||||
./configure --target=$TARGET32 \
|
||||
--host=$TARGET32 \
|
||||
--build=$TARGET32 \
|
||||
--prefix=/usr/X11R7 \
|
||||
--prefix=/usr \
|
||||
--with-libiconv=gnu \
|
||||
--with-gnu-ld &&
|
||||
make -j $NUMCPU &&
|
||||
@ -95,13 +95,13 @@ mk32() {
|
||||
#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" \
|
||||
USE_ARCH=$UARCH \
|
||||
./configure --target=$TARGET \
|
||||
--prefix=/usr/X11R7 \
|
||||
--prefix=/usr \
|
||||
$ADDOPTIONS \
|
||||
--with-libiconv=gnu \
|
||||
--with-gnu-ld &&
|
||||
@ -112,5 +112,14 @@ mk() {
|
||||
#Funktion wird nach Ablauf des Make Prozesses ausgeführt, und kann
|
||||
#in $TMPROOT noch einiges korrigieren
|
||||
postmk() {
|
||||
echo "Nothing to do for postmk()"
|
||||
cd $TMPROOT/usr/include
|
||||
ln -s glib-2.0/* .
|
||||
ln -s ../lib/glib-2.0/include/glibconfig.h .
|
||||
cd -
|
||||
LIBNAME=`find $TMPROOT/usr/lib/libglib*.so.* -perm +100 ! -type l`
|
||||
LIBNAME=`basename $LIBNAME`
|
||||
ln -s $LIBNAME $TMPROOT/usr/lib/libglib.so
|
||||
if [ "$MK64BIT" == "true" ]; then
|
||||
ln -s $LIBNAME $TMPROOT/usr/lib64/libglib.so
|
||||
fi
|
||||
}
|
||||
|
@ -85,11 +85,13 @@ premk() {
|
||||
mk32() {
|
||||
CC="gcc $BUILDOPTIONS32" \
|
||||
CXX="g++ $BUILDOPTIONS32" \
|
||||
USE_ARCH=$UARCH \
|
||||
./configure --target=$TARGET32 \
|
||||
--prefix=/opt/gnome &&
|
||||
--prefix=/usr &&
|
||||
make -j $NUMCPU &&
|
||||
make -j $NUMCPU DESTDIR=$TMPROOT install &&
|
||||
CheckError "Make install process failed !" 1
|
||||
mv $TMPROOT/usr/bin/libart2-config{,-32}
|
||||
make distclean
|
||||
}
|
||||
|
||||
@ -99,14 +101,18 @@ mk() {
|
||||
fi
|
||||
CC="gcc $BUILDOPTIONS" \
|
||||
CXX="g++ $BUILDOPTIONS" \
|
||||
USE_ARCH=$UARCH \
|
||||
./configure --target=$TARGET \
|
||||
$ADDOPTIONS \
|
||||
--prefix=/opt/gnome &&
|
||||
--prefix=/usr &&
|
||||
make -j $NUMCPU &&
|
||||
make -j $NUMCPU DESTDIR=$TMPROOT install &&
|
||||
CheckError "Make install process failed !" 1
|
||||
}
|
||||
|
||||
postmk() {
|
||||
echo "Nothing to do for postmk()"
|
||||
if [ "$MK64BIT" == "true" ]; then
|
||||
mv $TMPROOT/usr/bin/libart2-config{,-64}
|
||||
ln -s multiarch_wrapper $TMPROOT/usr/bin/libart2-config
|
||||
fi
|
||||
}
|
||||
|
@ -84,6 +84,7 @@ premk() {
|
||||
mk32() {
|
||||
CC="gcc $BUILDOPTIONS32" \
|
||||
CXX="g++ $BUILDOPTIONS32" \
|
||||
USE_ARCH=$UARCH \
|
||||
./configure --target=$TARGET32 \
|
||||
--prefix=/usr &&
|
||||
make -j $NUMCPU &&
|
||||
@ -98,6 +99,7 @@ mk() {
|
||||
fi
|
||||
CC="gcc $BUILDOPTIONS" \
|
||||
CXX="g++ $BUILDOPTIONS" \
|
||||
USE_ARCH=$UARCH \
|
||||
./configure --target=$TARGET \
|
||||
$ADDOPTIONS \
|
||||
--prefix=/usr &&
|
||||
|
@ -83,13 +83,12 @@ premk() {
|
||||
mk32() {
|
||||
CC="gcc $BUILDOPTIONS32" \
|
||||
CXX="g++ $BUILDOPTIONS32" \
|
||||
USE_ARCH=$UARCH \
|
||||
./configure --target=$TARGET32 \
|
||||
--prefix=/usr \
|
||||
--with-dvdscc=local-shared \
|
||||
--enable-fb \
|
||||
--enable-qt \
|
||||
--enable-ncurses \
|
||||
--enable-kde &&
|
||||
--enable-ncurses &&
|
||||
make -j $NUMCPU &&
|
||||
make -j $NUMCPU DESTDIR=$TMPROOT install
|
||||
make distclean
|
||||
@ -102,14 +101,13 @@ mk() {
|
||||
fi
|
||||
CC="gcc $BUILDOPTIONS" \
|
||||
CXX="g++ $BUILDOPTIONS" \
|
||||
USE_ARCH=$UARCH \
|
||||
./configure --target=$TARGET \
|
||||
--prefix=/usr \
|
||||
$ADDOPTIONS \
|
||||
--with-dvdscc=local-shared \
|
||||
--enable-fb \
|
||||
--enable-qt \
|
||||
--enable-ncurses \
|
||||
--enable-kde &&
|
||||
--enable-ncurses &&
|
||||
make -j $NUMCPU &&
|
||||
make -j $NUMCPU DESTDIR=$TMPROOT install
|
||||
}
|
||||
|
@ -83,6 +83,7 @@ premk() {
|
||||
mk32() {
|
||||
CC="gcc $BUILDOPTIONS32" \
|
||||
CXX="g++ $BUILDOPTIONS32" \
|
||||
USE_ARCH=$UARCH \
|
||||
./configure --target=$TARGET32 \
|
||||
--prefix=/usr/ &&
|
||||
make -j $NUMCPU &&
|
||||
@ -96,6 +97,7 @@ mk() {
|
||||
fi
|
||||
CC="gcc $BUILDOPTIONS" \
|
||||
CXX="g++ $BUILDOPTIONS" \
|
||||
USE_ARCH=$UARCH \
|
||||
./configure --target=$TARGET \
|
||||
$ADDOPTIONS \
|
||||
--prefix=/usr/ &&
|
||||
|
@ -80,6 +80,7 @@ premk() {
|
||||
mk32() {
|
||||
CC="gcc $BUILDOPTIONS32" \
|
||||
CXX="g++ $BUILDOPTIONS32" \
|
||||
USE_ARCH=$UARCH \
|
||||
./configure --target=$TARGET32 \
|
||||
--prefix=/usr &&
|
||||
make &&
|
||||
@ -93,6 +94,7 @@ mk() {
|
||||
fi
|
||||
CC="gcc $BUILDOPTIONS" \
|
||||
CXX="g++ $BUILDOPTIONS" \
|
||||
USE_ARCH=$UARCH \
|
||||
./configure --target=$TARGET \
|
||||
$ADDOPTIONS \
|
||||
--prefix=/usr &&
|
||||
|
@ -81,6 +81,7 @@ premk() {
|
||||
mk32() {
|
||||
CC="gcc $BUILDOPTIONS32" \
|
||||
CXX="g++ $BUILDOPTIONS32" \
|
||||
USE_ARCH=$UARCH \
|
||||
./configure --target=$TARGET32 \
|
||||
--prefix=/opt/gnome
|
||||
make -j $NUMCPU
|
||||
@ -95,6 +96,7 @@ mk() {
|
||||
fi
|
||||
CC="gcc $BUILDOPTIONS" \
|
||||
CXX="g++ $BUILDOPTIONS" \
|
||||
USE_ARCH=$UARCH \
|
||||
./configure --target=$TARGET \
|
||||
$ADDOPTIONS \
|
||||
--prefix=/opt/gnome
|
||||
|
@ -75,17 +75,27 @@ premk() {
|
||||
echo "Nothing to do for premk()"
|
||||
}
|
||||
|
||||
mk32() {
|
||||
LDFLAGS="-L/lib -L/usr/lib -L/usr/X11R7/lib" \
|
||||
CC="gcc $BUILDOPTIONS32" \
|
||||
CXX="g++ $BUILDOPTIONS32" \
|
||||
./configure --prefix=/usr \
|
||||
--libdir=\${PREFIX}/lib \
|
||||
--includedir=\${PREFIX}/include
|
||||
make -j $NUMCPU
|
||||
make -j $NUMCPU PREFIX=$TMPROOT/usr install
|
||||
make distclean
|
||||
}
|
||||
|
||||
mk() {
|
||||
LDFLAGS="-L/$LIBDIR -L/usr/$LIBDIR -L/usr/X11R7/$LIBDIR" \
|
||||
./configure --prefix=/usr/X11R7 \
|
||||
./configure --prefix=/usr \
|
||||
--libdir=\${PREFIX}/$LIBDIR \
|
||||
--includedir=\${PREFIX}/include
|
||||
make -j $NUMCPU
|
||||
make -j $NUMCPU PREFIX=$TMPROOT/usr/X11R7 install
|
||||
make -j $NUMCPU PREFIX=$TMPROOT/usr install
|
||||
}
|
||||
|
||||
postmk() {
|
||||
BOOSTINC=$TMPROOT/usr/X11R7/include/boost*
|
||||
BOOSTINC=`basename $BOOSTINC`
|
||||
ln -sf ../X11R7/include/$BOOSTINC/boost $TMPROOT/usr/include/boost
|
||||
echo "Nothing to do for postmk()"
|
||||
}
|
||||
|
@ -79,6 +79,7 @@ premk() {
|
||||
mk32() {
|
||||
CC="gcc $BUILDOPTIONS32" \
|
||||
CXX="g++ $BUILDOPTIONS32" \
|
||||
USE_ARCH=$UARCH \
|
||||
./configure --target=$TARGET \
|
||||
--prefix=/usr/X11R7
|
||||
make -j $NUMCPU
|
||||
@ -93,6 +94,7 @@ mk() {
|
||||
fi
|
||||
CC="gcc $BUILDOPTIONS" \
|
||||
CXX="g++ $BUILDOPTIONS" \
|
||||
USE_ARCH=$UARCH \
|
||||
./configure --target=$TARGET \
|
||||
$ADDOPTIONS \
|
||||
--prefix=/usr/X11R7
|
||||
|
@ -84,13 +84,15 @@ premk() {
|
||||
mk32() {
|
||||
CC="gcc $BUILDOPTIONS32" \
|
||||
CXX="g++ $BUILDOPTIONS32" \
|
||||
USE_ARCH=$UARCH \
|
||||
./configure --target=$TARGET32 \
|
||||
--prefix=/opt/gnome &&
|
||||
--prefix=/usr &&
|
||||
make -j $NUMCPU &&
|
||||
make -j $NUMCPU DESTDIR=$TMPROOT install &&
|
||||
CheckError "Make install process failed !" 1
|
||||
ClearHostSysNameing32 $TMPROOT
|
||||
make distclean
|
||||
mv $TMPROOT/usr/bin/croco-0.6-config{,-32}
|
||||
}
|
||||
|
||||
mk() {
|
||||
@ -99,9 +101,10 @@ mk() {
|
||||
fi
|
||||
CC="gcc $BUILDOPTIONS" \
|
||||
CXX="g++ $BUILDOPTIONS" \
|
||||
USE_ARCH=$UARCH \
|
||||
./configure --target=$TARGET \
|
||||
$ADDOPTIONS \
|
||||
--prefix=/opt/gnome &&
|
||||
--prefix=/usr &&
|
||||
make -j $NUMCPU &&
|
||||
make -j $NUMCPU DESTDIR=$TMPROOT install &&
|
||||
CheckError "Make install process failed !" 1
|
||||
@ -109,4 +112,8 @@ mk() {
|
||||
|
||||
postmk() {
|
||||
ClearHostSysNameing $TMPROOT
|
||||
if [ "$MK64BIT" == "true" ]; then
|
||||
mv $TMPROOT/usr/bin/croco-0.6-config{,-64}
|
||||
ln -s multiarch_wrapper $TMPROOT/usr/bin/croco-0.6-config
|
||||
fi
|
||||
}
|
||||
|
@ -79,8 +79,9 @@ premk() {
|
||||
mk32() {
|
||||
CC="gcc $BUILDOPTIONS32" \
|
||||
CXX="g++ $BUILDOPTIONS32" \
|
||||
USE_ARCH=$UARCH \
|
||||
./configure --target=$TARGET32 \
|
||||
--prefix=/usr/X11R7
|
||||
--prefix=/usr
|
||||
make -j $NUMCPU
|
||||
make -j $NUMCPU DESTDIR=$TMPROOT install
|
||||
make distclean
|
||||
@ -92,9 +93,10 @@ mk() {
|
||||
fi
|
||||
CC="gcc $BUILDOPTIONS" \
|
||||
CXX="g++ $BUILDOPTIONS" \
|
||||
USE_ARCH=$UARCH \
|
||||
./configure --target=$TARGET \
|
||||
$ADDOPTIONS \
|
||||
--prefix=/usr/X11R7
|
||||
--prefix=/usr
|
||||
make -j $NUMCPU
|
||||
make -j $NUMCPU DESTDIR=$TMPROOT install
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user