From 326ca6ab4c5e5bf32ec372f96c94c69c6e5404df Mon Sep 17 00:00:00 2001 From: kueller Date: Mon, 20 Jul 2009 18:10:57 +0000 Subject: [PATCH] neue funktionierende packages git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@4848 504e572c-2e33-0410-9681-be2bf7408885 --- SysBuild/{tools => network}/links | 2 +- SysBuild/{tools => security}/narc | 2 +- SysBuild/tools/libmal | 4 +++- SysBuild/tools/libotr | 4 +++- SysBuild/tools/pilot-link | 15 +++++++-------- 5 files changed, 15 insertions(+), 12 deletions(-) rename SysBuild/{tools => network}/links (99%) rename SysBuild/{tools => security}/narc (99%) diff --git a/SysBuild/tools/links b/SysBuild/network/links similarity index 99% rename from SysBuild/tools/links rename to SysBuild/network/links index 315dbe5..49cb192 100644 --- a/SysBuild/tools/links +++ b/SysBuild/network/links @@ -69,7 +69,7 @@ # # -SRCPATH=Tools/Net +SRCPATH=Network/Clients premk() { echo "Nothing to do for premk()" diff --git a/SysBuild/tools/narc b/SysBuild/security/narc similarity index 99% rename from SysBuild/tools/narc rename to SysBuild/security/narc index 98b3938..5d19092 100644 --- a/SysBuild/tools/narc +++ b/SysBuild/security/narc @@ -69,7 +69,7 @@ # #Pfad zum Basis-Sourcetree : -SRCPATH=Tools/Net +SRCPATH=Security/Net #Wenn das usgepackte Verzeichnis vom Paketnamen unterschiedlich ist #SRCDIR= diff --git a/SysBuild/tools/libmal b/SysBuild/tools/libmal index ffc20d9..282922d 100644 --- a/SysBuild/tools/libmal +++ b/SysBuild/tools/libmal @@ -70,7 +70,7 @@ # # -SRCPATH=Tools/lib +SRCPATH=Tools/Lib premk() { echo "Nothing to do for premk()" @@ -79,6 +79,7 @@ premk() { mk32() { CC="gcc $BUILDOPTIONS32" \ CXX="g++ $BUILDOPTIONS32" \ + USE_ARCH=$UARCH \ ./configure --host=$TARGET32 \ --prefix=/usr make -j $NUMCPU @@ -93,6 +94,7 @@ mk() { fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ + USE_ARCH=$UARCH \ ./configure --host=$TARGET \ $ADDOPTIONS \ --prefix=/usr diff --git a/SysBuild/tools/libotr b/SysBuild/tools/libotr index 7b5ffa1..e55d0da 100644 --- a/SysBuild/tools/libotr +++ b/SysBuild/tools/libotr @@ -69,7 +69,7 @@ # # -SRCPATH=Tools/lib +SRCPATH=Tools/Lib premk() { echo "Nothing to do for premk()" @@ -78,6 +78,7 @@ premk() { mk32() { CC="gcc -L/usr/lib $BUILDOPTIONS32" \ CXX="g++ -L/usr/lib $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 diff --git a/SysBuild/tools/pilot-link b/SysBuild/tools/pilot-link index 6df92b4..5ba4f00 100644 --- a/SysBuild/tools/pilot-link +++ b/SysBuild/tools/pilot-link @@ -80,11 +80,11 @@ mk32() { CXX="g++ $BUILDOPTIONS32" \ LDFLAGS="-L/usr/lib" \ USE_ARCH=$UARCH \ + CFLAGS="$BUILDOPTIONS32" \ + CPPFLAGS="$BUILDOPTIONS32" \ ./configure --host=$TARGET32 \ - --prefix=/usr \ - --with-perl=/usr/bin/perl \ - --with-tcl=/usr/X11R7/lib \ - --with-python=pybase + --prefix=/usr + sed -i -e "s/m64/m32/" bindings/Perl/Makefile make -j $NUMCPU make DESTDIR=$TMPROOT install make distclean @@ -98,12 +98,11 @@ mk() { CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ USE_ARCH=$UARCH \ + CFLAGS="$BUILDOPTIONS" \ + CPPFLAGS="$BUILDOPTIONS" \ ./configure --host=$TARGET \ - --prefix=/usr \ $ADDOPTIONS \ - --with-perl=/usr/bin/perl \ - --with-tcl=/usr/X11R7/lib \ - --with-python=pybase + --prefix=/usr make -j $NUMCPU make DESTDIR=$TMPROOT install }