diff --git a/SysBuild/BuildCluster/XTools.dmk b/SysBuild/BuildCluster/XTools.dmk index 0deabe4..14ff17b 100644 --- a/SysBuild/BuildCluster/XTools.dmk +++ b/SysBuild/BuildCluster/XTools.dmk @@ -1,12 +1,19 @@ 0 development/Xdialog #Is already done - aber hier sollte die neueste Version gebaut werden -4 development/subversion +8 development/subversion +8 network/apr +8 network/apr-util +8 network/neon +128 network/apr +128 network/apr-util +128 network/neon +0 development/subversion 0 network/gftp 0 multimedia/mjpegtools 0 multimedia/gst-plugins-good 0 multimedia/minidlna -0 development/pygobject 0 development/pycairo +0 development/pygobject 0 development/pygtk 0 multimedia/gst-python 0 multimedia/farsight2 @@ -30,6 +37,7 @@ 0 security/nmap 0 guibased/gnokii 0 guibased/sane-frontends +4 guibased/SDL 0 guibased/SDL_image 0 guibased/SDL_ttf 0 multimedia/smpeg @@ -53,8 +61,6 @@ 0 network/courier-authlib 0 network/courier 0 network/courier-analog -#does not funktion -#0 security/clamcour 8 network/courier-authlib 8 network/courier-analog 8 network/courier @@ -62,17 +68,16 @@ 0 network/courier-imap 0 network/sqwebmail 0 development/php -0 dbase/virtuoso-opensource 0 dbase/libiodbc +0 dbase/virtuoso-opensource 0 guibased/raptor +0 guibased/raptor2 0 guibased/rasqal 0 guibased/redland 0 network/procmail 0 multimedia/liblrdf 0 multimedia/lv2core 0 multimedia/slv2 -0 multimedia/xmms -0 multimedia/xmms-sid 0 security/nspr 0 security/nss 0 development/PyQt-x11-gpl diff --git a/SysBuild/multimedia/xmms b/SysBuild/DebugModules/xmms similarity index 96% rename from SysBuild/multimedia/xmms rename to SysBuild/DebugModules/xmms index 30a3a34..8dc8ea6 100644 --- a/SysBuild/multimedia/xmms +++ b/SysBuild/DebugModules/xmms @@ -93,16 +93,13 @@ mk32() { #Hier wird der Make Prozess der Sourcen definiert mk() { - if [ "$MK64BIT" == "true" ]; then - ADDOPTIONS="--libdir=\${prefix}/lib64" - fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ - LDFLAGS="-L/lib64 -L/usr/lib64 -L/usr/X11R7/lib64 -liconv" \ + LDFLAGS="-L/${LIBDIR} -L/usr/${LIBDIR} -L/usr/X11R7/${LIBDIR} -liconv" \ USE_ARCH=$UARCH \ ./configure --build=$TARGET \ --prefix=/usr \ - $ADDOPTIONS \ + --libdir=\${prefix}/${LIBDIR} \ --with-xml-prefix=/usr/$LIBDIR && make -j $NUMCPU && make -j $NUMCPU DESTDIR=$TMPROOT install diff --git a/SysBuild/multimedia/xmms-sid b/SysBuild/DebugModules/xmms-sid similarity index 100% rename from SysBuild/multimedia/xmms-sid rename to SysBuild/DebugModules/xmms-sid diff --git a/SysBuild/dbase/libiodbc b/SysBuild/dbase/libiodbc index 2edad53..f95ae97 100644 --- a/SysBuild/dbase/libiodbc +++ b/SysBuild/dbase/libiodbc @@ -89,13 +89,10 @@ mk32() { } mk() { - if [ "$MK64BIT" == "true" ]; then - ADDOPTIONS="--libdir=\${prefix}/lib64" - fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ USE_ARCH=$UARCH \ - ./configure $ADDOPTIONS \ + ./configure --libdir=\${prefix}/${LIBDIR} \ --target=$TARGET \ --prefix=/usr \ --sysconfdir=/etc/sysconfig/iodbc \ diff --git a/SysBuild/dbase/sqlite-amalgamation b/SysBuild/dbase/sqlite-amalgamation index 6c077cd..3ed532f 100644 --- a/SysBuild/dbase/sqlite-amalgamation +++ b/SysBuild/dbase/sqlite-amalgamation @@ -83,7 +83,9 @@ mk32() { CXX="g++ $BUILDOPTIONS32" \ USE_ARCH=$UARCH \ ./configure --target=$TARGET32 \ - --prefix=/usr + --prefix=/usr \ + --enable-threadsafe \ + --enable-dynamic-extensions make -j $NUMCPU make -j $NUMCPU DESTDIR=$TMPROOT install make distclean @@ -95,7 +97,9 @@ mk() { USE_ARCH=$UARCH \ ./configure --target=$TARGET \ --libdir=\${prefix}/${LIBDIR} \ - --prefix=/usr + --prefix=/usr \ + --enable-threadsafe \ + --enable-dynamic-extensions make -j $NUMCPU make -j $NUMCPU DESTDIR=$TMPROOT install } diff --git a/SysBuild/dbase/unixODBC b/SysBuild/dbase/unixODBC index 6715826..1d091a1 100644 --- a/SysBuild/dbase/unixODBC +++ b/SysBuild/dbase/unixODBC @@ -114,11 +114,6 @@ mk() { --enable-driver \ --with-gnu-ld \ --sysconfdir=/etc/sysconfig/unixODBC - #if [ "$MK64BIT" == "true" ]; then - #sed -i -e "s/\/lib /\/lib64 /g" libtool - #sed -i -e "s/\/lib\"/\/lib64\"/g" libtool - #sed -i -e "s/\/lib\//\/lib64\//g" libtool - #fi make -j $NUMCPU && make -j $NUMCPU install && make -j $NUMCPU DESTDIR=$TMPROOT install diff --git a/SysBuild/dbase/virtuoso-opensource b/SysBuild/dbase/virtuoso-opensource index 8235517..4586923 100644 --- a/SysBuild/dbase/virtuoso-opensource +++ b/SysBuild/dbase/virtuoso-opensource @@ -92,13 +92,10 @@ mk32() { } mk() { - if [ "$MK64BIT" == "true" ]; then - ADDOPTIONS="--libdir=\${prefix}/lib64" - fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ USE_ARCH=$UARCH \ - ./configure $ADDOPTIONS \ + ./configure --libdir=\${prefix}/${LIBDIR} \ --target=$TARGET \ --prefix=/opt/Virtuoso \ --enable-php5 \ diff --git a/SysBuild/development/PyQt-x11-gpl b/SysBuild/development/PyQt-x11-gpl index 683b18e..c357fe2 100644 --- a/SysBuild/development/PyQt-x11-gpl +++ b/SysBuild/development/PyQt-x11-gpl @@ -78,23 +78,27 @@ mk32() { CFLAGS="$BUILDOPTIONS32" \ CXXFLAGS="$BUILDOPTIONS32" \ USE_ARCH=32 \ + QMAKESPEC=linux-g++-32 \ python configure.py --confirm-license find . -name "Makefile" -exec sed -i "s/\((LFLAGS)\)/\1 -m32/" {} \; + find . -name "Makefile" -exec sed -i "s/\(-shared\)/-m32 \1/g" {} \; make -j $NUMCPU \ CFLAGS="$BUILDOPTIONS32" \ CXXFLAGS="$BUILDOPTIONS32" \ LDEMULATION="elf32_i386" make -j $NUMCPU DESTDIR=$TMPROOT install - cd .. - rm -r PyQt-x11-gpl* - tar -xvf $SOURCE/$SRCPATH/PyQt-x11-gpl*.tar.* - cd PyQt-x11-gpl* + #cd .. + #rm -r PyQt-x11-gpl* + #tar -xvf $SOURCE/$SRCPATH/PyQt-x11-gpl*.tar.* + #cd PyQt-x11-gpl* + make clean } mk() { CFLAGS="$BUILDOPTIONS" \ CXXFLAGS="$BUILDOPTIONS" \ USE_ARCH=$UARCH \ + QMAKESPEC=linux-g++-$UARCH \ python configure.py --confirm-license make -j $NUMCPU \ CFLAGS="$BUILDOPTIONS -fPIC" \ diff --git a/SysBuild/development/ddd b/SysBuild/development/ddd index 6cc8a7c..c473279 100644 --- a/SysBuild/development/ddd +++ b/SysBuild/development/ddd @@ -76,16 +76,13 @@ premk() { } mk() { - if [ "$MK64BIT" == "true" ]; then - ADDOPTIONS="--with-motif-libraries=/usr/X11R7/lib64" - ldconfig - fi + ldconfig CC="gcc $BUILDOPTIONS" \ - CXX="g++ $BUILDOPTIONS" \ + CXX="g++ $BUILDOPTIONS -ffriend-injection -fabi-version=0" \ LDFLAGS="-L/usr/X11R7/lib64" \ ./configure --target=$TARGET \ --with-x \ - $ADDOPTIONS \ + --with-motif-libraries=/usr/X11R7/${LIBDIR} \ --prefix=/usr/X11R7 cp /usr/X11R7/include/Xm/XmP.h{,.orig} sed -i -e "s%\(#include \)%//\1%" /usr/X11R7/include/Xm/XmP.h diff --git a/SysBuild/development/ffcall b/SysBuild/development/ffcall index 7502366..7dfbcdc 100644 --- a/SysBuild/development/ffcall +++ b/SysBuild/development/ffcall @@ -99,14 +99,11 @@ mk32() { } mk() { - if [ "$MK64BIT" == "true" ]; then - ADDOPTIONS="--libdir=\${prefix}/lib64" - fi CC="gcc $BUILDOPTIONS -fPIC" \ CXX="g++ $BUILDOPTIONS -fPIC" \ USE_ARCH=$UARCH \ ./configure --target=$TARGET \ - $ADDOPTIONS \ + --libdir=\${prefix}/${LIBDIR} \ --prefix=/usr && make local_prefix=/usr/share/ffcall && make prefix=$TMPROOT/usr local_prefix=$TMPROOT/usr/share/ffcall install diff --git a/SysBuild/development/php b/SysBuild/development/php index 239eac4..1584704 100644 --- a/SysBuild/development/php +++ b/SysBuild/development/php @@ -83,15 +83,16 @@ premk() { #Hier wird der Make Prozess der Sourcen definiert mk() { - if [ "$MK64BIT" == "true" ]; then - ADDOPTIONS="--libdir=\${prefix}/lib64" - fi CC="gcc $BUILDOPTIONS -I/opt/PostgreSQL/include -L/opt/PostgreSQL/$LIBDIR" \ CXX="g++ $BUILDOPTIONS -I/opt/PostgreSQL/include -L/opt/PostgreSQL/$LIBDIR" \ - LDFLAGS="-L/$LIBDIR -L/usr/$LIBDIR -L/usr/X11R7/$LIBDIR -L/opt/PostgreSQL/$LIBDIR -L/opt/MySQL/$LIBDIR/mysql" \ + LDFLAGS="-L/$LIBDIR -L/usr/$LIBDIR \ + -L/usr/X11R7/$LIBDIR \ + -L/opt/PostgreSQL/$LIBDIR \ + -L/opt/MySQL/$LIBDIR \ + -lcrypt -lfontconfig" \ USE_ARCH=$UARCH \ ./configure --target=$TARGET \ - $ADDOPTIONS \ + --libdir=\${prefix}/${LIBDIR} \ --prefix=/usr \ --sysconfdir=/etc \ --with-mysql=/opt/MySQL \ @@ -120,7 +121,7 @@ mk() { --enable-gd-native-ttf \ --enable-dba \ --enable-gd-jis-conv - sed -i -e "s%/opt/MySQL/lib/%/opt/MySQL/$LIBDIR/%g" Makefile + sed -i -e "s%/opt/MySQL/lib%/opt/MySQL/$LIBDIR%g" Makefile sed -i -e "s%/usr/X11R7/lib%/usr/X11R7/$LIBDIR%g" Makefile make -j $NUMCPU && mkdir -p $TMPROOT/etc/httpd diff --git a/SysBuild/development/pycairo b/SysBuild/development/pycairo index 53bf2af..141027e 100644 --- a/SysBuild/development/pycairo +++ b/SysBuild/development/pycairo @@ -91,7 +91,7 @@ mk() { CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ ./configure --prefix=/usr \ - --libdir=\${prefix}/$LIBDIR + --libdir=\${prefix}/${LIBDIR} make -j $NUMCPU make -j $NUMCPU DESTDIR=$TMPROOT install } diff --git a/SysBuild/development/pygobject b/SysBuild/development/pygobject index f4e902d..673f83f 100644 --- a/SysBuild/development/pygobject +++ b/SysBuild/development/pygobject @@ -91,7 +91,7 @@ mk() { CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ ./configure --prefix=/usr \ - --libdir=\${prefix}/$LIBDIR + --libdir=\${prefix}/${LIBDIR} make -j $NUMCPU make -j $NUMCPU DESTDIR=$TMPROOT install } diff --git a/SysBuild/development/sip b/SysBuild/development/sip index 8e927e0..0391822 100644 --- a/SysBuild/development/sip +++ b/SysBuild/development/sip @@ -88,6 +88,7 @@ mk32() { LDEMULATION=elf32_i386 make -j $NUMCPU DESTDIR=$TMPROOT install make clean + mv $TMPROOT/usr/bin/sip{,-32} } mk() { @@ -103,5 +104,8 @@ mk() { } postmk() { - echo "Nothing to do for postmk()" + if [ $MK64BIT == "true" ]; then + mv $TMPROOT/usr/bin/sip{,-64} + ln -s multiarch_wrapper $TMPROOT/usr/bin/sip + fi } diff --git a/SysBuild/development/subversion b/SysBuild/development/subversion index 88ea2e4..3cb5c39 100644 --- a/SysBuild/development/subversion +++ b/SysBuild/development/subversion @@ -72,8 +72,8 @@ SRCPATH=Development/Tools premk() { - #tar -jxvf $LFSSOURCE/$SRCPATH/subversion-deps*.tar.bz2 -C .. - echo "Nothing to do for pemk()" + installpkg -r expat + installpkg -i $DISTTARGET/Base/Lib/expat*.vpg } mk() { @@ -84,9 +84,13 @@ mk() { --with-editor=/usr/bin/vi \ --sysconfdir=/etc \ --libdir=\${prefix}/$LIBDIR \ - --prefix=/usr + --prefix=/usr \ + --with-apr-util=/usr/bin/apu-1-config \ + --with-sqlite=/usr \ + --with-sasl=/usr \ + --without-berkeley-db make -j $NUMCPU - make + make install make DESTDIR=$TMPROOT install } diff --git a/SysBuild/guibased/OpenSceneGraph b/SysBuild/guibased/OpenSceneGraph index 375e32f..6056021 100644 --- a/SysBuild/guibased/OpenSceneGraph +++ b/SysBuild/guibased/OpenSceneGraph @@ -58,13 +58,13 @@ # 128 : Patches zu den Sourcen nicht einspielen - Module muss sich darum # kümmern -#Module zur Erstellung des Packetes: -#Quelle der Source Archive: +#Module zur Erstellung des Packetes: OpenSceneGraph +#Quelle der Source Archive: http://www.openscenegraph.org #ACHTUNG: Beschreibung nicht in der gleichen Zeile beginnen! #Neue Zeile anfangen. sonste funktioniert die metadaten erzeugung #nicht! #Kurzbeschreibung: -# +#High Performance 3D Grafik Toolkit # #Letzte Änderung von: $Author$ #Datum der letzten Änderung: $Date$ @@ -99,7 +99,7 @@ premk() { mk() { cmake -D CC="gcc $BUILDOPTIONS" \ - -D CXX="g++ $BUILDOPTIONS" \ + -D CXX="g++ $BUILDOPTIONS -fabi-version=1" \ -D USE_ARCH=$UARCH \ -D OPENGL_INCLUDE_DIR=/usr/X11R7/include \ -D CMAKE_PREFIX_PATH=/usr/X11R7 \ diff --git a/SysBuild/guibased/SDL b/SysBuild/guibased/SDL index bff37df..119caa2 100644 --- a/SysBuild/guibased/SDL +++ b/SysBuild/guibased/SDL @@ -116,6 +116,7 @@ postmk() { cd $TMPROOT/usr/include ln -s ../X11R7/include/SDL SDL ClearHostSysNameing $TMPROOT +# sed -i "s/.*#undef \(SDL_VIDEO_DRIVER_X11.* \).*$/#define \1 1/" $TMPROOT/usr/X11R7/include/SDL/SDL_config.h if [ "$MK64BIT" == "true" ]; then mv $TMPROOT/usr/X11R7/bin/sdl-config{,-64} ln -s /usr/bin/multiarch_wrapper $TMPROOT/usr/X11R7/bin/sdl-config diff --git a/SysBuild/guibased/SDL_image b/SysBuild/guibased/SDL_image index a027a8a..42d0066 100644 --- a/SysBuild/guibased/SDL_image +++ b/SysBuild/guibased/SDL_image @@ -91,13 +91,10 @@ mk32() { } mk() { - if [ "$MK64BIT" == "true" ]; then - ADDOPTIONS="--libdir=/usr/X11R7/lib64" - fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ ./configure --target=$TARGET \ - $ADDOPTIONS \ + --libdir=/usr/X11R7/${LIBDIR} \ --prefix=/usr/X11R7 && make -j $NUMCPU && make -j $NUMCPU DESTDIR=$TMPROOT install diff --git a/SysBuild/guibased/SDL_mixer b/SysBuild/guibased/SDL_mixer index ac9b68b..e4086d6 100644 --- a/SysBuild/guibased/SDL_mixer +++ b/SysBuild/guibased/SDL_mixer @@ -92,16 +92,12 @@ mk32() { } mk() { - if [ "$MK64BIT" == "true" ]; then - ADDOPTIONS="--libdir=/usr/X11R7/lib64" - export LDFLAGS="-L/usr/lib64" - fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ - LDFLAGS="-L/usr/X11R7/lib64" \ + LDFLAGS="-L/usr/X11R7/${LIBDIR} -L/usr/${LIBDIR}" \ USE_ARCH=$UARCH \ ./configure --target=$TARGET \ - $ADDOPTIONS \ + --libdir=/usr/X11R7/${LIBDIR} \ --prefix=/usr/X11R7 && make -j $NUMCPU && make -j $NUMCPU DESTDIR=$TMPROOT install diff --git a/SysBuild/guibased/SDL_ttf b/SysBuild/guibased/SDL_ttf index 34d8172..3e11c36 100644 --- a/SysBuild/guibased/SDL_ttf +++ b/SysBuild/guibased/SDL_ttf @@ -91,14 +91,11 @@ mk32() { } mk() { - if [ "$MK64BIT" == "true" ]; then - ADDOPTIONS="--libdir=/usr/X11R7/lib64" - fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ USE_ARCH=$UARCH \ ./configure --target=$TARGET \ - $ADDOPTIONS \ + --libdir=/usr/X11R7/${LIBDIR} \ --prefix=/usr/X11R7 && make -j $NUMCPU && make -j $NUMCPU DESTDIR=$TMPROOT install diff --git a/SysBuild/guibased/SimGear b/SysBuild/guibased/SimGear index 6d80737..d6f8a61 100644 --- a/SysBuild/guibased/SimGear +++ b/SysBuild/guibased/SimGear @@ -97,13 +97,10 @@ premk() { #} mk() { - if [ "$MK64BIT" == "true" ]; then - ADDOPTIONS="--libdir=/usr/X11R7/lib64" - fi CC="gcc $BUILDOPTIONS -fPIC" \ CXX="g++ $BUILDOPTIONS -fPIC" \ ../SimGear*/configure --target=$TARGET \ - $ADDOPTIONS \ + --libdir=/usr/X11R7/${LIBDIR} \ --prefix=/usr/X11R7 sed -e "s/^openal_LIBS.*$/openal_LIBS = -lm -lpthread -lopenal -lalut -ldl/" \ simgear/sound/Makefile >/tmp/Makefile diff --git a/SysBuild/guibased/cairo b/SysBuild/guibased/cairo index 0059a8f..7c6901c 100644 --- a/SysBuild/guibased/cairo +++ b/SysBuild/guibased/cairo @@ -85,6 +85,7 @@ mk32() { ./configure --build=$TARGET32 \ --prefix=/usr/X11R7 \ --enable-xcb \ + --enable-tee \ --enable-glitz && make -j $NUMCPU && make -j $NUMCPU DESTDIR=$TMPROOT install @@ -101,6 +102,7 @@ mk() { --libdir=/usr/X11R7/${LIBDIR} \ --prefix=/usr/X11R7 \ --enable-xcb \ + --enable-tee \ --enable-glitz && make -j $NUMCPU && make -j $NUMCPU DESTDIR=$TMPROOT install diff --git a/SysBuild/guibased/gd b/SysBuild/guibased/gd index 5bcf428..6e60042 100644 --- a/SysBuild/guibased/gd +++ b/SysBuild/guibased/gd @@ -107,15 +107,12 @@ mk32() { } mk() { - if [ "$MK64BIT" == "true" ]; then - ADDOPTIONS="--libdir=\${prefix}/lib64" - fi CC="gcc $BUILDOPTIONS -fPIC" \ CXX="g++ $BUILDOPTIONS -fPIC" \ USE_ARCH=$UARCH \ ./configure --target=$TARGET \ --prefix=/usr/X11R7 \ - $ADDOPTIONS \ + --libdir=\${prefix}/${LIBDIR} \ --with-png \ --with-freetype \ --with-jpeg \ diff --git a/SysBuild/guibased/gnokii b/SysBuild/guibased/gnokii index 59af499..9b81d30 100644 --- a/SysBuild/guibased/gnokii +++ b/SysBuild/guibased/gnokii @@ -76,9 +76,9 @@ premk() { } mk32() { - CC="gcc $BUILDOPTIONS32" \ - CXX="gcc $BUILDOPTIONS32" \ - LDFLAGS="-L/opt/MySQL/lib" \ + CC="gcc $BUILDOPTIONS32 -I/opt/PostgreSQL/include" \ + CXX="gcc $BUILDOPTIONS32 -I/opt/PostgreSQL/include" \ + LDFLAGS="-L/opt/MySQL/lib -L/opt/PostgreSQL/lib" \ USE_ARCH=$UARCH \ ./configure --target=$TARGET32 \ --enable-relocatable \ @@ -92,17 +92,14 @@ mk32() { } mk() { - if [ "$MK64BIT" == "true" ]; then - ADDOPTIONS="--libdir=/usr/X11R7/lib64" - fi - CC="gcc $BUILDOPTIONS" \ - CXX="g++ $BUILDOPTIONS" \ - LDFLAGS="-L/usr/X11R7/$LIBDIR" \ + CC="gcc $BUILDOPTIONS -I/opt/PostgreSQL/include" \ + CXX="g++ $BUILDOPTIONS -I/opt/PostgreSQL/include" \ + LDFLAGS="-L/usr/X11R7/$LIBDIR -L/opt/PostgreSQL/${LIBDIR}" \ USE_ARCH=$UARCH \ ./configure --enable-relocatable \ --enable-security \ --with-x \ - $ADDOPTIONS \ + --libdir=/usr/X11R7/${LIBDIR} \ --prefix=/usr/X11R7 make -j $NUMCPU touch gnokii/$TARGET diff --git a/SysBuild/guibased/gtkglarea b/SysBuild/guibased/gtkglarea index 938dd2e..d9d5021 100644 --- a/SysBuild/guibased/gtkglarea +++ b/SysBuild/guibased/gtkglarea @@ -93,15 +93,12 @@ mk32() { } mk() { - if [ "$MK64BIT" == "true" ]; then - ADDOPTIONS="--libdir=\${prefix}/lib64" - fi CC="gcc $BUILDOPTIONS -fPIC" \ CXX="gcc $BUILDOPTIONS -fPIC" \ USE_ARCH=$UARCH \ LDFLAGS="-L/usr/$LIBDIR -L/usr/X11R7/$LIBDIR" \ ./configure --build=$TARGET \ - $ADDOPTIONS \ + --libdir=\${prefix}/${LIBDIR} \ --prefix=/usr/X11R7 make -j $NUMCPU make -j $NUMCPU DESTDIR=$TMPROOT install diff --git a/SysBuild/guibased/nedit b/SysBuild/guibased/nedit index 53b9d6d..6612a99 100644 --- a/SysBuild/guibased/nedit +++ b/SysBuild/guibased/nedit @@ -80,6 +80,9 @@ premk() { #Hier wird der Make Prozess der Sourcen definiert mk() { + for i in makefiles/*; do + sed -i "s/-lXp //g" $i + done yes|make -j $NUMCPU \ CC="gcc $BUILDOPTIONS -I/usr/X11R7/include" \ CXX="g++ $BUILDOPTIONS -I/usr/X11R7/include" \ diff --git a/SysBuild/guibased/raptor b/SysBuild/guibased/raptor index c7648f9..96230ca 100644 --- a/SysBuild/guibased/raptor +++ b/SysBuild/guibased/raptor @@ -86,13 +86,10 @@ mk32() { } mk() { - if [ "$MK64BIT" == "true" ]; then - ADDOPTIONS="--libdir=\${prefix}/lib64" - fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ USE_ARCH=$UARCH \ - ./configure $ADDOPTIONS \ + ./configure --libdir=\${prefix}/${LIBDIR} \ --prefix=/usr make -j $NUMCPU make -j $NUMCPU DESTDIR=$TMPROOT install diff --git a/SysBuild/guibased/raptor2 b/SysBuild/guibased/raptor2 new file mode 100644 index 0000000..bf5f3d7 --- /dev/null +++ b/SysBuild/guibased/raptor2 @@ -0,0 +1,103 @@ +#!/bin/bash +#Framework, welches ein komplettes Linux System aus den Sourcen erstellt +#dieses Framework wird im CVS Repository +#:pserver:cvs.compuextreme.de:/Data/cvs zur Verfügung gestellt +# +#Lage dieser Datei im Archiv: $HeadURL$ +# +#(c) 2003 Harald Kueller, Germany +#This program is free software; you can redistribute it and/or +#modify ist under the terms of the GNU General Public License +#as published by the Free Software Foundation; either version +#2 of the License, or (at your option) any later version. +# +#This program is distributed in the hope that it will be useful, +#but WITHOUT ANY WARRANTY; without even the implied warranty of +#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +#See the GNU General Public License for more details. +# +#You should have received a copy of the GNU General Public License +#along with this program; if not write to the Free Software Foundation, +#Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +#Dies ist ein Module zur Verwendung mit genpkg. Die Erzeugung eines +#Viitor Linux Packetes wird über die Funktionen premk, mk und postmk +#gesteuert. premk() dient zur Vorbereitung des Sourcecodes. Hier können +#diverse Änderungen am sourcecode (mit awk/sed usw.) vorgenommen werden +#mk() umfasst die source Konfiguration und das Übersetzten des source +#codes. Auch die Installation muß von mk erledigt werden. Hier gild dass +#die Installation immer nach $TMPROOT erfolgen soll (meisst kann das mit +#"make DESTDIR=$TMPROOT install" angestossen werden). postmk kann +#vor der packeterstellung noch einiges am installationtree ändern. postmk +#läuft nachdem die Packetabhängigkeiten erstellt wurden. +#Das Verhalten von genpkg kann über die Variable MKPKG gesteuert werden. +#Hier müssen FLAGS zur Steuerung gesetzt werden. Folgende Flags werden +#erkannt: +# +# 1 : Package Erzeugung erzwingen. Packet wird, auch wenn es schon +# vorhanden ist, ohne weitere rückfragen neu Erzeugt. +# 2 : Package Installation erzwingen. Installpkg wird mit -f aufgerufen. +# Das bewirkt, das installpkg keine rückfragen bei der installation +# Stellt, und das packet in jedemfall (neu) installiert. +# 4 : Sourcepacket nicht nach MAKEDIR entpacken. Ist dieses Flag gesetzt +# muss sich das Module selber um das Entpacken der sourcedateien kümmern. +# vor allem wichtig bei Packeten, für die es keine source.tgz gibt +# (z.B. aus dem CVS generierte Packete). +# 8 : Erstellung des Packetes aus $TMPROOT wird unterdrückt. Dies ist bei +# manchen Sonderfällen möglich - wenn sich z.B. der Packetnamen nicht +# aus dem Namen des sourcearchives ableiten lässt. Packet sollte in +# so einem Fall in der postmk() Funktion erstellt werden. +# 16 : Packet wird nicht installiert. Bei Packeten wie tar oder bash kann +# die installation mittelst installpkg probleme machen. +# 32 : Dependics File so erzeugen, das die Abhängigkeiten bei der installation +# erfüllt sein müssen. installpkg bricht in so einem fall bei fehlenden +# packeten die installation ab, und gibt nicht "nur" warnmeldungen aus. +# Wichtig bei packeten mit postinstallroutine, die software aus dem +# frisch installierten Packet verwendet (wie z.B. postgresql) +# 64 : sourcetree aufräumen nach packeterstellung unterbinden. +# 128 : Patches zu den Sourcen nicht einspielen - Module muss sich darum +# kümmern + +#Module zur Erstellung des Packetes: raptor2 +#Quelle der Source Archive: http://download.librdf.org/source/ +#Kurzbeschreibung: +# libraptor for parsing and serializing RDF syntaxes +# +#Letzte Änderung von: $Author: kueller $ +#Datum der letzten Änderung: $Date: $ +#Version der Datei: $Rev: 5984 $ +# + +SRCPATH=GuiBased/Lib + +premk() { + echo "Nothing to do for premk()" +} + +mk32() { + CC="gcc $BUILDOPTIONS32" \ + CXX="g++ $BUILDOPTIONS32" \ + USE_ARCH=32 \ + ./configure --prefix=/usr + make -j $NUMCPU + make -j $NUMCPU DESTDIR=$TMPROOT install + make distclean + mv $TMPROOT/usr/bin/raptor-config{,-32} +} + +mk() { + CC="gcc $BUILDOPTIONS" \ + CXX="g++ $BUILDOPTIONS" \ + USE_ARCH=$UARCH \ + ./configure --libdir=\${prefix}/${LIBDIR} \ + --prefix=/usr + make -j $NUMCPU + make -j $NUMCPU DESTDIR=$TMPROOT install +} + +postmk() { + if [ "$MK64BIT" == "true" ]; then + mv $TMPROOT/usr/bin/raptor-config{,-64} + ln -s multiarch_wrapper $TMPROOT/usr/bin/raptor-config + fi +} diff --git a/SysBuild/guibased/rasqal b/SysBuild/guibased/rasqal index f79f2d0..5ddb1ef 100644 --- a/SysBuild/guibased/rasqal +++ b/SysBuild/guibased/rasqal @@ -85,13 +85,10 @@ mk32() { } mk() { - if [ "$MK64BIT" == "true" ]; then - ADDOPTIONS="--libdir=\${prefix}/lib64" - fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ USE_ARCH=$UARCH \ - ./configure $ADDOPTIONS \ + ./configure --libdir=\${prefix}/${LIBDIR} \ --prefix=/usr make -j $NUMCPU make -j $NUMCPU DESTDIR=$TMPROOT install diff --git a/SysBuild/guibased/redland b/SysBuild/guibased/redland index 0fb1bed..0bf80a7 100644 --- a/SysBuild/guibased/redland +++ b/SysBuild/guibased/redland @@ -93,7 +93,7 @@ mk() { CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ USE_ARCH=$UARCH \ - ./configure $ADDOPTIONS \ + ./configure --libdir=\${prefix}/${LIBDIR} \ --prefix=/usr \ --with-postgresql=no \ --with-virtuoso=no diff --git a/SysBuild/guibased/sane-frontends b/SysBuild/guibased/sane-frontends index 5071eca..3d1dca6 100644 --- a/SysBuild/guibased/sane-frontends +++ b/SysBuild/guibased/sane-frontends @@ -86,6 +86,7 @@ mk() { # Den \ nicht vergessen ! CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ + LDFLAGS="-L/usr/X11R7/${LIBDIR}" \ ./configure --target=$TARGET \ --prefix=/usr \ --exec-prefix=/usr \ diff --git a/SysBuild/multimedia/alsa-lib b/SysBuild/multimedia/alsa-lib index 1688775..c44c03e 100644 --- a/SysBuild/multimedia/alsa-lib +++ b/SysBuild/multimedia/alsa-lib @@ -58,7 +58,7 @@ # 128 : Patches zu den Sourcen nicht einspielen - Module muss sich darum # kümmern -#Module zur Erstellung des Packetes: +#Module zur Erstellung des Packetes: alsa-lib #Quelle der Source Archive: http://alsa-project.org #Kurzbeschreibung: #alsa sound libraries diff --git a/SysBuild/multimedia/alsa-plugins b/SysBuild/multimedia/alsa-plugins index 6cd780c..205d246 100644 --- a/SysBuild/multimedia/alsa-plugins +++ b/SysBuild/multimedia/alsa-plugins @@ -78,13 +78,10 @@ premk() { } mk() { - if [ "$MK64BIT" == "true" ]; then - ADDOPTIONS="--libdir=\${prefix}/lib64" - fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ ./configure --target=$TARGET \ - $ADDOPTIONS \ + --libdir=\${prefix}/${LIBDIR} \ --prefix=/usr \ --disable-xmlto make -j $NUMCPU diff --git a/SysBuild/multimedia/alsa-utils b/SysBuild/multimedia/alsa-utils index 26e0322..676eedc 100644 --- a/SysBuild/multimedia/alsa-utils +++ b/SysBuild/multimedia/alsa-utils @@ -58,13 +58,13 @@ # 128 : Patches zu den Sourcen nicht einspielen - Module muss sich darum # kümmern -#Module zur Erstellung des Packetes: -#Quelle der Source Archive: +#Module zur Erstellung des Packetes: alsa-utils +#Quelle der Source Archive: http://alsa-project.org #ACHTUNG: Beschreibung nicht in der gleichen Zeile beginnen! #Neue Zeile anfangen. sonste funktioniert die metadaten erzeugung #nicht! #Kurzbeschreibung: -# +#Tools zur Einrichtung und Konfiguration von alsa soundtreibern # #Letzte Änderung von: $Author$ #Datum der letzten Änderung: $Date: $ diff --git a/SysBuild/multimedia/farsight2 b/SysBuild/multimedia/farsight2 index d56de1c..684f94b 100644 --- a/SysBuild/multimedia/farsight2 +++ b/SysBuild/multimedia/farsight2 @@ -89,13 +89,10 @@ mk32() { } mk() { - if [ "$MK64BIT" == "true" ]; then - ADDOPTIONS="--libdir=\${prefix}/lib64" - fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ USE_ARCH=$UARCH \ - ./configure $ADDOPTIONS \ + ./configure --libdir=\${prefix}/${LIBDIR} \ --prefix=/usr \ --sysconfdir=/etc make -j $NUMCPU diff --git a/SysBuild/multimedia/gst-plugins-good b/SysBuild/multimedia/gst-plugins-good index 96406e0..6eca45b 100644 --- a/SysBuild/multimedia/gst-plugins-good +++ b/SysBuild/multimedia/gst-plugins-good @@ -85,9 +85,9 @@ mk32() { ../gst-plugins-good*/configure --build=$TARGET32 \ --prefix=/usr \ --libexecdir=/usr/lib/gst-plugins - make -k -j $NUMCPU LDEMULATION=elf32_i386 + make -j $NUMCPU LDEMULATION=elf32_i386 make -j $NUMCPU LDEMULATION=elf32_i386 install - make -k -j $NUMCPU LDEMULATION=elf32_i386 DESTDIR=$TMPROOT install + make -j $NUMCPU LDEMULATION=elf32_i386 DESTDIR=$TMPROOT install cd ../gst-plugins-good* rm -r ../build-gstplugins mkdir ../build-gstplugins @@ -95,15 +95,13 @@ mk32() { } mk() { - if [ "$MK64BIT" == "true" ]; then - ADDOPTIONS="--libdir=\${prefix}/lib64" - fi CC="gcc $BUILDOPTIONS -fPIC" \ CXX="g++ $BUILDOPTIONS -fPIC" \ + LDFLAGS="-L/${LIBDIR} -L/usr/X11R7/${LIBDIR} -L/usr/${LIBDIR} -L/opt/gnome/${LIBDIR}" \ USE_ARCH=$UARCH \ ../gst-plugins-good*/configure --prefix=/usr \ - $ADDOPTIONS \ - --libexecdir=/usr/$LIBDIR/gst-plugins + --libdir=\${prefix}/${LIBDIR} \ + --libexecdir=/usr/$LIBDIR/gst-plugins make -j $NUMCPU make -j $NUMCPU install make -j $NUMCPU DESTDIR=$TMPROOT install diff --git a/SysBuild/multimedia/gst-python b/SysBuild/multimedia/gst-python index 734bb5f..0272cc9 100644 --- a/SysBuild/multimedia/gst-python +++ b/SysBuild/multimedia/gst-python @@ -89,14 +89,11 @@ mk32() { } mk() { - if [ "$MK64BIT" == "true" ]; then - ADDOPTIONS="--libdir=\${prefix}/lib64" - fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ USE_ARCH=$UARCH \ LDFLAGS="-L/usr/$LIBDIR -L/usr/X11R7/$LIBDIR" \ - ./configure $ADDOPTIONS \ + ./configure --libdir=\${prefix}/${LIBDIR} \ --prefix=/usr \ --sysconfdir=/etc make -j $NUMCPU diff --git a/SysBuild/multimedia/jackmaster b/SysBuild/multimedia/jackmaster index caf1dc4..7cb5f08 100644 --- a/SysBuild/multimedia/jackmaster +++ b/SysBuild/multimedia/jackmaster @@ -85,13 +85,10 @@ mk32() { } mk() { - if [ "$MK64BIT" == "true" ]; then - ADDOPTIONS="--libdir=\${prefix}/lib64" - fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ USE_ARCH=$UARCH \ - ./configure $ADDOPTIONS \ + ./configure --libdir=\${prefix}/${LIBDIR} \ --prefix=/usr/X11R7 if [ "$MK64BIT" == "true" ]; then sed -i "s/athlon-xp/k8/" src/Makefile diff --git a/SysBuild/multimedia/liblrdf b/SysBuild/multimedia/liblrdf index b07e134..aa81b76 100644 --- a/SysBuild/multimedia/liblrdf +++ b/SysBuild/multimedia/liblrdf @@ -88,13 +88,10 @@ mk32() { } mk() { - if [ "$MK64BIT" == "true" ]; then - ADDOPTIONS="--libdir=\${prefix}/lib64" - fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ USE_ARCH=$UARCH \ - ./configure $ADDOPTIONS \ + ./configure --libdir=\${prefix}/${LIBDIR} \ --prefix=/usr make -j $NUMCPU make -j $NUMCPU DESTDIR=$TMPROOT install diff --git a/SysBuild/multimedia/linphone b/SysBuild/multimedia/linphone index 438fe29..78b908b 100644 --- a/SysBuild/multimedia/linphone +++ b/SysBuild/multimedia/linphone @@ -77,6 +77,7 @@ premk() { mk32() { CC="gcc $BUILDOPTIONS32" \ CXX="g++ $BUILDOPTIONS32" \ + LDFLAGS="-L/usr/X11R7/lib" \ USE_ARCH=32 \ ./configure --prefix=/usr \ --libexecdir=/usr/lib/linphone @@ -86,13 +87,11 @@ mk32() { } mk() { - if [ "$MK64BIT" == "true" ]; then - ADDOPTIONS="--libdir=\${prefix}/lib64" - fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ + LDFLAGS="-L/usr/X11R7/${LIBDIR}" \ USE_ARCH=$UARCH \ - ./configure $ADDOPTIONS \ + ./configure --libdir=\${prefix}/${LIBDIR} \ --prefix=/usr \ --libexecdir=/usr/$LIBDIR/linphone make -j $NUMCPU diff --git a/SysBuild/multimedia/lv2core b/SysBuild/multimedia/lv2core index 4138d22..5a0f6e9 100644 --- a/SysBuild/multimedia/lv2core +++ b/SysBuild/multimedia/lv2core @@ -85,13 +85,10 @@ mk32() { } mk() { - if [ "$MK64BIT" == "true" ]; then - ADDOPTIONS="--libdir=\${prefix}/lib64" - fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ USE_ARCH=$UARCH \ - ./configure $ADDOPTIONS \ + ./configure --libdir=\${prefix}/${LIBDIR} \ --prefix=/usr make -j $NUMCPU make -j $NUMCPU DESTDIR=$TMPROOT install diff --git a/SysBuild/multimedia/minidlna b/SysBuild/multimedia/minidlna index e18bfef..a49bf13 100644 --- a/SysBuild/multimedia/minidlna +++ b/SysBuild/multimedia/minidlna @@ -75,13 +75,11 @@ premk() { } mk() { - if [ "$MK64BIT" == "true" ]; then - ADDOPTIONS="--libdir=\${prefix}/lib64" - fi make CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ - LDFLAGS="-liconv" - make -j $NUMCPU PREFIX=$TMPROOT install + LDFLAGS="-liconv" \ + -j $NUMCPU + make -j $NUMCPU DESTDIR=$TMPROOT install } postmk() { diff --git a/SysBuild/multimedia/mjpegtools b/SysBuild/multimedia/mjpegtools index 533a637..ffa5606 100644 --- a/SysBuild/multimedia/mjpegtools +++ b/SysBuild/multimedia/mjpegtools @@ -93,15 +93,12 @@ mk32() { } mk() { - if [ "$MK64BIT" == "true" ]; then - export LDFLAGS="-L/lib64 -L/usr/lib64 -L/usr/X11R7/lib64 -L/opt/gnome/lib64" - ADDOPTIONS="--libdir=\${prefix}/lib64" - fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ + LDFLAGS="-L/${LIBDIR} -L/usr/${LIBDIR} -L/usr/X11R7/${LIBDIR} -L/opt/gnome/${LIBDIR}" \ USE_ARCH=$UARCH \ ./configure --prefix=/usr \ - $ADDOPTIONS \ + --libdir=\${prefix}/${LIBDIR} \ --with-gnu-ld \ --with-x make -j $NUMCPU diff --git a/SysBuild/multimedia/mplayer-export b/SysBuild/multimedia/mplayer-export index ae0d080..054ab57 100644 --- a/SysBuild/multimedia/mplayer-export +++ b/SysBuild/multimedia/mplayer-export @@ -94,15 +94,14 @@ mk() { --enable-menu \ --enable-fribidi \ --enable-rpath \ - --enable-xmms \ --with-vidix-drivers=cyberblade,ivtv,mach64,mga,mga_crtc2,nvidia,pm2,pm3,radeon,rage128,s3,sis,unichrome \ --enable-gl \ --enable-runtime-cpudetection - if [ "$MK64BIT" == "true" ]; then - sed -i "s/\(EXTRALIBS.*\)\(\/libxmms.so.1\)/\164\2 -lfribidi/" config.mak - else - sed -i "s/\(EXTRALIBS.*\)\(\/libxmms.so.1\)/\1\2 -lfribidi/" config.mak - fi + #if [ "$MK64BIT" == "true" ]; then + #sed -i "s/\(EXTRALIBS.*\)\(\/libxmms.so.1\)/\164\2 -lfribidi/" config.mak + #else + #sed -i "s/\(EXTRALIBS.*\)\(\/libxmms.so.1\)/\1\2 -lfribidi/" config.mak + #fi make -j $NUMCPU make CFLAGS="-L/usr/$LIBDIR -L/usr/X11R7/$LIBDIR -L/opt/gnome/$LIBDIR" \ DESTDIR=$TMPROOT install diff --git a/SysBuild/multimedia/pygame b/SysBuild/multimedia/pygame index 52e0a81..90247f2 100644 --- a/SysBuild/multimedia/pygame +++ b/SysBuild/multimedia/pygame @@ -77,6 +77,8 @@ premk() { } mk32() { + yes|USE_ARCH=$UARCH LDFLAGS="-L/lib -L/usr/lib -L/usr/X11R7/lib" \ + python config.py yes|USE_ARCH=$UARCH LDFLAGS="-L/lib -L/usr/lib -L/usr/X11R7/lib" \ python setup.py install --root $TMPROOT cd .. @@ -86,7 +88,9 @@ mk32() { } mk() { - yes|USE_ARCH=$UARCH LDFLAGS="-L/lib64 -L/usr/lib64 -L/usr/X11R7/lib64" \ + yes|USE_ARCH=$UARCH LDFLAGS="-L/${LIBDIR} -L/usr/${LIBDIR} -L/usr/X11R7/${LIBDIR}" \ + python config.py + yes|USE_ARCH=$UARCH LDFLAGS="-L/${LIBDIR} -L/usr/${LIBDIR} -L/usr/X11R7/${LIBDIR}" \ python setup.py install --root $TMPROOT } diff --git a/SysBuild/multimedia/qjackctl b/SysBuild/multimedia/qjackctl index a7ee934..b27eb36 100644 --- a/SysBuild/multimedia/qjackctl +++ b/SysBuild/multimedia/qjackctl @@ -79,13 +79,11 @@ premk() { } mk() { - if [ "$MK64BIT" == "true" ]; then - ADDOPTIONS="--libdir=\${prefix}/lib64" - fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ LDFLAGS="-L/$LIBDIR -L/usr/$LIBDIR -L/usr/X11R7/$LIBDIR -L/opt/qt-4/$LIBDIR" \ - ./configure $ADDOPTIONS \ + QMAKESPEC=linux-g++-$UARCH \ + ./configure --libdir=\${prefix}/${LIBDIR} \ --prefix=/usr/X11R7 \ --with-qt=/opt/qt-4 make -j $NUMCPU diff --git a/SysBuild/multimedia/smpeg b/SysBuild/multimedia/smpeg index 56a8836..fc39bf4 100644 --- a/SysBuild/multimedia/smpeg +++ b/SysBuild/multimedia/smpeg @@ -89,14 +89,12 @@ mk32() { } mk() { - if [ "$MK64BIT" == "true" ]; then - ADDOPTIONS="--libdir=/usr/X11R7/lib64" - fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ + LDFLAGS="-L/usr/X11R7/${LIBDIR}" \ USE_ARCH=$UARCH \ ./configure --target=$TARGET \ - $ADDOPTIONS \ + --libdir=/usr/X11R7/${LIBDIR} \ --prefix=/usr/X11R7 && make -j $NUMCPU && make -j $NUMCPU DESTDIR=$TMPROOT install diff --git a/SysBuild/multimedia/sox b/SysBuild/multimedia/sox index 85d6e88..2491320 100644 --- a/SysBuild/multimedia/sox +++ b/SysBuild/multimedia/sox @@ -91,6 +91,7 @@ mk() { CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ USE_ARCH=$UARCH \ + LDFLAGS="-L/usr/${LIBDIR} -L/usr/X11R7/${LIBDIR}" \ ./configure --build=$TARGET \ --prefix=/usr \ --libdir=/usr/$LIBDIR diff --git a/SysBuild/network/avahi b/SysBuild/network/avahi index 36c65ab..807cbac 100644 --- a/SysBuild/network/avahi +++ b/SysBuild/network/avahi @@ -85,20 +85,18 @@ mk32() { --with-distro=none \ --disable-qt3 \ --disable-gdbm \ - --disable-mono + --disable-mono \ + --enable-introspection=no make -j $NUMCPU make -j $NUMCPU DESTDIR=$TMPROOT install make distclean } mk() { - if [ "$MK64BIT" == "true" ]; then - ADDOPTIONS="--libdir=\${prefix}/lib64" - fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ USE_ARCH=$UARCH \ - ./configure $ADDOPTIONS \ + ./configure --libdir=${prefix}/${LIBDIR} \ --prefix=/usr \ --with-distro=none \ --disable-qt3 \ diff --git a/SysBuild/network/courier b/SysBuild/network/courier index 4c88bd3..974ebc8 100644 --- a/SysBuild/network/courier +++ b/SysBuild/network/courier @@ -76,9 +76,6 @@ premk() { } mk() { - if [ "$MK64BIT" == "true" ]; then - ADDOPTIONS="--libdir=/opt/courier/lib64" - fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ LDFLAGS="-L/usr/lib64" \ @@ -86,7 +83,7 @@ mk() { ./configure --build=$TARGET \ --sysconfdir=/etc/courier \ --disable-root-check \ - $ADDOPTIONS \ + --libdir=/opt/courier/${LIBDIR} \ --prefix=/opt/courier make -j $NUMCPU make DESTDIR=$TMPROOT install diff --git a/SysBuild/network/courier-authlib b/SysBuild/network/courier-authlib index 5d7ab22..6979f8d 100644 --- a/SysBuild/network/courier-authlib +++ b/SysBuild/network/courier-authlib @@ -83,8 +83,8 @@ mk32() { ./configure --build=$TARGET32 \ --with-authuserdb \ --with-authmysql \ - --with-mysql-libs=/opt/MySQL/lib/mysql \ - --with-mysql-includes=/opt/MySQL/include/mysql \ + --with-mysql-libs=/opt/MySQL/lib \ + --with-mysql-includes=/opt/MySQL/include \ --sysconfdir=/etc/courier \ --libexecdir=/usr/sbin \ --prefix=/usr @@ -97,9 +97,6 @@ mk32() { } mk() { - if [ "$MK64BIT" == "true" ]; then - ADDOPTIONS="--libdir=/usr/lib64" - fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ USE_ARCH=$UARCH \ @@ -107,10 +104,10 @@ mk() { ./configure --build=$TARGET \ --with-authuserdb \ --with-authmysql \ - --with-mysql-libs=/opt/MySQL/$LIBDIR/mysql \ - --with-mysql-includes=/opt/MySQL/include/mysql \ + --with-mysql-libs=/opt/MySQL/$LIBDIR \ + --with-mysql-includes=/opt/MySQL/include \ --sysconfdir=/etc/courier \ - $ADDOPTIONS \ + --libdir=/usr/${LIBDIR} \ --libexecdir=/usr/sbin \ --prefix=/usr make -j $NUMCPU diff --git a/SysBuild/network/courier-imap b/SysBuild/network/courier-imap index 5f55416..38debc7 100644 --- a/SysBuild/network/courier-imap +++ b/SysBuild/network/courier-imap @@ -76,9 +76,6 @@ premk() { } mk() { - if [ "$MK64BIT" == "true" ]; then - ADDOPTIONS="--libdir=/opt/courier/lib64" - fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ LDFLAGS="-L/usr/lib64" \ @@ -86,7 +83,7 @@ mk() { ./configure --build=$TARGET \ --sysconfdir=/etc/courier \ --disable-root-check \ - $ADDOPTIONS \ + --libdir=/opt/courier/${LIBDIR} \ --prefix=/opt/courier make -j $NUMCPU make DESTDIR=$TMPROOT install diff --git a/SysBuild/network/dspam b/SysBuild/network/dspam index 977030f..18af24a 100644 --- a/SysBuild/network/dspam +++ b/SysBuild/network/dspam @@ -83,8 +83,8 @@ mk32() { ./configure --target=$TARGET \ --with-dspam-group=daemon \ --with-storage-driver=mysql_drv,pgsql_drv,hash_drv \ - --with-mysql-includes=/opt/MySQL/include/mysql \ - --with-mysql-libraries=/opt/MySQL/lib/mysql \ + --with-mysql-includes=/opt/MySQL/include \ + --with-mysql-libraries=/opt/MySQL/lib \ --with-pgsql-includes=/opt/PostgreSQL/include \ --with-pgsql-libraries=/opt/PostgreSQL/lib \ --enable-delivery-to-stdout \ @@ -103,8 +103,8 @@ mk32() { --sysconfdir=/etc \ --libdir=/opt/dspam/lib \ --prefix=/opt/dspam - make -j $NUMCPU - make -j $NUMCPU DESTDIR=$TMPROOT install + make + make DESTDIR=$TMPROOT install make distclean } @@ -116,8 +116,8 @@ mk() { ./configure --target=$TARGET \ --with-dspam-group=daemon \ --with-storage-driver=mysql_drv,pgsql_drv,hash_drv \ - --with-mysql-includes=/opt/MySQL/include/mysql \ - --with-mysql-libraries=/opt/MySQL/$LIBDIR/mysql \ + --with-mysql-includes=/opt/MySQL/include \ + --with-mysql-libraries=/opt/MySQL/$LIBDIR \ --with-pgsql-includes=/opt/PostgreSQL/include \ --with-pgsql-libraries=/opt/PostgreSQL/$LIBDIR \ --enable-delivery-to-stdout \ @@ -136,11 +136,8 @@ mk() { --sysconfdir=/etc \ --libdir=/opt/dspam/$LIBDIR \ --prefix=/opt/dspam - -# --enable-verbose-debug only for test systems - - make -j $NUMCPU - make -j $NUMCPU DESTDIR=$TMPROOT install + make + make DESTDIR=$TMPROOT install } postmk() { diff --git a/SysBuild/network/ethereal b/SysBuild/network/ethereal index c282a3c..2b4cff4 100644 --- a/SysBuild/network/ethereal +++ b/SysBuild/network/ethereal @@ -82,7 +82,7 @@ mk32() { ./configure --build=$TARGET32 \ --bindir=/usr/X11R7/bin \ --sbindir=/usr/X11R7/sbin \ - --libexecdir=/usr/X11R7/libexec \ + --libexecdir=/usr/X11R7/lib/ethereal \ --datadir=/usr/X11R7/share \ --sysconfdir=/etc/sysconfig \ --localstatedir=/var \ @@ -103,7 +103,7 @@ mk() { ./configure --build=$TARGET \ --bindir=/usr/X11R7/bin \ --sbindir=/usr/X11R7/sbin \ - --libexecdir=/usr/X11R7/libexec \ + --libexecdir=/usr/X11R7/${LIBDIR}/ethereal \ --datadir=/usr/X11R7/share \ --sysconfdir=/etc/sysconfig \ --localstatedir=/var \ diff --git a/SysBuild/network/firefox b/SysBuild/network/firefox index 51ae083..27d0bf6 100644 --- a/SysBuild/network/firefox +++ b/SysBuild/network/firefox @@ -101,7 +101,6 @@ mk32() { --with-qt-dir=/opt/qt-4 \ --enable-nativ-uconf \ --enable-image-decoders=all \ - --enable-system-sqlite \ --enable-safe-browsing \ --enable-url-classifier \ --enable-svg \ @@ -121,32 +120,28 @@ mk32() { } mk() { - if [ "$MK64BIT" == "true" ]; then - ADDOPTIONS="--libdir=\${prefix}/lib64" - fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ - LDFLAGS="-L/$LIBDIR -L/usr/$LIBDIR -L/usr/X11R7/$LIBDIR" \ + LDFLAGS="-L/${LIBDIR} -L/usr/${LIBDIR} -L/usr/X11R7/${LIBDIR}" \ USE_ARCH=$UARCH \ ../mozilla*/configure --build=$TARGET \ --prefix=/opt/firefox \ --libexecdir=/opt/firefox/bin \ --sysconfdir=/etc/sysconfig/firefox \ - $ADDOPTIONS \ + --libdir=\${prefix}/${LIBDIR} \ --x-includes=/usr/X11R7/include \ - --x-libraries=/usr/X11R7/$LIBDIR \ + --x-libraries=/usr/X11R7/${LIBDIR} \ --with-x \ --with-system-jpeg \ --with-system-zlib \ --with-system-bz2 \ - --with-java-include-path=/usr/$LIBDIR/jdk/include \ - --with-java-bin-path=/usr/$LIBDIR/jdk/bin \ + --with-java-include-path=/usr/${LIBDIR}/jdk/include \ + --with-java-bin-path=/usr/${LIBDIR}/jdk/bin \ --enable-application=browser \ --enable-startup-notification \ --with-qt-dir=/opt/qt-4 \ --enable-nativ-uconf \ --enable-image-decoders=all \ - --enable-system-sqlite \ --enable-safe-browsing \ --enable-url-classifier \ --enable-svg \ diff --git a/SysBuild/network/gftp b/SysBuild/network/gftp index 16f0aff..0d21c1c 100644 --- a/SysBuild/network/gftp +++ b/SysBuild/network/gftp @@ -79,14 +79,11 @@ premk() { } mk() { - if [ "$MK64BIT" == "true" ]; then - ADDOPTIONS="--libdir=\${prefix}/lib64" - fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ USE_ARCH=$UARCH \ ./configure --target=$TARGET \ - $ADDOPTIONS \ + --libdir=\${prefix}/${LIBDIR} \ --prefix=/usr/X11R7 sed -i "s/-lssl/\/usr\/$LIBDIR\/libssl.a/g" src/gtk/Makefile make -j $NUMCPU diff --git a/SysBuild/network/httpd b/SysBuild/network/httpd index 1c1b571..4f9ed8d 100644 --- a/SysBuild/network/httpd +++ b/SysBuild/network/httpd @@ -99,12 +99,9 @@ mk32() { } mk() { - if [ "$MK64BIT" == "true" ]; then - ADDOPTIONS="--libdir=/opt/apache2/lib64" - export LDFLAGS="-L/usr/lib64" - fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ + LDFLAGS="-L/usr/lib -L/usr/X11R7/${LIBDIR}" \ USE_ARCH=$UARCH \ ./configure --build=$TARGET \ --sysconfdir=/etc/httpd \ @@ -117,7 +114,7 @@ mk() { --with-apxs2=/opt/apache2/bin/apxs \ --with-mysql=/opt/MySQL/ \ --with-pgsql=/opt/PostgreSQL \ - $ADDOPTIONS \ + --libdir=/opt/apache2/${LIBDIR} \ --prefix=/opt/apache2 make -j $NUMCPU make -j $NUMCPU DESTDIR=$TMPROOT install diff --git a/SysBuild/network/jabberd b/SysBuild/network/jabberd index c535719..ad6f208 100644 --- a/SysBuild/network/jabberd +++ b/SysBuild/network/jabberd @@ -76,18 +76,15 @@ premk() { } mk() { - if [ "$MK64BIT" == "true" ]; then - ADDOPTIONS="--libdir=\${prefix}/lib64" - fi LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/$LIBDIR/sasl2 \ CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ - LIBS="-L/opt/MySQL/$LIBDIR/mysql -lmysqlclient \ + LIBS="-L/opt/MySQL/$LIBDIR -lmysqlclient \ -L/usr/$LIBDIR/sasl2 -lgssapiv2 -lgssapi_krb5" \ ./configure --target=$TARGET \ - $ADDOPTIONS \ + --libdir=\${prefix}/${LIBDIR} \ --with-extra-include-path=/opt/MySQL/include/mysql/:/opt/PostgreSQL/include/ \ - --with-extra-library-path=/opt/MySQL/$LIBDIR/mysql/:/opt/PostgreSQL/$LIBDIR/ \ + --with-extra-library-path=/opt/MySQL/$LIBDIR/:/opt/PostgreSQL/$LIBDIR/ \ --localstatedir=/var \ --enable-ssl \ --enable-mysql \ diff --git a/SysBuild/network/sqwebmail b/SysBuild/network/sqwebmail index 72c917e..c8000ce 100644 --- a/SysBuild/network/sqwebmail +++ b/SysBuild/network/sqwebmail @@ -76,9 +76,6 @@ premk() { } mk() { - if [ "$MK64BIT" == "true" ]; then - ADDOPTIONS="--libdir=/opt/courier/lib64" - fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ LDFLAGS="-L/usr/lib64" \ @@ -86,7 +83,7 @@ mk() { ./configure --build=$TARGET \ --sysconfdir=/etc/courier \ --disable-root-check \ - $ADDOPTIONS \ + --libdir=/opt/courier/${LIBDIR} \ --prefix=/opt/courier \ --enable-cgibindir=/opt/apache2/cgi-bin \ --enable-imagedir=/opt/apache2/htdocs diff --git a/SysBuild/network/thunderbird b/SysBuild/network/thunderbird index 4f0b234..7a6f777 100644 --- a/SysBuild/network/thunderbird +++ b/SysBuild/network/thunderbird @@ -69,138 +69,24 @@ # # +(( MKPKG = $MKPKG | 4 )) SRCPATH=Network/Clients -SRCDIR=mozilla +SRCDIR=comm premk() { - mkdir ../build-thunderbird - cd ../build-thunderbird -} - -mk32() { - NSPR_CONFIG=/usr/X11R7/bin/nspr-config-32 \ - NSS_CONFIG=/usr/X11R7/bin/nss-config-32 \ - FT2_CONFIG=/usr/X11R7/bin/freetype-config-32 \ - CC="gcc $BUILDOPTIONS32 \ - -I/usr/X11R7/include/nss \ - -I/usr/X11R7/include/nspr \ - -I/usr/X11R7/include/cairo \ - -lX11 \ - -lXrender \ - -L/usr/X11R7/lib" \ - CXX="g++ $BUILDOPTIONS32 \ - -I/usr/X11R7/include/nspr \ - -I/usr/X11R7/include/nss \ - -I/usr/X11R7/include/cairo \ - -lX11 \ - -lXrender \ - -L/usr/X11R7/lib" \ - LDFLAGS="-L/lib -L/usr/lib -L/usr/X11R7/lib" \ - USE_ARCH=$UARCH \ - ../mozilla*/configure --host=$TARGET32 \ - --build=$TARGET32 \ - --prefix=/opt/thunderbird \ - --with-nspr-prefix=/usr/X11R7 \ - --with-nss-prefix=/usr/X11R7 \ - --with-system-nspr \ - --with-system-nss \ - --with-system-bz2 \ - --with-system-jpeg \ - --with-system-png \ - --with-system-zlib \ - --disable-debug \ - --disable-installer \ - --disable-xprint \ - --disable-tests \ - --enable-canvas \ - --enable-default-toolkit=gtk2 \ - --enable-safe-browsing \ - --enable-svg \ - --enable-system-cairo \ - --enable-system-sqlite \ - --host=$TARGET32 \ - --build=$TARGET32 \ - --enable-application=mail - make -j $NUMCPU OS_TEST=x86 - make -j $NUMCPU DESTDIR=$TMPROOT OS_TEST=x86 install - cd ../mozilla* - rm -r ../build-thunderbird - mkdir ../build-thunderbird - cd ../build-thunderbird + mkdir $TMPROOT/opt } mk() { - if [ "$MK64BIT" == "true" ]; then - ADDOPTIONS="--libdir=\${prefix}/lib64" + if [ $MK64BIT == "true" ]; then + UnPack $TMPROOT/opt $LFSSOURCE/$SRCPATH/miramar-64-*.tar.bz2 + else + UnPack $TMPROOT/opt $LFSSOURCE/$SRCPATH/miramar-32-*.tar.bz2 fi - USE_ARCH=$UARCH \ - NSPR_CONFIG=/usr/X11R7/bin/nspr-config \ - NSS_CONFIG=/usr/X11R7/bin/nss-config \ - FT2_CONFIG=/usr/X11R7/bin/freetype-config \ - CC="gcc $BUILDOPTIONS \ - -I/usr/X11R7/include/nss \ - -I/usr/X11R7/include/nspr \ - -I/usr/X11R7/include/cairo \ - -I/usr/$LIBDIR/glib-2.0/include \ - -lX11 \ - -lXrender \ - -L/usr/X11R7/$LIBDIR" \ - CXX="g++ $BUILDOPTIONS \ - -I/usr/X11R7/include/nspr \ - -I/usr/X11R7/include/nss \ - -I/usr/X11R7/include/cairo \ - -I/usr/$LIBDIR/glib-2.0/include \ - -lX11 \ - -lXrender \ - -L/usr/X11R7/$LIBDIR" \ - LDFLAGS="-L/$LIBDIR -L/usr/$LIBDIR -L/usr/X11R7/$LIBDIR" \ - ../mozilla*/configure --host=$TARGET \ - --build=$TARGET \ - --prefix=/opt/thunderbird \ - $ADDOPTIONS \ - --with-nspr-prefix=/usr/X11R7 \ - --with-nss-prefix=/usr/X11R7 \ - --with-system-nspr \ - --with-system-nss \ - --with-system-bz2 \ - --with-system-jpeg \ - --with-system-png \ - --with-system-zlib \ - --disable-debug \ - --disable-installer \ - --disable-xprint \ - --disable-tests \ - --enable-canvas \ - --enable-default-toolkit=gtk2 \ - --enable-safe-browsing \ - --enable-svg \ - --enable-system-cairo \ - --enable-system-sqlite \ - --host=$TARGET \ - --build=$TARGET \ - --enable-application=mail - make -j $NUMCPU - make -j $NUMCPU DESTDIR=$TMPROOT install } postmk() { GetSVN Viitor_thunderbird $TMPROOT - cd ../mozilla* - rm -r ../build-thunderbird - echo "pref(\"network.protocol-handler.app.http\", \"firefox\");" >>$TMPROOT/opt/thunderbird/lib/thunderbird*/defaults/pref/all-thunderbird.js - echo "pref(\"network.protocol-handler.app.https\", \"firefox\");" >>$TMPROOT/opt/thunderbird/lib/thunderbird*/defaults/pref/all-thunderbird.js - if [ "$MK64BIT" == "true" ]; then - cd $TMPROOT/opt/thunderbird/lib64 - ln -s thunderbird-[0-9]* thunderbird - cd - - cd $TMPROOT/opt/thunderbird/include - ln -s thunderbird* thunderbird - cd - - fi - cd $TMPROOT/opt/thunderbird/lib - ln -s thunderbird-[0-9]* thunderbird - cd - - cd $TMPROOT/opt/thunderbird/include - ln -s thunderbird* thunderbird - cd - + echo "pref(\"network.protocol-handler.app.http\", \"firefox\");" >>$TMPROOT/opt/thunderbird/defaults/pref/all-thunderbird.js + echo "pref(\"network.protocol-handler.app.https\", \"firefox\");" >>$TMPROOT/opt/thunderbird/defaults/pref/all-thunderbird.js } diff --git a/SysBuild/network/tightvnc b/SysBuild/network/tightvnc index c96708a..5a59d55 100644 --- a/SysBuild/network/tightvnc +++ b/SysBuild/network/tightvnc @@ -77,18 +77,16 @@ SRCDIR=vnc_unixsrc premk() { mkdir -p $TMPROOT/usr/X11R7/share/man ln -s X11R7 $TMPROOT/usr/X11R6 + cp /usr/X11R7/${LIBDIR}/X11/config/* /usr/local/include } mk() { - for i in libvncauth vncconnect vncpasswd vncviewer; do - cd $i - xmkmf - make -j 8 -k - cd .. - done + xmkmf + find . -type f -exec sed -i "s/-lXp$//" {} \; + make -j $NUMCPU World cd Xvnc ./configure - make -j 8 + make make DESTDIR=$TMPROOT install cd .. ./vncinstall $TMPROOT/usr/X11R7/bin $TMPROOT/usr/X11R7/share/man diff --git a/SysBuild/security/nss b/SysBuild/security/nss index 20bcd11..2c7aa67 100644 --- a/SysBuild/security/nss +++ b/SysBuild/security/nss @@ -72,36 +72,18 @@ SRCPATH=Security/Lib premk() { - cd mozilla/security/coreconf mkdir -p $TMPROOT/usr/X11R7/{include,bin,lib} + sed -i "s%\(CC.*= gcc\)%\1 -I /usr/X11R7/include/nspr%" mozilla/security/coreconf/Linux.mk + sed -i "s%^\(OS_LIBS.*$\)%\1 -L/usr/X11R7/lib%" mozilla/security/coreconf/Linux.mk + sed -i "s/clobber_nspr//" mozilla/security/nss/Makefile } mk32() { - export LIBDIR - BOPTS=$BUILDOPTIONS32 make - cd ../nss/lib/softoken - BOPTS=$BUILDOPTIONS32 make - cd ../freebl - BOPTS=$BUILDOPTIONS32 make - cd ../../ - BOPTS=$BUILDOPTIONS32 make - cd lib/freebl - BOPTS=$BUILDOPTIONS32 make - cd ../../ - BOPTS=$BUILDOPTIONS32 make - BOPTS=$BUILDOPTIONS32 make install - cd ../../dist/Linux* - cp -vpL bin/* $TMPROOT/usr/X11R7/bin - cp -vpL lib/* $TMPROOT/usr/X11R7/lib - cd ../../security/coreconf - make clean - cd ../nss - make clean - cd lib/softoken - make clean - cd ../freebl - make clean - cd ../../../coreconf + export BUILD_OPT=1 + make -C mozilla/security/nss nss_build_all + make -C mozilla/security/nss install + cp -vpL mozilla/dist/Linux*/bin/* $TMPROOT/usr/X11R7/bin + cp -vpL mozilla/dist/Linux*/lib/* $TMPROOT/usr/X11R7/lib mkdir -p $TMPROOT/usr/X11R7/lib/pkgconfig cat >>$TMPROOT/usr/X11R7/lib/pkgconfig/nss.pc <= 4.8 Libs: -L/usr/X11R7/lib/nss -lssl3 -lsmime3 -lnss3 -lnssutil3 Cflags: -I/usr/X11R7/include/nss EOF ln -sfv nss.pc $TMPROOT/usr/X11R7/lib/pkgconfig/mozilla-nss.pc chmod 644 $TMPROOT/usr/X11R7/lib/pkgconfig/*.pc + mv $TMPROOT/usr/X11R7/bin/nss-config{,-32} + make -C mozilla/security/nss nss_clean_all } mk() { - export LIBDIR - BOPTS=$BUILDOPTIONS make - cd ../nss/lib/softoken - BOPTS=$BUILDOPTIONS make - cd ../freebl - BOPTS=$BUILDOPTIONS make - cd ../../ - BOPTS=$BUILDOPTIONS make - cd lib/freebl - BOPTS=$BUILDOPTIONS make - cd ../../ - BOPTS=$BUILDOPTIONS make - BOPTS=$BUILDOPTIONS make install - cd ../../dist/Linux* - cp -vpL bin/* $TMPROOT/usr/X11R7/bin + export BUILD_OPT=1 if [ "$MK64BIT" == "true" ]; then + export USE_64=1 mkdir $TMPROOT/usr/X11R7/$LIBDIR + sed -i "s%^\(OS_LIBS.*$\)%\1 -L/usr/X11R7/lib64%" mozilla/security/coreconf/Linux.mk fi - cp -vpL lib/* $TMPROOT/usr/X11R7/$LIBDIR - cd .. - cp -rvpL public/nss $TMPROOT/usr/X11R7/include + make -C mozilla/security/nss nss_build_all + make -C mozilla/security/nss install + cp -vpL mozilla/dist/Linux*/lib/* $TMPROOT/usr/X11R7/$LIBDIR + cp -vpL mozilla/dist/Linux*/bin/* $TMPROOT/usr/X11R7/bin + cp -rvpL mozilla/dist/public/nss $TMPROOT/usr/X11R7/include mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/pkgconfig cat >>$TMPROOT/usr/X11R7/$LIBDIR/pkgconfig/nss.pc <> tools/build/v2/tools/gcc.jam && USE_ARCH=$UARCH \ - ./bootstrap.sh --with-bjam=/usr/bin/bjam \ - --with-toolset=gcc \ + ./bootstrap.sh --with-toolset=gcc \ --prefix=/usr \ - --libdir=/usr/$LIBDIR - bjam install --prefix=$TMPROOT/usr \ + --libdir=/usr/$LIBDIR \ + --with-python=/usr/bin/python + ./bjam install --prefix=$TMPROOT/usr \ --libdir=$TMPROOT/usr/$LIBDIR \ --includedir=$TMPROOT/usr/include } postmk() { - ln -sfnv boost-1_39/boost $TMPROOT/usr/include/boost ln -sfnv . $TMPROOT/usr/include/boost/boost } diff --git a/SysBuild/tools/foomatic-db b/SysBuild/tools/foomatic-db index c26ca4d..2fd31b7 100644 --- a/SysBuild/tools/foomatic-db +++ b/SysBuild/tools/foomatic-db @@ -80,9 +80,8 @@ mk() { ./configure --prefix=/usr \ --with-drivers=ALL ex -c '1,$ s/\(xml$\)/\1 \\/' -c ':wq' Makefile - /opt/make-3.80/bin/make DESTDIR=$TMPROOT install + make DESTDIR=$TMPROOT install mkdir -p $TMPROOT/usr/share/foomatic/db/source/PPD - tar -C /usr/share/foomatic/db/source/PPD -cf - .|tar -C $TMPROOT/usr/share/foomatic/db/source/PPD -xvf - } postmk() { diff --git a/SysBuild/tools/foomatic-filters b/SysBuild/tools/foomatic-filters index b8b86a4..df84de5 100644 --- a/SysBuild/tools/foomatic-filters +++ b/SysBuild/tools/foomatic-filters @@ -81,7 +81,6 @@ mk() { USE_ARCH=$UARCH \ ./configure --prefix=/usr \ --sysconfdir=/etc/cups - sed -i "s/-lm/-L\/usr\/X11R7\/$LIBDIR -lm -lespgs -lcups -ljpeg -lX11 -lpng -lcupsimage -lXt -liconv/" Makefile make make DESTDIR=$TMPROOT install } diff --git a/SysBuild/tools/hplip b/SysBuild/tools/hplip index cc17d77..6582be0 100644 --- a/SysBuild/tools/hplip +++ b/SysBuild/tools/hplip @@ -90,15 +90,12 @@ mk32() { } mk() { - if [ "$MK64BIT" == "true" ]; then - ADDOPTIONX="--libdir=\${prefix}/lib64" - fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ USE_ARCH=$UARCH \ ./configure --target=$TARGET \ --prefix=/usr \ - $ADDOPTIONS \ + --libdir=\${prefix}/${LIBDIR} \ --sysconfdir=/etc/sysconfig/hplip \ --enable-foomatic-ppd-install \ --enable-foomatic-drv-install \ diff --git a/SysBuild/tools/libmal b/SysBuild/tools/libmal index 1205fb5..e90dd0b 100644 --- a/SysBuild/tools/libmal +++ b/SysBuild/tools/libmal @@ -88,15 +88,12 @@ mk32() { } mk() { - if [ "$MK64BIT" == "true" ]; then - ADDOPTIONS="--libdir=/usr/lib64" - export LDFLAGS="-L/usr/lib64" - fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ + LDFLAGS="-L/usr/${LIBDIR}" \ USE_ARCH=$UARCH \ ./configure --host=$TARGET \ - $ADDOPTIONS \ + --libdir=/usr/${LIBDIR} \ --prefix=/usr make -j $NUMCPU make -j $NUMCPU DESTDIR=$TMPROOT install diff --git a/SysBuild/tools/mtools b/SysBuild/tools/mtools index 84b0ed0..63c0e78 100644 --- a/SysBuild/tools/mtools +++ b/SysBuild/tools/mtools @@ -78,6 +78,7 @@ premk() { mk() { CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ + LDFLAGS="-liconv" \ USE_ARCH=$UARCH \ ./configure --host=$TARGET \ --prefix=/usr diff --git a/SysBuild/tools/nut b/SysBuild/tools/nut index dd24a9d..ece13f7 100644 --- a/SysBuild/tools/nut +++ b/SysBuild/tools/nut @@ -93,13 +93,10 @@ mk32() { } mk() { - if [ "$MK64BIT" == "true" ]; then - ADDOPTIONS="--libdir=\${prefix}/lib64" - fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ USE_ARCH=$UARCH \ - ./configure $ADDOPTIONS \ + ./configure --libdir=\${prefix}/${LIBDIR} \ --prefix=/usr \ --sysconfdir=/etc/sysconfig/nut \ --enable-strip \ diff --git a/SysBuild/tools/pilot-link b/SysBuild/tools/pilot-link index 24bdd17..abfbf8e 100644 --- a/SysBuild/tools/pilot-link +++ b/SysBuild/tools/pilot-link @@ -91,17 +91,14 @@ mk32() { } mk() { - if [ "$MK64BIT" == "true" ]; then - ADDOPTIONS="--libdir=/usr/lib64" - export LDFLAGS="-L/usr/lib64" - fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ USE_ARCH=$UARCH \ CFLAGS="$BUILDOPTIONS" \ CPPFLAGS="$BUILDOPTIONS" \ + LDFLAGS="-L/usr/${LIBDIR}" \ ./configure --host=$TARGET \ - $ADDOPTIONS \ + --libdir=/usr/${LIBDIR} \ --prefix=/usr make -j $NUMCPU make DESTDIR=$TMPROOT install diff --git a/SysBuild/tools/rarian b/SysBuild/tools/rarian index a3f2ff0..69d70b3 100644 --- a/SysBuild/tools/rarian +++ b/SysBuild/tools/rarian @@ -89,13 +89,10 @@ mk32() { } mk() { - if [ "$MK64BIT" == "true" ]; then - ADDOPTIONS="--libdir=\${prefix}/lib64" - fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ USE_ARCH=$UARCH \ - ./configure $ADDOPTIONS \ + ./configure --libdir=\${prefix}/${LIBDIR} \ --prefix=/usr \ --localstatedir=/var make -j $NUMCPU diff --git a/SysBuild/tools/rpm b/SysBuild/tools/rpm index 3c1890c..adf8852 100644 --- a/SysBuild/tools/rpm +++ b/SysBuild/tools/rpm @@ -84,10 +84,12 @@ premk() { mk32() { CC="gcc $BUILDOPTIONS32 \ -I/usr/X11R7/include/nspr \ - -I/usr/X11R7/include/nss" \ + -I/usr/X11R7/include/nss \ + -I/usr/X11R7/include" \ CXX="g++ $BUILDOPTIONS32 \ -I/usr/X11R7/include/nspr \ - -I/usr/X11R7/include/nss" \ + -I/usr/X11R7/include/nss \ + -I/usr/X11R7/include" \ LDFLAGS="-L/usr/lib -L/usr/X11R7/lib" \ USE_ARCH=$UARCH \ ./configure --enable-python \ @@ -101,20 +103,19 @@ mk32() { } mk() { - if [ "$MK64BIT" == "true" ]; then - ADDOPTIONS="--libdir=\${prefix}/lib64" - fi CC="gcc $BUILDOPTIONS \ -I/usr/X11R7/include/nspr \ - -I/usr/X11R7/include/nss" \ + -I/usr/X11R7/include/nss \ + -I/usr/X11R7/include" \ CXX="g++ $BUILDOPTIONS \ -I/usr/X11R7/include/nspr \ - -I/usr/X11R7/include/nss" \ + -I/usr/X11R7/include/nss \ + -I/usr/X11R7/include" \ LDFLAGS="-L/usr/$LIBDIR -L/usr/X11R7/$LIBDIR" \ USE_ARCH=$UARCH \ ./configure --enable-sqlite3 \ --prefix=/usr \ - $ADDOPTIONS \ + --libdir=\${prefix}/${LIBDIR} \ --with-external-db \ --without-lua make -j $NUMCPU diff --git a/SysBuild/tools/scrollkeeper b/SysBuild/tools/scrollkeeper index e4fda0b..f98e54d 100644 --- a/SysBuild/tools/scrollkeeper +++ b/SysBuild/tools/scrollkeeper @@ -99,14 +99,11 @@ mk32() { } mk() { - if [ "$MK64BIT" == "true" ]; then - ADDOPTIONS="--libdir=/usr/X11R7/lib64" - fi CC="gcc $BUILDOPTIONS -fPIC" \ CXX="g++ $BUILDOPTIONS -fPIC" \ USE_ARCH=$UARCH \ ./configure --build=$TARGET \ - $ADDOPTIONS \ + --libdir=/usr/X11R7/${LIBDIR} \ --prefix=/usr/X11R7 \ --localstatedir=/var \ --sysconfdir=/etc