From f7dce2e0846b2f8cb8cc9aa79b8f9e678f2b3f0a Mon Sep 17 00:00:00 2001 From: kueller Date: Tue, 28 Apr 2009 13:53:56 +0000 Subject: [PATCH] LIBDIR wird jetzt von SetConfig gesetzt. Diese Funktion wird von genpkg for mk und postmk mit passenden Argumenten Aufgerufen. Nebenbei wird noch UARCH auf 32 oder 64 gesetzt - jenachdem ob ein 64 Build oder ein 32 Build stattfindet git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@4645 504e572c-2e33-0410-9681-be2bf7408885 --- BaseBuild/Basesys/acl | 26 +++++++++---------- BaseBuild/Basesys/attr | 38 +++++++++++++--------------- BaseBuild/Basesys/findutils | 5 ---- BaseBuild/Basesys/gcc | 1 - BaseBuild/Basesys/gmp | 3 --- BaseBuild/Basesys/iproute2 | 5 ---- BaseBuild/Basesys/kbd | 5 ---- BaseBuild/Basesys/mpfr | 5 ---- BaseBuild/Basesys/readline | 9 +------ BaseBuild/Basesys/shadow | 9 +------ BaseBuild/Basesys/subversion | 5 ---- BaseBuild/Basesys/udev | 5 ---- BaseBuild/Basesys/upstart | 5 ---- BaseBuild/Basesys/xfsprogs | 21 +++++++-------- BaseBuild/Basesys/zlib | 3 --- BaseBuild/crosschain/glibc | 2 -- BaseBuild/testchain/expect | 2 -- BaseBuild/toolchain/binutils | 2 -- BaseBuild/toolchain/gmp | 5 ---- BaseBuild/toolchain/mpfr | 5 ---- SysBuild/tools/Python | 3 --- SysBuild/tools/alien | 5 ---- SysBuild/tools/alsa-tools | 3 --- SysBuild/tools/binfmt_misc | 5 ---- SysBuild/tools/courier-authlib | 3 --- SysBuild/tools/cpufreqd | 3 --- SysBuild/tools/dbus | 4 +-- SysBuild/tools/dspam | 5 ---- SysBuild/tools/evolution-data-server | 3 --- SysBuild/tools/imap | 5 ---- SysBuild/tools/jabberd | 3 --- SysBuild/tools/jpegsrc | 3 --- SysBuild/tools/librep | 3 --- SysBuild/tools/libxml2 | 4 +-- SysBuild/tools/netpbm | 3 --- SysBuild/tools/opal | 3 --- SysBuild/tools/pkgconfig | 2 +- SysBuild/tools/speex | 3 --- SysBuild/tools/sudo | 5 ---- SysBuild/tools/tcl | 4 +-- SysBuild/tools/tsocks | 3 --- SysBuild/tools/wireless_tools | 5 ---- SysBuild/tools/xvidcore | 5 ---- SysBuild/xserv/NVIDIA-Linux | 3 --- SysBuild/xserv/ati-driver | 2 -- SysBuild/xserv/bigreqsproto | 4 +-- SysBuild/xserv/fontconfig | 4 +-- SysBuild/xserv/freetype | 4 +-- SysBuild/xserv/gle | 3 --- SysBuild/xserv/libdrm | 4 +-- SysBuild/xserv/liberation-fonts-ttf | 5 ---- SysBuild/xserv/xextproto | 4 +-- SysBuild/xserv/xkeyboard-config | 2 +- SysBuild/xserv/xproto | 4 +-- SysBuild/xsys/MPlayer | 3 --- SysBuild/xsys/amarok | 3 --- SysBuild/xsys/avifile | 3 --- SysBuild/xsys/boost | 5 ---- SysBuild/xsys/e-uae | 5 ---- SysBuild/xsys/ethereal | 5 ---- SysBuild/xsys/evolution | 3 --- SysBuild/xsys/ffmpeg | 2 -- SysBuild/xsys/firefox | 3 --- SysBuild/xsys/freefonts | 5 ---- SysBuild/xsys/gail | 3 --- SysBuild/xsys/gnash | 5 ---- SysBuild/xsys/gnome-games | 3 --- SysBuild/xsys/haze | 5 ---- SysBuild/xsys/jdk | 2 -- SysBuild/xsys/k3b | 3 --- SysBuild/xsys/kaffeine | 3 --- SysBuild/xsys/kde-i18n-de | 3 --- SysBuild/xsys/kdeaccessibility | 3 --- SysBuild/xsys/kdeaddons | 3 --- SysBuild/xsys/kdeadmin | 3 --- SysBuild/xsys/kdeartwork | 3 --- SysBuild/xsys/kdebase | 3 --- SysBuild/xsys/kdebindings | 3 --- SysBuild/xsys/kdeedu | 3 --- SysBuild/xsys/kdegames | 3 --- SysBuild/xsys/kdegraphics | 3 --- SysBuild/xsys/kdelibs | 3 --- SysBuild/xsys/kdemultimedia | 3 --- SysBuild/xsys/kdenetwork | 3 --- SysBuild/xsys/kdepim | 3 --- SysBuild/xsys/kdesdk | 3 --- SysBuild/xsys/kdetoys | 3 --- SysBuild/xsys/kdeutils | 3 --- SysBuild/xsys/kdevelop | 3 --- SysBuild/xsys/kdewebdev | 3 --- SysBuild/xsys/kguitar | 3 --- SysBuild/xsys/kino | 5 ---- SysBuild/xsys/koffice | 3 --- SysBuild/xsys/koffice-l10n-de | 3 --- SysBuild/xsys/krusader | 3 --- SysBuild/xsys/kwave | 3 --- SysBuild/xsys/php | 3 --- SysBuild/xsys/qt-x11-free | 15 ++++------- SysBuild/xsys/taskjuggler | 3 --- SysBuild/xsys/tetex-src | 5 ---- SysBuild/xsys/thunderbird | 3 --- SysBuild/xsys/xfce | 5 ---- SysBuild/xsys/xscreensaver | 5 ---- SysBuild/xsys/xv | 5 ---- defsys | 2 +- functions/functions | 4 +++ genpkg | 6 ++--- 107 files changed, 74 insertions(+), 405 deletions(-) diff --git a/BaseBuild/Basesys/acl b/BaseBuild/Basesys/acl index 5e7ee68..cfdfb51 100644 --- a/BaseBuild/Basesys/acl +++ b/BaseBuild/Basesys/acl @@ -81,11 +81,9 @@ premk() { mk() { if [ "$MK64BIT" == "true" ]; then ADDOPTIONS="--libdir=/usr/lib64" - PKGLIBDIR="lib64" mkdir -p $TMPROOT/lib64 $TMPROOT/usr/lib64 else ADDOPTIONS="--libdir=/usr/lib" - PKGLIBDIR="lib" fi CC="gcc ${BUILDOPTIONS} -I/usr/include" \ CXX="g++ ${BUILDOPTIONS} -I/usr/include" \ @@ -98,27 +96,27 @@ mk() { mv /tmp/builddefs include/builddefs make -j $NUMCPU make -j $NUMCPU PKG_BIN_DIR=$TMPROOT/usr/bin \ - PKG_LIB_DIR=$TMPROOT/usr/$PKGLIBDIR \ + PKG_LIB_DIR=$TMPROOT/usr/$LIBDIR \ PKG_SBIN_DIR=$TMPROOT/sbin \ - PKG_SLIB_DIR=$TMPROOT/$PKGLIBDIR \ + PKG_SLIB_DIR=$TMPROOT/$LIBDIR \ PKG_INC_DIR=$TMPROOT/usr/include/xfs \ PKG_MAN_DIR=$TMPROOT/usr/share/man \ PKG_DOC_DIR=$TMPROOT/usr/share/doc/xfsprogs install make -j $NUMCPU PKG_BIN_DIR=$TMPROOT/usr/bin \ - PKG_LIB_DIR=$TMPROOT/usr/$PKGLIBDIR \ + PKG_LIB_DIR=$TMPROOT/usr/$LIBDIR \ PKG_SBIN_DIR=$TMPROOT/sbin \ - PKG_SLIB_DIR=$TMPROOT/$PKGLIBDIR \ + PKG_SLIB_DIR=$TMPROOT/$LIBDIR \ PKG_INC_DIR=$TMPROOT/usr/include/xfs \ PKG_MAN_DIR=$TMPROOT/usr/share/man \ PKG_DOC_DIR=$TMPROOT/usr/share/doc/xfsprogs install-dev - rm $TMPROOT/usr/$PKGLIBDIR/libacl.a - cp libacl/.libs/libacl.{so,a} $TMPROOT/usr/$PKGLIBDIR - ln -sf ../usr/lib/libacl.a $TMPROOT/$PKGLIBDIR/libacl.a - ln -sf ../usr/lib/libacl.la $TMPROOT/$PKGLIBDIR/libacl.la - ln libacl.so.1 $TMPROOT/usr/$PKGLIBDIR/libacl.so - sed -e "s%libdir=.*$%libdir=\'/usr/$PKGLIBDIR\'%" $TMPROOT/usr/$PKGLIBDIR/libacl.la |\ - sed -e "s%/usr/sbin/libattr.la%/$PKGLIBDIR/libattr.la%" >/tmp/libacl.la - mv /tmp/libacl.la $TMPROOT/usr/$PKGLIBDIR/libacl.la + rm $TMPROOT/usr/$LIBDIR/libacl.a + cp libacl/.libs/libacl.{so,a} $TMPROOT/usr/$LIBDIR + ln -sf ../usr/lib/libacl.a $TMPROOT/$LIBDIR/libacl.a + ln -sf ../usr/lib/libacl.la $TMPROOT/$LIBDIR/libacl.la + ln libacl.so.1 $TMPROOT/usr/$LIBDIR/libacl.so + sed -e "s%libdir=.*$%libdir=\'/usr/$LIBDIR\'%" $TMPROOT/usr/$LIBDIR/libacl.la |\ + sed -e "s%/usr/sbin/libattr.la%/$LIBDIR/libattr.la%" >/tmp/libacl.la + mv /tmp/libacl.la $TMPROOT/usr/$LIBDIR/libacl.la } postmk() { diff --git a/BaseBuild/Basesys/attr b/BaseBuild/Basesys/attr index 9c7e7a0..9f40651 100644 --- a/BaseBuild/Basesys/attr +++ b/BaseBuild/Basesys/attr @@ -77,11 +77,9 @@ premk() { mk() { if [ "$MK64BIT" == "true" ]; then ADDOPTIONS="--libdir=/usr/lib64" - PKGLIBDIR="lib64" mkdir -p $TMPROOT/usr/lib64 $TMPROOT/lib64 else ADDOPTIONS="--libdir=/usr/lib" - PKGLIBDIR="lib" fi CC="gcc ${BUILDOPTIONS}" \ CXX="g++ ${BUILDOPTIONS}" \ @@ -96,38 +94,38 @@ mk() { mv /tmp/builddefs include/builddefs make -j $NUMCPU make -j $NUMCPU PKG_BIN_DIR=$TMPROOT/usr/bin \ - PKG_LIB_DIR=$TMPROOT/usr/$PKGLIBDIR \ + PKG_LIB_DIR=$TMPROOT/usr/$LIBDIR \ PKG_SBIN_DIR=$TMPROOT/sbin \ - PKG_SLIB_DIR=$TMPROOT/$PKGLIBDIR \ + PKG_SLIB_DIR=$TMPROOT/$LIBDIR \ PKG_INC_DIR=$TMPROOT/usr/include/attr \ PKG_MAN_DIR=$TMPROOT/usr/share/man \ PKG_DOC_DIR=$TMPROOT/usr/share/doc/xfsprogs install make -j $NUMCPU PKG_BIN_DIR=$TMPROOT/usr/bin \ - PKG_LIB_DIR=$TMPROOT/usr/$PKGLIBDIR \ + PKG_LIB_DIR=$TMPROOT/usr/$LIBDIR \ PKG_SBIN_DIR=$TMPROOT/sbin \ - PKG_SLIB_DIR=$TMPROOT/$PKGLIBDIR \ + PKG_SLIB_DIR=$TMPROOT/$LIBDIR \ PKG_INC_DIR=$TMPROOT/usr/include/attr \ PKG_MAN_DIR=$TMPROOT/usr/share/man \ PKG_DOC_DIR=$TMPROOT/usr/share/doc/xfsprogs install-lib make -j $NUMCPU PKG_BIN_DIR=$TMPROOT/usr/bin \ - PKG_LIB_DIR=$TMPROOT/usr/$PKGLIBDIR \ + PKG_LIB_DIR=$TMPROOT/usr/$LIBDIR \ PKG_SBIN_DIR=$TMPROOT/sbin \ - PKG_SLIB_DIR=$TMPROOT/$PKGLIBDIR \ + PKG_SLIB_DIR=$TMPROOT/$LIBDIR \ PKG_INC_DIR=$TMPROOT/usr/include/attr \ PKG_MAN_DIR=$TMPROOT/usr/share/man \ PKG_DOC_DIR=$TMPROOT/usr/share/doc/xfsprogs install-dev - rm $TMPROOT/usr/$PKGLIBDIR/libattr.{a,la} - cp libattr/.libs/libattr.{so,a}* $TMPROOT/usr/$PKGLIBDIR - cp /libexec/libattr.la $TMPROOT/usr/$PKGLIBDIR - ln -sf ../usr/$PKGLIBDIR/libattr.a $TMPROOT/$PKGLIBDIR/libattr.a - ln -sf ../usr/$PKGLIBDIR/libattr.la $TMPROOT/$PKGLIBDIR/libattr.la - ln -sf ../../$PKGLIBDIR/libattr.so $TMPROOT/usr/$PKGLIBDIR/libattr.so - rm $TMPROOT/$PKGLIBDIR/libattr.so - ln -s ../usr/$PKGLIBDIR/libattr.so.1.1.0 $TMPROOT/$PKGLIBDIR/libattr.so - sed -e "s/libdir=.*$/libdir=\'\/$PKGLIBDIR\'/" $TMPROOT/$PKGLIBDIR/libattr.la >/tmp/libattr.la - mv /tmp/libattr.la $TMPROOT/$PKGLIBDIR/libattr.la - rm $TMPROOT/usr/$PKGLIBDIR/libattr.so - ln -s libattr.so.1.1.0 $TMPROOT/usr/$PKGLIBDIR/libattr.so + rm $TMPROOT/usr/$LIBDIR/libattr.{a,la} + cp libattr/.libs/libattr.{so,a}* $TMPROOT/usr/$LIBDIR + cp /libexec/libattr.la $TMPROOT/usr/$LIBDIR + ln -sf ../usr/$LIBDIR/libattr.a $TMPROOT/$LIBDIR/libattr.a + ln -sf ../usr/$LIBDIR/libattr.la $TMPROOT/$LIBDIR/libattr.la + ln -sf ../../$LIBDIR/libattr.so $TMPROOT/usr/$LIBDIR/libattr.so + rm $TMPROOT/$LIBDIR/libattr.so + ln -s ../usr/$LIBDIR/libattr.so.1.1.0 $TMPROOT/$LIBDIR/libattr.so + sed -e "s/libdir=.*$/libdir=\'\/$LIBDIR\'/" $TMPROOT/$LIBDIR/libattr.la >/tmp/libattr.la + mv /tmp/libattr.la $TMPROOT/$LIBDIR/libattr.la + rm $TMPROOT/usr/$LIBDIR/libattr.so + ln -s libattr.so.1.1.0 $TMPROOT/usr/$LIBDIR/libattr.so } postmk() { diff --git a/BaseBuild/Basesys/findutils b/BaseBuild/Basesys/findutils index c2b13a2..dcc2206 100644 --- a/BaseBuild/Basesys/findutils +++ b/BaseBuild/Basesys/findutils @@ -77,11 +77,6 @@ premk() { } mk() { - if [ "$MK64BIT" == "true" ]; then - LIBDIR=lib64 - else - LIBDIR=lib - fi CC="gcc ${BUILDOPTIONS}" \ ./configure --host=$TARGET \ --libexecdir=/usr/$LIBDIR/locate \ diff --git a/BaseBuild/Basesys/gcc b/BaseBuild/Basesys/gcc index 4b2a043..6e66696 100644 --- a/BaseBuild/Basesys/gcc +++ b/BaseBuild/Basesys/gcc @@ -82,7 +82,6 @@ premk() { mk() { if [ "$MK64BIT" == "true" ]; then ADDCONFIGURE="--libdir=/usr/lib64 --libexecdir=/usr/lib64" - LIBDIR=lib64 RPATH="/lib64:/lib" else ADDCONFIGURE="--libexecdir=/usr/lib" diff --git a/BaseBuild/Basesys/gmp b/BaseBuild/Basesys/gmp index f8bd53e..7ebfc14 100644 --- a/BaseBuild/Basesys/gmp +++ b/BaseBuild/Basesys/gmp @@ -100,9 +100,6 @@ mk32() { mk() { if [ "$MK64BIT" == "true" ]; then ADDOPTIONS="--libdir=/usr/lib64" - LIBDIR=lib64 - else - LIBDIR=lib fi CC="gcc -isystem /usr/include ${BUILDOPTIONS}" \ CXX="g++ -isystem /usr/include ${BUILDOPTIONS}" \ diff --git a/BaseBuild/Basesys/iproute2 b/BaseBuild/Basesys/iproute2 index 6e87975..5ef24b2 100644 --- a/BaseBuild/Basesys/iproute2 +++ b/BaseBuild/Basesys/iproute2 @@ -80,11 +80,6 @@ premk() { #Hier wird der Make Prozess der Sourcen definiert mk() { - if [ ${MK64BIT} == "true" ]; then - LIBDIR=lib64 - else - LIBDIR=lib - fi make -j $NUMCPU CC="gcc ${BUILDOPTIONS}" \ DESTDIR=/ \ LIBDIR=/usr/$LIBDIR \ diff --git a/BaseBuild/Basesys/kbd b/BaseBuild/Basesys/kbd index 0a19704..26c5d33 100644 --- a/BaseBuild/Basesys/kbd +++ b/BaseBuild/Basesys/kbd @@ -93,11 +93,6 @@ mk() { postmk() { mv $TMPROOT/share $TMPROOT/usr/share - if [ "$MK64BIT" == "true" ]; then - LIBDIR=lib64 - else - LIBDIR=lib - fi rm $TMPROOT/$LIBDIR/kbd/keymaps/i386/qwerty/defkeymap.map.gz ln -s i386/qwertz/de-latin1.map.gz $TMPROOT/$LIBDIR/kbd/keymaps/defkeymap.map.gz mkdir -p $TMPROOT/bin diff --git a/BaseBuild/Basesys/mpfr b/BaseBuild/Basesys/mpfr index a9cbd1e..4b58c7e 100644 --- a/BaseBuild/Basesys/mpfr +++ b/BaseBuild/Basesys/mpfr @@ -94,11 +94,6 @@ mk32() { } mk() { - if [ $MK64BIT == "true" ]; then - LIBDIR=lib64 - else - LIBDIR=lib - fi CC="gcc -isystem /usr/include ${BUILDOPTIONS}" \ CXX="g++ -isystem /usr/include ${BUILDOPTIONS}" \ LDFLAGS="-Wl,-rpath-link,/$LIBDIR ${BUILDOPTIONS}" \ diff --git a/BaseBuild/Basesys/readline b/BaseBuild/Basesys/readline index 7b44092..84bf316 100644 --- a/BaseBuild/Basesys/readline +++ b/BaseBuild/Basesys/readline @@ -106,16 +106,9 @@ mk32() { } mk() { - if [ "$MK64BIT" == "true" ]; then - ADDOPTIONS="--libdir=/lib64" - LIBDIR="lib64" - else - ADDOPTIONS="--libdir=/lib" - LIBDIR="lib" - fi CC="gcc ${BUILDOPTIONS}" \ CXX="g++ ${BUILDOPTIONS}" \ - ../readline*/configure $ADDOPTIONS \ + ../readline*/configure --libdir=/$LIBDIR \ --prefix=/usr make -j $NUMCPU && make -j $NUMCPU install && diff --git a/BaseBuild/Basesys/shadow b/BaseBuild/Basesys/shadow index 7f7c58d..77102c9 100644 --- a/BaseBuild/Basesys/shadow +++ b/BaseBuild/Basesys/shadow @@ -104,18 +104,11 @@ mk32() { mk() { - if [ "$MK64BIT" == "true" ]; then - ADDOPTIONS="--libdir=/lib64" - LIBDIR=lib64 - else - ADDOPTIONS="--libdir=/lib" - LIBDIR=lib - fi CC="gcc ${BUILDOPTIONS}" \ CC="gcc ${BUILDOPTIONS}" \ ../shadow*/configure --host=$TARGET \ --prefix=/usr \ - $ADDOPTIONS \ + --libdir=/$LIBDIR \ --sysconfdir=/etc \ --enable-shared \ --with-libpam \ diff --git a/BaseBuild/Basesys/subversion b/BaseBuild/Basesys/subversion index c5c0dc6..3450901 100644 --- a/BaseBuild/Basesys/subversion +++ b/BaseBuild/Basesys/subversion @@ -76,11 +76,6 @@ premk() { } mk() { - if [ "$MK64BIT" == "true" ];then - LIBDIR=lib64 - else - LIBDIR=lib - fi CC="gcc $BUILDOPTIONS -fPIC" \ CXX="g++ $BUILDOPTIONS -fPIC" \ LDFLAGS="-L/$LIBDIR -L/usr/$LIBDIR -L/usr/X11R7/$LIBDIR" \ diff --git a/BaseBuild/Basesys/udev b/BaseBuild/Basesys/udev index 8343744..c164e28 100644 --- a/BaseBuild/Basesys/udev +++ b/BaseBuild/Basesys/udev @@ -88,11 +88,6 @@ mk32() { } mk() { - if [ "$MK64BIT" == "true" ];then - LIBDIR=lib64 - else - LIBDIR=lib - fi CC="gcc ${BUILDOPTIONS}" \ CXX="g++ ${BUILDOPTIONS}" \ ./configure --prefix=/usr \ diff --git a/BaseBuild/Basesys/upstart b/BaseBuild/Basesys/upstart index 4a174ae..a8d256e 100644 --- a/BaseBuild/Basesys/upstart +++ b/BaseBuild/Basesys/upstart @@ -75,11 +75,6 @@ premk() { } mk() { - if [ "$MK64BIT" == "true" ]; then - LIBDIR=lib64 - else - LIBDIR=lib - fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ ./configure --target=$TARGET \ diff --git a/BaseBuild/Basesys/xfsprogs b/BaseBuild/Basesys/xfsprogs index 60fcbc3..220aa1d 100644 --- a/BaseBuild/Basesys/xfsprogs +++ b/BaseBuild/Basesys/xfsprogs @@ -118,9 +118,6 @@ mk() { if [ "$MK64BIT" == "true" ]; then ADDOPTIONS="--libdir=/usr/lib64" mkdir -p $TMPROOT/usr/lib64 $TMPROOT/lib64 - PKGLIBDIR=lib64 - else - PKGLIBDIR=lib fi CC="gcc ${BUILDOPTIONS}" \ CXX="g++ ${BUILDOPTIONS}" \ @@ -131,25 +128,25 @@ mk() { --enable-share-uuid=yes make -j $NUMCPU && make -j $NUMCPU PKG_BIN_DIR=$TMPROOT/usr/bin \ - PKG_LIB_DIR=$TMPROOT/usr/$PKGLIBDIR \ + PKG_LIB_DIR=$TMPROOT/usr/$LIBDIR \ PKG_SBIN_DIR=$TMPROOT/sbin \ - PKG_SLIB_DIR=$TMPROOT/$PKGLIBDIR \ + PKG_SLIB_DIR=$TMPROOT/$LIBDIR \ PKG_INC_DIR=$TMPROOT/usr/include/xfs \ PKG_MAN_DIR=$TMPROOT/usr/share/man \ PKG_DOC_DIR=$TMPROOT/usr/doc/xfsprogs install make -j $NUMCPU PKG_BIN_DIR=$TMPROOT/usr/bin \ - PKG_LIB_DIR=$TMPROOT/usr/$PKGLIBDIR \ + PKG_LIB_DIR=$TMPROOT/usr/$LIBDIR \ PKG_SBIN_DIR=$TMPROOT/sbin \ - PKG_SLIB_DIR=$TMPROOT/$PKGLIBDIR \ + PKG_SLIB_DIR=$TMPROOT/$LIBDIR \ PKG_INC_DIR=$TMPROOT/usr/include/xfs \ PKG_MAN_DIR=$TMPROOT/usr/share/man \ PKG_DOC_DIR=$TMPROOT/usr/doc/xfsprogs install-dev - rm $TMPROOT/usr/$PKGLIBDIR/libhandle.a - cp libhandle/.libs/libhandle.a $TMPROOT/usr/$PKGLIBDIR + rm $TMPROOT/usr/$LIBDIR/libhandle.a + cp libhandle/.libs/libhandle.a $TMPROOT/usr/$LIBDIR rm $TMPROOT/usr/lib/libhandle.la - sed -e "s%^libdir.*$%libdir=\'/usr/$PKGLIBDIR\'%" \ - libhandle/.libs/libhandle.la >$TMPROOT/usr/$PKGLIBDIR/libhandle.la - cp /libexec/{libdisk.a,libxcmd.a,libxfs.a,libxlog.a} $TMPROOT/usr/$PKGLIBDIR/ + sed -e "s%^libdir.*$%libdir=\'/usr/$LIBDIR\'%" \ + libhandle/.libs/libhandle.la >$TMPROOT/usr/$LIBDIR/libhandle.la + cp /libexec/{libdisk.a,libxcmd.a,libxfs.a,libxlog.a} $TMPROOT/usr/$LIBDIR/ } #Funktion wird nach Ablauf des Make Prozesses ausgeführt, und kann diff --git a/BaseBuild/Basesys/zlib b/BaseBuild/Basesys/zlib index af61f69..2929823 100644 --- a/BaseBuild/Basesys/zlib +++ b/BaseBuild/Basesys/zlib @@ -116,9 +116,6 @@ mk() { if [ "$MK64BIT" == "true" ]; then ADDOPTIONS="--libdir=/usr/lib64" ADDMAKE="libdir=$TMPROOT/usr/lib64" - LIBDIR=lib64 - else - LIBDIR=lib fi CC="gcc -isystem /usr/include ${BUILDOPTIONS} -fPIC" \ CXX="g++ -isystem /usr/include ${BUILDOPTIONS} -fPIC" \ diff --git a/BaseBuild/crosschain/glibc b/BaseBuild/crosschain/glibc index 53beefc..63711fa 100644 --- a/BaseBuild/crosschain/glibc +++ b/BaseBuild/crosschain/glibc @@ -113,12 +113,10 @@ mk() { echo "libc_cv_c_cleanup=yes" >> config.cache echo "libc_cv_gnu99_inline=yes" >> config.cache if [ ${MK64BIT} == "true" ]; then - LIBDIR=lib64 if echo $ARCH|grep -q sparc; then echo "libc_cv_sparc64_tls=yes" >>config.cache fi else - LIBDIR=lib BUILDOPTIONS=$BUILDOPTIONS" -march=i486" fi echo "slibdir=/tools/$LIBDIR" >> configparms diff --git a/BaseBuild/testchain/expect b/BaseBuild/testchain/expect index b33cbe2..ebede8e 100644 --- a/BaseBuild/testchain/expect +++ b/BaseBuild/testchain/expect @@ -88,10 +88,8 @@ premk() { mk() { if [ "$MK64BIT" == "true" ]; then ADDCONFIGURE="--libdir=/tools/lib64" - LIBDIR=lib64 else ADDCONFIGURE="--with-tcl=/tools/lib" - LIBDIR=lib fi CC="gcc ${BUILDFLAGS}" \ ./configure --prefix=/tools \ diff --git a/BaseBuild/toolchain/binutils b/BaseBuild/toolchain/binutils index cfd7f00..5256b4c 100644 --- a/BaseBuild/toolchain/binutils +++ b/BaseBuild/toolchain/binutils @@ -96,10 +96,8 @@ premk() { mk() { if [ ${MK64BIT} == "true" ]; then - LIBDIR=lib64 ADDOPTIONS="--with-lib-path=/tools/lib64:/tools/lib" else - LIBDIR=lib ADDOPTIONS="--with-lib-path=/tools/lib" fi CC="${CC} ${BUILDOPTIONS}" \ diff --git a/BaseBuild/toolchain/gmp b/BaseBuild/toolchain/gmp index fb1358a..0c4d975 100644 --- a/BaseBuild/toolchain/gmp +++ b/BaseBuild/toolchain/gmp @@ -82,11 +82,6 @@ premk() { } mk() { - if [ $MK64BIT == "true" ]; then - LIBDIR=lib64 - else - LIBDIR=lib - fi CC="${CC} ${BUILDOPTIONS}" \ CXX="${CXX} ${BUILDOPTIONS}" \ sed -i "s/ac_compiler -V/ac_compiler -v/" configure diff --git a/BaseBuild/toolchain/mpfr b/BaseBuild/toolchain/mpfr index 8cfb882..20c412b 100644 --- a/BaseBuild/toolchain/mpfr +++ b/BaseBuild/toolchain/mpfr @@ -81,11 +81,6 @@ premk() { } mk() { - if [ $MK64BIT == "true" ]; then - LIBDIR=lib64 - else - LIBDIR=lib - fi CC="${CC} ${BUILDOPTIONS}" \ CXX="${CC} ${BUILDOPTIONS}" \ ./configure --host=$TARGET \ diff --git a/SysBuild/tools/Python b/SysBuild/tools/Python index 7c5c83d..3858992 100644 --- a/SysBuild/tools/Python +++ b/SysBuild/tools/Python @@ -79,10 +79,7 @@ premk() { mk() { if [ "$MK64BIT" == "true" ]; then - LIBDIR=lib64 ADDOPTIONS="--libdir=/usr/lib64" - else - LIBDIR=lib fi CC="gcc $BUILDOPTIONS -fPIC" \ CXX="g++ $BUILDOPTIONS -fPIC" \ diff --git a/SysBuild/tools/alien b/SysBuild/tools/alien index f49bd2d..fdd2764 100644 --- a/SysBuild/tools/alien +++ b/SysBuild/tools/alien @@ -75,11 +75,6 @@ premk() { } mk() { - if [ "$MK64BIT" == "true" ]; then - LIBDIR=lib64 - else - LIBDIR=lib - fi PERLVERSION=`perl --version|grep " v"|sed -e "s/.*v//"|awk '{print $1}'` mkdir -p $TMPROOT/usr/lib/site_perl/$PERLVERSION/Alien/Package mkdir -p $TMPROOT/usr/bin diff --git a/SysBuild/tools/alsa-tools b/SysBuild/tools/alsa-tools index 37b35a6..7f30e77 100644 --- a/SysBuild/tools/alsa-tools +++ b/SysBuild/tools/alsa-tools @@ -95,10 +95,7 @@ mk32() { mk() { if [ "$MK64BIT" == "true" ]; then - LIBDIR=lib64 ADDOPTIONS="--libdir=\${prefix}/lib64" - else - LIBDIR=lib fi for i in *; do cd $i diff --git a/SysBuild/tools/binfmt_misc b/SysBuild/tools/binfmt_misc index 36192cc..d2af761 100644 --- a/SysBuild/tools/binfmt_misc +++ b/SysBuild/tools/binfmt_misc @@ -79,11 +79,6 @@ premk() { } mk() { - if [ "$MK64BIT" == "true" ]; then - LIBDIR=lib64 - else - LIBDIR=lib - fi gcc $BUILDOPTIONS -o javaclassname javaclassname.c mkdir -p $TMPROOT/usr/$LIBDIR/jdk/bin mkdir -p $TMPROOT/etc/init.d/rc{3,4,5}.d diff --git a/SysBuild/tools/courier-authlib b/SysBuild/tools/courier-authlib index 4713ea8..db76c86 100644 --- a/SysBuild/tools/courier-authlib +++ b/SysBuild/tools/courier-authlib @@ -77,10 +77,7 @@ premk() { mk() { if [ "$MK64BIT" == "true" ]; then - LIBDIR=lib64 ADDOPTIONS="--libdir=/usr/lib64" - else - LIBDIR=lib fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ diff --git a/SysBuild/tools/cpufreqd b/SysBuild/tools/cpufreqd index 30e4f03..9cd942c 100644 --- a/SysBuild/tools/cpufreqd +++ b/SysBuild/tools/cpufreqd @@ -79,9 +79,6 @@ premk() { mk() { if [ "$MK64BIT" == "true" ]; then ADDOPTIONS="--libdir=/usr/lib64" - LIBDIR=lib64 - else - LIBDIR=lib fi LDFLAGS="-Wl,-rpath-link,/usr/$LIBDIR" \ CC="gcc $BUILDOPTIONS" \ diff --git a/SysBuild/tools/dbus b/SysBuild/tools/dbus index 1942466..0bdcf59 100644 --- a/SysBuild/tools/dbus +++ b/SysBuild/tools/dbus @@ -83,7 +83,7 @@ premk() { } mk32() { - CC="gcc ${BUILDOPTIONS32}" USE_ARCH=32 \ + CC="gcc ${BUILDOPTIONS32}" USE_ARCH=$UARCH \ ../dbus*/configure --prefix=/usr \ --sysconfdir=/etc/sysconfig/dbus \ --libexecdir=/usr/lib/dbus-1.0 \ @@ -101,7 +101,7 @@ mk() { if [ "$MK64BIT" == "true" ]; then ADDOPTIONS="--libdir=\${prefix}/lib64" fi - CC="gcc $BUILDOPTIONS" USE_ARCH=64 \ + CC="gcc $BUILDOPTIONS" USE_ARCH=$UARCH \ ../dbus*/configure --prefix=/usr \ $ADDOPTIONS \ --sysconfdir=/etc/sysconfig/dbus \ diff --git a/SysBuild/tools/dspam b/SysBuild/tools/dspam index fc84de1..4dedc45 100644 --- a/SysBuild/tools/dspam +++ b/SysBuild/tools/dspam @@ -108,11 +108,6 @@ mk32() { } mk() { - if [ "$MK64BIT" == "true" ]; then - LIBDIR=lib64 - else - LIBDIR=lib - fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ LDFLAGS="-L/$LIBDIR -L/usr/$LIBDIR -L/usr/X11R7/$LIBDIR" \ diff --git a/SysBuild/tools/evolution-data-server b/SysBuild/tools/evolution-data-server index 5d833f8..4c46650 100644 --- a/SysBuild/tools/evolution-data-server +++ b/SysBuild/tools/evolution-data-server @@ -104,9 +104,6 @@ mk32() { mk() { if [ "$MK64BIT" == "true" ]; then ADDOPTIONS="--libdir=\${prefix}/lib64" - LIBDIR=lib64 - else - LIBDIR=lib fi CFLAGS=$CFLAGS" -I/usr/include/openssl" \ CC="gcc $BUILDOPTIONS" \ diff --git a/SysBuild/tools/imap b/SysBuild/tools/imap index eaed772..57b1024 100644 --- a/SysBuild/tools/imap +++ b/SysBuild/tools/imap @@ -88,11 +88,6 @@ mk32() { } mk() { - if [ "$MK64BIT" == "true" ]; then - LIBDIR=lib64 - else - LIBDIR=lib - fi mv src/osdep/unix/Makefile src/osdep/unix/Makefile.orig sed -e "s/^SSLDIR=.*/SSLDIR=\/usr/g" src/osdep/unix/Makefile.orig >src/osdep/unix/Makefile make CC="gcc $BUILDOPTIONS -fPIC" CXX="g++ $BUILDOPTIONS -fPIC" slx diff --git a/SysBuild/tools/jabberd b/SysBuild/tools/jabberd index 3ed39ef..c2b5b22 100644 --- a/SysBuild/tools/jabberd +++ b/SysBuild/tools/jabberd @@ -78,9 +78,6 @@ premk() { mk() { if [ "$MK64BIT" == "true" ]; then ADDOPTIONS="--libdir=\${prefix}/lib64" - LIBDIR=lib64 - else - LIBDIR=lib fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ diff --git a/SysBuild/tools/jpegsrc b/SysBuild/tools/jpegsrc index 13a3d37..26b5f3f 100644 --- a/SysBuild/tools/jpegsrc +++ b/SysBuild/tools/jpegsrc @@ -100,9 +100,6 @@ mk32() { mk() { if [ "$MK64BIT" == "true" ]; then ADDOPTIONS="--libdir=\${prefix}/lib64" - LIBDIR=lib64 - else - LIBDIR=lib fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ diff --git a/SysBuild/tools/librep b/SysBuild/tools/librep index e83c7f6..8ef3d94 100644 --- a/SysBuild/tools/librep +++ b/SysBuild/tools/librep @@ -100,9 +100,6 @@ mk() { if [ "$MK64BIT" == "true" ]; then ADDOPTIONS="--libdir=\${prefix}/lib64" export LDFLAGS="-L/lib64 -L/usr/lib64" - LIBDIR=lib64 - else - LIBDIR=lib fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ diff --git a/SysBuild/tools/libxml2 b/SysBuild/tools/libxml2 index 4f9e7a1..2754e58 100644 --- a/SysBuild/tools/libxml2 +++ b/SysBuild/tools/libxml2 @@ -83,7 +83,7 @@ premk() { mk32() { CC="gcc $BUILDOPTIONS32" \ CXX="g++ $BUILDOPTIONS32" \ - USE_ARCH=32 \ + USE_ARCH=$UARCH \ ./configure --target=$TARGET32 \ --prefix=/usr \ --without-python && @@ -101,7 +101,7 @@ mk() { fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ - USE_ARCH=64 \ + USE_ARCH=$UARCH \ ./configure --target=$TARGET \ --prefix=/usr \ $ADDOPTIONS && diff --git a/SysBuild/tools/netpbm b/SysBuild/tools/netpbm index 0ae6c72..f8ece84 100644 --- a/SysBuild/tools/netpbm +++ b/SysBuild/tools/netpbm @@ -115,9 +115,6 @@ postmk() { cd - rm -r $TMPROOT/usr mv $TMPROOT/usr32 $TMPROOT/usr - LIBDIR=lib64 - else - LIBDIR=lib fi mkdir -p $TMPROOT/usr/$LIBDIR $TMPROOT/usr/include $TMPROOT/usr/share/doc/netpbm if [ -h $TMPROOT/usr/link/libnetpbm.so ]; then diff --git a/SysBuild/tools/opal b/SysBuild/tools/opal index e48285b..337db86 100644 --- a/SysBuild/tools/opal +++ b/SysBuild/tools/opal @@ -72,9 +72,6 @@ SRCPATH=Tools/lib premk() { -# cd ../pwlib* -# PWLIBDIR=`pwd` -# cd - echo "Nothing to do for premk()" } diff --git a/SysBuild/tools/pkgconfig b/SysBuild/tools/pkgconfig index e686c08..9d63453 100644 --- a/SysBuild/tools/pkgconfig +++ b/SysBuild/tools/pkgconfig @@ -97,7 +97,7 @@ mk() { CheckError "Configurescript failed !" 1 # Make-Optionen eintragen - USE_ARCH=32 CC="gcc ${BUILDOPTIONS}" ./configure --prefix=/usr --with-pc-path=/usr/share/pkgconfig && + USE_ARCH=$UARCH CC="gcc ${BUILDOPTIONS}" ./configure --prefix=/usr --with-pc-path=/usr/share/pkgconfig && make -j $NUMCPU CheckError "Makeprocess failed !" 1 diff --git a/SysBuild/tools/speex b/SysBuild/tools/speex index bd6f6ac..7963905 100644 --- a/SysBuild/tools/speex +++ b/SysBuild/tools/speex @@ -88,9 +88,6 @@ mk32() { mk() { if [ "$MK64BIT" == "true" ]; then ADDOPTIONS="--libdir=\${prefix}/lib64" - LIBDIR=lib64 - else - LIBDIR=lib fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ diff --git a/SysBuild/tools/sudo b/SysBuild/tools/sudo index 822c0da..d6b2801 100644 --- a/SysBuild/tools/sudo +++ b/SysBuild/tools/sudo @@ -97,11 +97,6 @@ mk32() { } mk() { - if [ "$MK64BIT" == "true" ]; then - LIBDIR=lib64 - else - LIBDIR=lib - fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ ./configure --target=$TARGET \ diff --git a/SysBuild/tools/tcl b/SysBuild/tools/tcl index 9c8d21c..adfc8a5 100644 --- a/SysBuild/tools/tcl +++ b/SysBuild/tools/tcl @@ -85,7 +85,7 @@ premk() { mk32() { CC="gcc $BUILDOPTIONS32" \ CXX="g++ $BUILDOPTIONS32" \ - USE_ARCH=32 \ + USE_ARCH=$UARCH \ ./configure --host=$TARGET32 \ --prefix=/usr/X11R7 \ --enable-threads \ @@ -102,7 +102,7 @@ mk() { fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ - USE_ARCH=64 \ + USE_ARCH=$UARCH \ ./configure --host=$TARGET \ --prefix=/usr/X11R7 \ --enable-threads \ diff --git a/SysBuild/tools/tsocks b/SysBuild/tools/tsocks index f4f7099..2cca71c 100644 --- a/SysBuild/tools/tsocks +++ b/SysBuild/tools/tsocks @@ -96,9 +96,6 @@ mk32() { mk() { if [ "$MK64BIT" == "true" ]; then ADDOPTIONS="--libdir=\${prefix}/lib64" - LIBDIR=lib64 - else - LIBDIR=lib fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ diff --git a/SysBuild/tools/wireless_tools b/SysBuild/tools/wireless_tools index 5754891..75a9e26 100644 --- a/SysBuild/tools/wireless_tools +++ b/SysBuild/tools/wireless_tools @@ -82,11 +82,6 @@ mk32() { } mk() { - if [ "$MK64BIT" == "true" ] ;then - LIBDIR=lib64 - else - LIBDIR=lib - fi make CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ PREFIX=/usr \ diff --git a/SysBuild/tools/xvidcore b/SysBuild/tools/xvidcore index 9fb901d..026012a 100644 --- a/SysBuild/tools/xvidcore +++ b/SysBuild/tools/xvidcore @@ -84,11 +84,6 @@ mk32() { } mk() { - if [ "$MK64BIT" == "true" ]; then - LIBDIR=lib64 - else - LIBDIR=lib - fi cd build/generic ./configure make CC="gcc $BUILDOPTIONS" -j $NUMCPU diff --git a/SysBuild/xserv/NVIDIA-Linux b/SysBuild/xserv/NVIDIA-Linux index 30b1dce..43bd9e8 100644 --- a/SysBuild/xserv/NVIDIA-Linux +++ b/SysBuild/xserv/NVIDIA-Linux @@ -91,12 +91,9 @@ mk() { DSTPKGNAME=`basename $DSTPKGNAME` PKGNAME=$DSTPKGNAME.tbz if [ ${MK64BIT} == "true" ]; then - LIBDIR=lib64 mv usr/X11R6/lib usr/X11R6/lib64 mv usr/lib usr/lib64 mv usr/lib32 usr/lib - else - LIBDIR=lib fi mv usr/share/doc usr/share/nvidia mkdir usr/share/doc diff --git a/SysBuild/xserv/ati-driver b/SysBuild/xserv/ati-driver index 2793f83..fe1d8bd 100644 --- a/SysBuild/xserv/ati-driver +++ b/SysBuild/xserv/ati-driver @@ -86,11 +86,9 @@ mk() { if [ "$MK64BIT" == "true" ]; then tar -C arch/x86_64 -cf - .|tar -C $TMPROOT -xvf - tar -C x710_64a -cf - .|tar -C $TMPROOT -xvf - - LIBDIR=lib64 else tar -C arch/x86 -cf - .|tar -C $TMPROOT -xvf - tar -C x710 -cf - .|tar -C $TMPROOT -xvf - - LIBDIR=lib fi cp ATI_LICENSE.TXT $TMPROOT/usr/share/ati mv $TMPROOT/usr/X11R6 $TMPROOT/usr/X11R7 diff --git a/SysBuild/xserv/bigreqsproto b/SysBuild/xserv/bigreqsproto index b99737a..498064e 100644 --- a/SysBuild/xserv/bigreqsproto +++ b/SysBuild/xserv/bigreqsproto @@ -78,7 +78,7 @@ premk() { mk32() { CC="gcc $BUILDOPTIONS32" \ CXX="g++ $BUILDOPTIONS32" \ - USE_ARCH=32 \ + USE_ARCH=$UARCH \ ./configure --host=$TARGET32 \ --localstatedir=/var \ --infodir=/usr/share/info \ @@ -95,7 +95,7 @@ mk() { fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ - USE_ARCH=64 \ + USE_ARCH=$UARCH \ ./configure --host=$TARGET \ --localstatedir=/var \ --infodir=/usr/share/info \ diff --git a/SysBuild/xserv/fontconfig b/SysBuild/xserv/fontconfig index 7720edc..8057919 100644 --- a/SysBuild/xserv/fontconfig +++ b/SysBuild/xserv/fontconfig @@ -78,7 +78,7 @@ premk() { mk32() { CC="gcc $BUILDOPTIONS32" \ CXX="g++ $BUILDOPTIONS32" \ - USE_ARCH=32 \ + USE_ARCH=$UARCH \ ./configure --host=$TARGET32 \ --localstatedir=/var \ --infodir=/usr/share/info \ @@ -97,7 +97,7 @@ mk() { fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ - USE_ARCH=64 \ + USE_ARCH=$UARCH \ ./configure --host=$TARGET \ --localstatedir=/var \ --infodir=/usr/share/info \ diff --git a/SysBuild/xserv/freetype b/SysBuild/xserv/freetype index 1a5b97c..0538592 100644 --- a/SysBuild/xserv/freetype +++ b/SysBuild/xserv/freetype @@ -79,7 +79,7 @@ premk() { mk32() { CC="gcc $BUILDOPTIONS32" \ CXX="g++ $BUILDOPTIONS32" \ - USE_ARCH=32 \ + USE_ARCH=$UARCH \ ./configure --host=$TARGET32 \ --localstatedir=/var \ --infodir=/usr/share/info \ @@ -96,7 +96,7 @@ mk() { fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ - USE_ARCH=64 \ + USE_ARCH=$UARCH \ ./configure --host=$TARGET \ --localstatedir=/var \ --infodir=/usr/share/info \ diff --git a/SysBuild/xserv/gle b/SysBuild/xserv/gle index 700bd95..f229478 100644 --- a/SysBuild/xserv/gle +++ b/SysBuild/xserv/gle @@ -92,9 +92,6 @@ mk32() { mk() { if [ "$MK64BIT" == "true" ]; then ADDOPTIONS="--libdir=/usr/X11R7/lib64" - LIBDIR=lib64 - else - LIBDIR=lib fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ diff --git a/SysBuild/xserv/libdrm b/SysBuild/xserv/libdrm index 823e8c0..88046d2 100644 --- a/SysBuild/xserv/libdrm +++ b/SysBuild/xserv/libdrm @@ -80,7 +80,7 @@ premk() { mk32() { CC="gcc $BUILDOPTIONS32" \ CXX="gcc $BUILDOPTIONS32" \ - USE_ARCH=32 \ + USE_ARCH=$UARCH \ ./configure --host=$TARGET32 \ --build=$TARGET32 \ --localstatedir=/var \ @@ -98,7 +98,7 @@ mk() { fi CC="gcc $BUILDOPTIONS" \ CXX="gcc $BUILDOPTIONS" \ - USE_ARCH=64 \ + USE_ARCH=$UARCH \ ./configure --host=$TARGET \ --build=$TARGET \ --localstatedir=/var \ diff --git a/SysBuild/xserv/liberation-fonts-ttf b/SysBuild/xserv/liberation-fonts-ttf index d5bff21..3f368a4 100644 --- a/SysBuild/xserv/liberation-fonts-ttf +++ b/SysBuild/xserv/liberation-fonts-ttf @@ -76,11 +76,6 @@ premk() { } mk() { - if [ "$MK64BIT" == "true" ]; then - LIBDIR=lib64 - else - LIBDIR=lib - fi mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts/TTF cp *.ttf $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts/TTF } diff --git a/SysBuild/xserv/xextproto b/SysBuild/xserv/xextproto index 7de321a..bd7b6dc 100644 --- a/SysBuild/xserv/xextproto +++ b/SysBuild/xserv/xextproto @@ -78,7 +78,7 @@ premk() { mk32() { CC="gcc $BUILDOPTIONS32" \ CXX="g++ $BUILDOPTIONS32" \ - USE_ARCH=32 \ + USE_ARCH=$UARCH \ ./configure --host=$TARGET \ --localstatedir=/var \ --infodir=/usr/share/info \ @@ -95,7 +95,7 @@ mk() { fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ - USE_ARCH=64 \ + USE_ARCH=$UARCH \ ./configure --host=$TARGET \ --localstatedir=/var \ --infodir=/usr/share/info \ diff --git a/SysBuild/xserv/xkeyboard-config b/SysBuild/xserv/xkeyboard-config index 3a4ab89..4f938a7 100644 --- a/SysBuild/xserv/xkeyboard-config +++ b/SysBuild/xserv/xkeyboard-config @@ -69,7 +69,7 @@ # # -SRCPATH=XServ/Extras +SRCPATH=XServ/Data premk() { echo "Nothing to do for premk()" diff --git a/SysBuild/xserv/xproto b/SysBuild/xserv/xproto index 83b9493..9e32b85 100644 --- a/SysBuild/xserv/xproto +++ b/SysBuild/xserv/xproto @@ -78,7 +78,7 @@ premk() { mk32() { CC="gcc $BUILDOPTIONS32" \ CXX="g++ $BUILDOPTIONS32" \ - USE_ARCH=32 \ + USE_ARCH=$UARCH \ ./configure --host=$TARGET \ --localstatedir=/var \ --infodir=/usr/share/info \ @@ -95,7 +95,7 @@ mk() { fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ - USE_ARCH=64 \ + USE_ARCH=$UARCH \ ./configure --host=$TARGET \ --localstatedir=/var \ --infodir=/usr/share/info \ diff --git a/SysBuild/xsys/MPlayer b/SysBuild/xsys/MPlayer index 05d71ea..633fa6a 100644 --- a/SysBuild/xsys/MPlayer +++ b/SysBuild/xsys/MPlayer @@ -82,9 +82,6 @@ premk() { mk() { if [ "$MK64BIT" == "true" ]; then ADDOPTIONS="--libdir=/usr/X11R7/lib64" - LIBDIR=lib64 - else - LIBDIR=lib fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ diff --git a/SysBuild/xsys/amarok b/SysBuild/xsys/amarok index 8df7530..c120429 100644 --- a/SysBuild/xsys/amarok +++ b/SysBuild/xsys/amarok @@ -77,10 +77,7 @@ premk() { mk() { if [ "$MK64BIT" == "true" ]; then - LIBDIR=lib64 ADDOPTIONS="--libdir=\${prefix}/lib64" - else - LIBDIR=lib fi ldconfig export QTDIR=/usr/$LIBDIR/qt diff --git a/SysBuild/xsys/avifile b/SysBuild/xsys/avifile index ed33bd4..d87ec62 100644 --- a/SysBuild/xsys/avifile +++ b/SysBuild/xsys/avifile @@ -124,9 +124,6 @@ mk() { export QTDIR=$STQTDIR if [ "$MK64BIT" == "true" ];then ADDOPTIONS="--libdir=\${prefix}/lib64" - LIBDIR=lib64 - else - LIBDIR=lib fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ diff --git a/SysBuild/xsys/boost b/SysBuild/xsys/boost index 59c6a8e..941a153 100644 --- a/SysBuild/xsys/boost +++ b/SysBuild/xsys/boost @@ -76,11 +76,6 @@ premk() { } mk() { - if [ "$MK64BIT" == "true" ]; then - LIBDIR=lib64 - else - LIBDIR=lib - fi LDFLAGS="-L/$LIBDIR -L/usr/$LIBDIR -L/usr/X11R7/$LIBDIR" \ ./configure --prefix=/usr/X11R7 \ --libdir=\${PREFIX}/$LIBDIR \ diff --git a/SysBuild/xsys/e-uae b/SysBuild/xsys/e-uae index f4a7364..3dd6b9d 100644 --- a/SysBuild/xsys/e-uae +++ b/SysBuild/xsys/e-uae @@ -76,11 +76,6 @@ premk() { } mk() { - if [ "$MK64BIT" == "true" ]; then - LIBDIR=lib64 - else - LIBDIR=lib - fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILdOPTIONS" \ CFLAGS="-L/$LIBDIR -L/usr/$LIBDIR -L/usr/X11R7/$LIBDIR" \ diff --git a/SysBuild/xsys/ethereal b/SysBuild/xsys/ethereal index 1f66402..b162cfc 100644 --- a/SysBuild/xsys/ethereal +++ b/SysBuild/xsys/ethereal @@ -96,11 +96,6 @@ mk32() { } mk() { - if [ "$MK64BIT" == "true" ]; then - LIBDIR="lib64" - else - LIBDIR="lib" - fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ ./configure --target=$TARGET \ diff --git a/SysBuild/xsys/evolution b/SysBuild/xsys/evolution index 1f690a4..c2112e3 100644 --- a/SysBuild/xsys/evolution +++ b/SysBuild/xsys/evolution @@ -96,9 +96,6 @@ mk32() { mk() { if [ "$MK64BIT" == "true" ]; then ADDOPTIONS="--libdir=\${prefix}/lib64" - LIBDIR=lib64 - else - LIBDIR=lib fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ diff --git a/SysBuild/xsys/ffmpeg b/SysBuild/xsys/ffmpeg index 6914d3b..7310fdc 100644 --- a/SysBuild/xsys/ffmpeg +++ b/SysBuild/xsys/ffmpeg @@ -102,10 +102,8 @@ mk32() { mk() { if [ "$MK64BIT" == "true" ];then - LIBDIR=lib64 ARCH=x86_64 else - LIBDIR=lib ARCH=i386 fi CC="gcc $BUILDOPTIONS" \ diff --git a/SysBuild/xsys/firefox b/SysBuild/xsys/firefox index 12830d6..d3e29a2 100644 --- a/SysBuild/xsys/firefox +++ b/SysBuild/xsys/firefox @@ -115,9 +115,6 @@ mk32() { mk() { if [ "$MK64BIT" == "true" ]; then ADDOPTIONS="--libdir=\${prefix}/lib64" - LIBDIR=lib64 - else - LIBDIR=lib fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ diff --git a/SysBuild/xsys/freefonts b/SysBuild/xsys/freefonts index af5434e..81a7319 100644 --- a/SysBuild/xsys/freefonts +++ b/SysBuild/xsys/freefonts @@ -80,11 +80,6 @@ premk() { } mk() { - if [ "$MK64BIT" == "true" ]; then - LIBDIR="lib64" - else - LIBDIR="lib" - fi rm boecklin.pfb blippo.pfb spooky.pfb dos_____.pfb capri.pfb rm linotext.pfb erasltra.pfb mazama.pfb old_town.pfb shf_____.pfb rm postanti.pfb cooprblk.pfb diff --git a/SysBuild/xsys/gail b/SysBuild/xsys/gail index 1bafeb5..3faeedd 100644 --- a/SysBuild/xsys/gail +++ b/SysBuild/xsys/gail @@ -98,9 +98,6 @@ mk32() { mk() { if [ "$MK64BIT" == "true" ];then ADDOPTIONS="--libdir=\${prefix}/lib64" - LIBDIR=lib64 - else - LIBDIR=lib fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ diff --git a/SysBuild/xsys/gnash b/SysBuild/xsys/gnash index e87c726..e4f7854 100644 --- a/SysBuild/xsys/gnash +++ b/SysBuild/xsys/gnash @@ -99,11 +99,6 @@ mk() { postmk() { ClearHostSysNameing $TMPROOT - if [ "$MK64BIT" == "true" ]; then - LIBDIR=lib64 - else - LIBDIR=lib - fi PLUGINDIR=/opt/firefox/$LIBDIR/firefox/plugins mkdir -p $TMPROOT$PLUGINDIR mv $TMPROOT/root/.firefox/plugins/* $TMPROOT$PLUGINDIR/ diff --git a/SysBuild/xsys/gnome-games b/SysBuild/xsys/gnome-games index 2bb691b..5268872 100644 --- a/SysBuild/xsys/gnome-games +++ b/SysBuild/xsys/gnome-games @@ -81,9 +81,6 @@ premk() { mk() { if [ "$MK64BIT" == "true" ]; then ADDOPTIONS="--libdir=\${prefix}/lib64" - LIBDIR=lib64 - else - LIBDIR=lib fi CC="gcc $BUILDOPTIONS" \ CXX="gcc $BUILDOPTIONS" \ diff --git a/SysBuild/xsys/haze b/SysBuild/xsys/haze index 1642801..99e7c76 100644 --- a/SysBuild/xsys/haze +++ b/SysBuild/xsys/haze @@ -82,11 +82,6 @@ premk() { } mk() { - if [ "$MK64BIT" == "true" ];then - LIBDIR=lib64 - else - LIBDIR=lib - fi make CC="gcc $BUILDOPTIONS" \ LDFLAGS="-L/$LIBDIR -L/usr/$LIBDIR -L/usr/X11R7/$LIBDIR" \ -j $NUMCPU diff --git a/SysBuild/xsys/jdk b/SysBuild/xsys/jdk index 211d24a..e7192cb 100644 --- a/SysBuild/xsys/jdk +++ b/SysBuild/xsys/jdk @@ -110,10 +110,8 @@ mk32() { mk() { if [ "$MK64BIT" == "true" ]; then PKGTYPE=amd64 - LIBDIR=lib64 else PKGTYPE=i586 - LIBDIR=lib fi mkdir -p $TMPROOT/usr/$LIBDIR cd $TMPROOT/usr/$LIBDIR diff --git a/SysBuild/xsys/k3b b/SysBuild/xsys/k3b index e3bf76c..8ad7baf 100644 --- a/SysBuild/xsys/k3b +++ b/SysBuild/xsys/k3b @@ -84,10 +84,7 @@ premk() { #Hier wird der Make Prozess der Sourcen definiert mk() { if [ "$MK64BIT" == "true" ]; then - LIBDIR=lib64 ADDOPTIONS="--libdir=\${prefix}/lib64" - else - LIBDIR=lib fi ldconfig export QTDIR=/usr/$LIBDIR/qt diff --git a/SysBuild/xsys/kaffeine b/SysBuild/xsys/kaffeine index 59c22a0..131e67c 100644 --- a/SysBuild/xsys/kaffeine +++ b/SysBuild/xsys/kaffeine @@ -80,10 +80,7 @@ premk() { mk() { if [ "$MK64BIT" == "true" ]; then - LIBDIR=lib64 ADDOPTIONS="--libdir=\${prefix}/lib64" - else - LIBDIR=lib fi ldconfig export QTDIR=/usr/$LIBDIR/qt diff --git a/SysBuild/xsys/kde-i18n-de b/SysBuild/xsys/kde-i18n-de index ea0b149..adc105e 100644 --- a/SysBuild/xsys/kde-i18n-de +++ b/SysBuild/xsys/kde-i18n-de @@ -80,10 +80,7 @@ premk() { #Hier wird der Make Prozess der Sourcen definiert mk() { if [ "$MK64BIT" == "true" ]; then - LIBDIR=lib64 ADDOPTIONS="--libdir=\${prefix}/lib64" - else - LIBDIR=lib fi ldconfig export QTDIR=/usr/$LIBDIR/qt diff --git a/SysBuild/xsys/kdeaccessibility b/SysBuild/xsys/kdeaccessibility index 54df7ff..943f034 100644 --- a/SysBuild/xsys/kdeaccessibility +++ b/SysBuild/xsys/kdeaccessibility @@ -80,10 +80,7 @@ premk() { #Hier wird der Make Prozess der Sourcen definiert mk() { if [ "$MK64BIT" == "true" ]; then - LIBDIR=lib64 ADDOPTIONS="--libdir=\${prefix}/lib64" - else - LIBDIR=lib fi ldconfig export QTDIR=/usr/$LIBDIR/qt diff --git a/SysBuild/xsys/kdeaddons b/SysBuild/xsys/kdeaddons index 650cac9..ddaa96c 100644 --- a/SysBuild/xsys/kdeaddons +++ b/SysBuild/xsys/kdeaddons @@ -80,10 +80,7 @@ premk() { #Hier wird der Make Prozess der Sourcen definiert mk() { if [ "$MK64BIT" == "true" ]; then - LIBDIR=lib64 ADDOPTIONS="--libdir=\${prefix}/lib64" - else - LIBDIR=lib fi ldconfig export QTDIR=/usr/$LIBDIR/qt diff --git a/SysBuild/xsys/kdeadmin b/SysBuild/xsys/kdeadmin index 3457d12..621ccd6 100644 --- a/SysBuild/xsys/kdeadmin +++ b/SysBuild/xsys/kdeadmin @@ -80,10 +80,7 @@ premk() { #Hier wird der Make Prozess der Sourcen definiert mk() { if [ "$MK64BIT" == "true" ]; then - LIBDIR=lib64 ADDOPTIONS="--libdir=\${prefix}/lib64" - else - LIBDIR=lib fi ldconfig export QTDIR=/usr/$LIBDIR/qt diff --git a/SysBuild/xsys/kdeartwork b/SysBuild/xsys/kdeartwork index 094ea33..16b5db3 100644 --- a/SysBuild/xsys/kdeartwork +++ b/SysBuild/xsys/kdeartwork @@ -81,10 +81,7 @@ premk() { #Hier wird der Make Prozess der Sourcen definiert mk() { if [ "$MK64BIT" == "true" ]; then - LIBDIR=lib64 ADDOPTIONS="--libdir=\${prefix}/lib64" - else - LIBDIR=lib fi ldconfig export QTDIR=/usr/$LIBDIR/qt diff --git a/SysBuild/xsys/kdebase b/SysBuild/xsys/kdebase index f4dc7a5..5586be5 100644 --- a/SysBuild/xsys/kdebase +++ b/SysBuild/xsys/kdebase @@ -80,10 +80,7 @@ premk() { #Hier wird der Make Prozess der Sourcen definiert mk() { if [ "$MK64BIT" == "true" ]; then - LIBDIR=lib64 ADDOPTIONS="--libdir=\${prefix}/lib64" - else - LIBDIR=lib fi ldconfig export QTDIR=/usr/$LIBDIR/qt diff --git a/SysBuild/xsys/kdebindings b/SysBuild/xsys/kdebindings index 03967b8..2306dca 100644 --- a/SysBuild/xsys/kdebindings +++ b/SysBuild/xsys/kdebindings @@ -84,10 +84,7 @@ premk() { #Hier wird der Make Prozess der Sourcen definiert mk() { if [ "$MK64BIT" == "true" ]; then - LIBDIR=lib64 ADDOPTIONS="--libdir=\${prefix}/lib64" - else - LIBDIR=lib fi ldconfig export QTDIR=/usr/$LIBDIR/qt diff --git a/SysBuild/xsys/kdeedu b/SysBuild/xsys/kdeedu index 1c1b6ab..5bcaa2b 100644 --- a/SysBuild/xsys/kdeedu +++ b/SysBuild/xsys/kdeedu @@ -80,10 +80,7 @@ premk() { #Hier wird der Make Prozess der Sourcen definiert mk() { if [ "$MK64BIT" == "true" ]; then - LIBDIR=lib64 ADDOPTIONS="--libdir=\${prefix}/lib64" - else - LIBDIR=lib fi ldconfig export QTDIR=/usr/$LIBDIR/qt diff --git a/SysBuild/xsys/kdegames b/SysBuild/xsys/kdegames index b1eed88..255d5ed 100644 --- a/SysBuild/xsys/kdegames +++ b/SysBuild/xsys/kdegames @@ -80,10 +80,7 @@ premk() { #Hier wird der Make Prozess der Sourcen definiert mk() { if [ "$MK64BIT" == "true" ]; then - LIBDIR=lib64 ADDOPTIONS="--libdir=\${prefix}/lib64" - else - LIBDIR=lib fi ldconfig export QTDIR=/usr/$LIBDIR/qt diff --git a/SysBuild/xsys/kdegraphics b/SysBuild/xsys/kdegraphics index 227e170..46c2fc4 100644 --- a/SysBuild/xsys/kdegraphics +++ b/SysBuild/xsys/kdegraphics @@ -80,10 +80,7 @@ premk() { #Hier wird der Make Prozess der Sourcen definiert mk() { if [ "$MK64BIT" == "true" ]; then - LIBDIR=lib64 ADDOPTIONS="--libdir=\${prefix}/lib64" - else - LIBDIR=lib fi ldconfig export QTDIR=/usr/$LIBDIR/qt diff --git a/SysBuild/xsys/kdelibs b/SysBuild/xsys/kdelibs index dfc5fc8..4bb269a 100644 --- a/SysBuild/xsys/kdelibs +++ b/SysBuild/xsys/kdelibs @@ -80,10 +80,7 @@ premk() { #Hier wird der Make Prozess der Sourcen definiert mk() { if [ "$MK64BIT" == "true" ]; then - LIBDIR=lib64 ADDOPTIONS="--libdir=\${prefix}/lib64" - else - LIBDIR=lib fi ldconfig export QTDIR=/usr/$LIBDIR/qt diff --git a/SysBuild/xsys/kdemultimedia b/SysBuild/xsys/kdemultimedia index 95b9383..6072695 100644 --- a/SysBuild/xsys/kdemultimedia +++ b/SysBuild/xsys/kdemultimedia @@ -80,10 +80,7 @@ premk() { #Hier wird der Make Prozess der Sourcen definiert mk() { if [ "$MK64BIT" == "true" ]; then - LIBDIR=lib64 ADDOPTIONS="--libdir=\${prefix}/lib64" - else - LIBDIR=lib fi ldconfig export QTDIR=/usr/$LIBDIR/qt diff --git a/SysBuild/xsys/kdenetwork b/SysBuild/xsys/kdenetwork index eb7b3ac..99604c8 100644 --- a/SysBuild/xsys/kdenetwork +++ b/SysBuild/xsys/kdenetwork @@ -81,10 +81,7 @@ premk() { #Hier wird der Make Prozess der Sourcen definiert mk() { if [ "$MK64BIT" == "true" ]; then - LIBDIR=lib64 ADDOPTIONS="--libdir=\${prefix}/lib64" - else - LIBDIR=lib fi ldconfig export QTDIR=/usr/$LIBDIR/qt diff --git a/SysBuild/xsys/kdepim b/SysBuild/xsys/kdepim index ff335d9..be0b1b9 100644 --- a/SysBuild/xsys/kdepim +++ b/SysBuild/xsys/kdepim @@ -82,10 +82,7 @@ premk() { #Hier wird der Make Prozess der Sourcen definiert mk() { if [ "$MK64BIT" == "true" ]; then - LIBDIR=lib64 ADDOPTIONS="--libdir=\${prefix}/lib64" - else - LIBDIR=lib fi ldconfig export QTDIR=/usr/$LIBDIR/qt diff --git a/SysBuild/xsys/kdesdk b/SysBuild/xsys/kdesdk index 1349a3f..91d126e 100644 --- a/SysBuild/xsys/kdesdk +++ b/SysBuild/xsys/kdesdk @@ -80,10 +80,7 @@ premk() { #Hier wird der Make Prozess der Sourcen definiert mk() { if [ "$MK64BIT" == "true" ]; then - LIBDIR=lib64 ADDOPTIONS="--libdir=\${prefix}/lib64" - else - LIBDIR=lib fi ldconfig export QTDIR=/usr/$LIBDIR/qt diff --git a/SysBuild/xsys/kdetoys b/SysBuild/xsys/kdetoys index bc2d582..909c26a 100644 --- a/SysBuild/xsys/kdetoys +++ b/SysBuild/xsys/kdetoys @@ -80,10 +80,7 @@ premk() { #Hier wird der Make Prozess der Sourcen definiert mk() { if [ "$MK64BIT" == "true" ]; then - LIBDIR=lib64 ADDOPTIONS="--libdir=\${prefix}/lib64" - else - LIBDIR=lib fi ldconfig export QTDIR=/usr/$LIBDIR/qt diff --git a/SysBuild/xsys/kdeutils b/SysBuild/xsys/kdeutils index 78e348a..21aa852 100644 --- a/SysBuild/xsys/kdeutils +++ b/SysBuild/xsys/kdeutils @@ -80,10 +80,7 @@ premk() { #Hier wird der Make Prozess der Sourcen definiert mk() { if [ "$MK64BIT" == "true" ]; then - LIBDIR=lib64 ADDOPTIONS="--libdir=\${prefix}/lib64" - else - LIBDIR=lib fi ldconfig export QTDIR=/usr/$LIBDIR/qt diff --git a/SysBuild/xsys/kdevelop b/SysBuild/xsys/kdevelop index af5e866..dd3e6fb 100644 --- a/SysBuild/xsys/kdevelop +++ b/SysBuild/xsys/kdevelop @@ -81,10 +81,7 @@ premk() { #Hier wird der Make Prozess der Sourcen definiert mk() { if [ "$MK64BIT" == "true" ]; then - LIBDIR=lib64 ADDOPTIONS="--libdir=\${prefix}/lib64" - else - LIBDIR=lib fi ldconfig export QTDIR=/usr/$LIBDIR/qt diff --git a/SysBuild/xsys/kdewebdev b/SysBuild/xsys/kdewebdev index 807682f..6204e96 100644 --- a/SysBuild/xsys/kdewebdev +++ b/SysBuild/xsys/kdewebdev @@ -77,10 +77,7 @@ premk() { #Hier wird der Make Prozess der Sourcen definiert mk() { if [ "$MK64BIT" == "true" ]; then - LIBDIR=lib64 ADDOPTIONS="--libdir=\${prefix}/lib64" - else - LIBDIR=lib fi ldconfig export QTDIR=/usr/$LIBDIR/qt diff --git a/SysBuild/xsys/kguitar b/SysBuild/xsys/kguitar index 719ad7c..7886e14 100644 --- a/SysBuild/xsys/kguitar +++ b/SysBuild/xsys/kguitar @@ -85,10 +85,7 @@ premk() { #Hier wird der Make Prozess der Sourcen definiert mk() { if [ "$MK64BIT" == "true" ]; then - LIBDIR=lib64 ADDOPTIONS="--libdir=\${prefix}/lib64" - else - LIBDIR=lib fi ldconfig export QTDIR=/usr/$LIBDIR/qt diff --git a/SysBuild/xsys/kino b/SysBuild/xsys/kino index 497ef1e..491ec03 100644 --- a/SysBuild/xsys/kino +++ b/SysBuild/xsys/kino @@ -76,11 +76,6 @@ premk() { } mk() { - if [ "$MK64BIT" == "true" ]; then - LIBDIR=lib64 - else - LIBDIR=lib - fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ LDFLAGS="-L/$LIBDIR -L/usr/$LIBDIR -L/usr/X11R7/$LIBDIR" \ diff --git a/SysBuild/xsys/koffice b/SysBuild/xsys/koffice index bed6478..64fd09c 100644 --- a/SysBuild/xsys/koffice +++ b/SysBuild/xsys/koffice @@ -80,10 +80,7 @@ premk() { #Hier wird der Make Prozess der Sourcen definiert mk() { if [ "$MK64BIT" == "true" ]; then - LIBDIR=lib64 ADDOPTIONS="--libdir=\${prefix}/lib64" - else - LIBDIR=lib fi ldconfig export QTDIR=/usr/$LIBDIR/qt diff --git a/SysBuild/xsys/koffice-l10n-de b/SysBuild/xsys/koffice-l10n-de index b9e9db2..24a05e9 100644 --- a/SysBuild/xsys/koffice-l10n-de +++ b/SysBuild/xsys/koffice-l10n-de @@ -80,10 +80,7 @@ premk() { #Hier wird der Make Prozess der Sourcen definiert mk() { if [ "$MK64BIT" == "true" ]; then - LIBDIR=lib64 ADDOPTIONS="--libdir=\${prefix}/lib64" - else - LIBDIR=lib fi ldconfig export QTDIR=/usr/$LIBDIR/qt diff --git a/SysBuild/xsys/krusader b/SysBuild/xsys/krusader index 9c0f4e5..4d40e8a 100644 --- a/SysBuild/xsys/krusader +++ b/SysBuild/xsys/krusader @@ -80,10 +80,7 @@ premk() { #Hier wird der Make Prozess der Sourcen definiert mk() { if [ "$MK64BIT" == "true" ]; then - LIBDIR=lib64 ADDOPTIONS="--libdir=\${prefix}/lib64" - else - LIBDIR=lib fi ldconfig export QTDIR=/usr/$LIBDIR/qt diff --git a/SysBuild/xsys/kwave b/SysBuild/xsys/kwave index 3e3e051..8995d5a 100644 --- a/SysBuild/xsys/kwave +++ b/SysBuild/xsys/kwave @@ -77,10 +77,7 @@ premk() { mk() { if [ "$MK64BIT" == "true" ]; then - LIBDIR=lib64 ADDOPTIONS="--libdir=\${prefix}/lib64" - else - LIBDIR=lib fi ldconfig export QTDIR=/usr/$LIBDIR/qt diff --git a/SysBuild/xsys/php b/SysBuild/xsys/php index 3eba77b..76f81ca 100644 --- a/SysBuild/xsys/php +++ b/SysBuild/xsys/php @@ -85,9 +85,6 @@ premk() { mk() { if [ "$MK64BIT" == "true" ]; then ADDOPTIONS="--libdir=\${prefix}/lib64" - LIBDIR=lib64 - else - LIBDIR=lib fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ diff --git a/SysBuild/xsys/qt-x11-free b/SysBuild/xsys/qt-x11-free index e6900a4..d667ad2 100644 --- a/SysBuild/xsys/qt-x11-free +++ b/SysBuild/xsys/qt-x11-free @@ -130,15 +130,12 @@ mk32() { mk() { if [ "$MK64BIT" == "true" ]; then ADDOPTIONS="-platform linux-g++-64" - LIBDIRS="lib64" mkdir $TMPROOT/usr/lib64 - else - LIBDIRS="lib" fi yes "yes"| \ CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ - ../qt-*/configure -prefix /usr/$LIBDIRS/qt \ + ../qt-*/configure -prefix /usr/$LIBDIR/qt \ -qt-gif \ -plugin-sql-odbc \ -system-zlib \ @@ -152,8 +149,8 @@ mk() { -tablet && make -j $NUMCPU make -j $NUMCPU install - cd /usr/$LIBDIRS/ - tar -cf - qt | tar -C $TMPROOT/usr/$LIBDIRS -xf - + cd /usr/$LIBDIR/ + tar -cf - qt | tar -C $TMPROOT/usr/$LIBDIR -xf - cd - } @@ -161,12 +158,10 @@ mk() { #in $TMPROOT noch einiges korrigieren postmk() { if [ "$MK64BIT" == "true" ]; then - LIBDIRS="lib lib64" + LIBDIR="lib lib64" ln -s /usr/lib64/qt/bin $TMPROOT/usr/lib/qt/bin - else - LIBDIR="lib" fi - for i in $LIBDIRS; do + for i in $LIBDIR; do cd $TMPROOT/usr/$i/qt/lib REVISION=`echo libqt-mt.so.3.[0-9].[0-9]|awk -F. '{print $NF}'` MINVER=`echo libqt-mt.so.3.[0-9].[0-9]|awk -F. '{print $(NF-1)}'` diff --git a/SysBuild/xsys/taskjuggler b/SysBuild/xsys/taskjuggler index 9680572..2e8e5a3 100644 --- a/SysBuild/xsys/taskjuggler +++ b/SysBuild/xsys/taskjuggler @@ -80,10 +80,7 @@ premk() { mk() { if [ "$MK64BIT" == "true" ]; then - LIBDIR=lib64 ADDOPTIONS="--libdir=\${prefix}/lib64" - else - LIBDIR=lib fi ldconfig export QTDIR=/usr/$LIBDIR/qt diff --git a/SysBuild/xsys/tetex-src b/SysBuild/xsys/tetex-src index e1fc406..017d2e3 100644 --- a/SysBuild/xsys/tetex-src +++ b/SysBuild/xsys/tetex-src @@ -79,11 +79,6 @@ premk() { } mk() { - if [ "$MK64BIT" == "true" ]; then - LIBDIR=lib64 - else - LIBDIR=lib - fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ ./configure --target=$TARGET \ diff --git a/SysBuild/xsys/thunderbird b/SysBuild/xsys/thunderbird index 95137ab..1b57170 100644 --- a/SysBuild/xsys/thunderbird +++ b/SysBuild/xsys/thunderbird @@ -116,9 +116,6 @@ mk32() { mk() { if [ "$MK64BIT" == "true" ]; then ADDOPTIONS="--libdir=\${prefix}/lib64" - LIBDIR=lib64 - else - LIBDIR=lib fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ diff --git a/SysBuild/xsys/xfce b/SysBuild/xsys/xfce index c821347..0e0ce94 100644 --- a/SysBuild/xsys/xfce +++ b/SysBuild/xsys/xfce @@ -80,11 +80,6 @@ premk() { #Hier wird der Make Prozess der Sourcen definiert mk() { - if [ "$MK64BIT" == "true" ]; then - LIBDIR=lib64 - else - LIBDIR=lib - fi export LD_LIBRARYPATH=/opt/xfce/$LIBDIR export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/xfce/$LIBDIR/pkgconfig for i in dbh \ diff --git a/SysBuild/xsys/xscreensaver b/SysBuild/xsys/xscreensaver index 4493b92..25d8cfd 100644 --- a/SysBuild/xsys/xscreensaver +++ b/SysBuild/xsys/xscreensaver @@ -79,11 +79,6 @@ premk() { } mk() { - if [ "$MK64BIT" == "true" ]; then - LIBDIR=lib64 - else - LIBDIR=lib - fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ LDFLAGS="-L$LIBDIR -L/usr/$LIBDIR -L/usr/X11R7/$LIBDIR" \ diff --git a/SysBuild/xsys/xv b/SysBuild/xsys/xv index 04f344e..b6f004d 100644 --- a/SysBuild/xsys/xv +++ b/SysBuild/xsys/xv @@ -85,11 +85,6 @@ premk() { } mk() { - if [ "$MK64BIT" == "true" ]; then - LIBDIR=lib64 - else - LIBDIR=lib - fi xmkmf sed -e "/^JPEGDIR/d" Makefile |\ sed -e "s%^LIBJPEG.*$%LIBJPEG = /usr/$LIBDIR/libjpeg.so%" |\ diff --git a/defsys b/defsys index a5df379..daf5d6a 100644 --- a/defsys +++ b/defsys @@ -46,7 +46,7 @@ VERSION=V962 # K8 (Opteron 32 Bit) # K8_64 (Opteron, AMD64, 64Bit) # EMT64 (nocona, core2duo, pIV 64Bit) -CPU=K8 +CPU=C2D #Pfad in welchem genuegend Platz ist um das Basis System (einmal statisch, #und dann dynamisch) zu generieren. diff --git a/functions/functions b/functions/functions index 7ceb61b..e0e795b 100644 --- a/functions/functions +++ b/functions/functions @@ -580,11 +580,15 @@ SetConfig() { (( CLEANUP_FLAGS = $CLEANUP_FLAGS | 64 )) STOREPKG_CONFIG_PATH=$PKG_CONFIG_PATH PKG_CONFIG_PATH=`echo $STOREPKG_CONFIG_PATH|sed "s/lib64/lib/g"` + UARCH=32 + LIBDIR=lib ;; 64) (( CLEANUP_FLAGS = $CLEANUP_FLAGS | 64 )) STOREPKG_CONFIG_PATH=$PKG_CONFIG_PATH PKG_CONFIG_PATH=`echo $STOREPKG_CONFIG_PATH|sed "s/lib/lib64/g"` + UARCH=64 + LIBDIR=lib64 ;; *) PKG_CONFIG_PATH=$STOREPKG_CONFIG_PATH diff --git a/genpkg b/genpkg index 456d542..92b2280 100755 --- a/genpkg +++ b/genpkg @@ -243,12 +243,12 @@ pkggen() { fi if [ $MK64BIT == "true" ]; then SetConfig 64 + else + SetConfig 32 fi mk sync - if [ $MK64BIT == "true" ]; then - SetConfig 0 - fi + SetConfig 0 CheckError "Somthing bad happens on mk()" AKTDIR=`pwd` cd $TMPROOT