From 16b7017563a47683a12bcdd96cf24c7bf290b888 Mon Sep 17 00:00:00 2001 From: kueller Date: Thu, 28 May 2009 19:24:25 +0000 Subject: [PATCH] Weiter Packages Ueberarbeitet...ready for V962 git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@4763 504e572c-2e33-0410-9681-be2bf7408885 --- SysBuild/BuildCluster/BaseSysTools.dmk | 14 ++-- SysBuild/{tools => dbase}/mysql | 21 +++--- SysBuild/{tools => dbase}/postgresql | 15 ++-- SysBuild/{tools => network}/net-snmp | 25 ++++--- SysBuild/{tools => network}/openldap | 95 ++++++++++++++++--------- SysBuild/{tools => network}/openslp | 4 +- SysBuild/{tools => network}/samba | 91 ++++++++++++----------- SysBuild/{tools => security}/cyrus-sasl | 30 ++++++-- SysBuild/tools/amanda | 6 +- SysBuild/tools/cups | 2 + 10 files changed, 184 insertions(+), 119 deletions(-) rename SysBuild/{tools => dbase}/mysql (92%) rename SysBuild/{tools => dbase}/postgresql (94%) rename SysBuild/{tools => network}/net-snmp (90%) rename SysBuild/{tools => network}/openldap (74%) rename SysBuild/{tools => network}/openslp (98%) rename SysBuild/{tools => network}/samba (83%) rename SysBuild/{tools => security}/cyrus-sasl (80%) diff --git a/SysBuild/BuildCluster/BaseSysTools.dmk b/SysBuild/BuildCluster/BaseSysTools.dmk index ed0408f..a5bb1a8 100755 --- a/SysBuild/BuildCluster/BaseSysTools.dmk +++ b/SysBuild/BuildCluster/BaseSysTools.dmk @@ -58,7 +58,7 @@ 0 tools/mtx 0 tools/dbus 0 development/tcl -#Baud nicht mehr sauber. dürfte auch durch libxml2 ersetzt worden sein +#Baut nicht mehr sauber. dürfte auch durch libxml2 ersetzt worden sein #0 tools/libxml 0 tools/doctools 0 development/XML-Parser @@ -90,7 +90,6 @@ 0 multimedia/audiofile 0 multimedia/toolame 0 multimedia/a52dec - 0 multimedia/wav2cdr 0 multimedia/bladeenc 0 development/dmake @@ -166,12 +165,11 @@ 0 network/privoxy 0 network/ipvsadm 0 network/openssh - -0 tools/cyrus-sasl -0 tools/openldap +0 security/cyrus-sasl 0 tools/net-snmp -0 tools/postgresql -0 tools/mysql -0 tools/openslp +0 dbase/mysql +0 network/openldap +0 network/openslp + 0 tools/samba 0 tools/amanda diff --git a/SysBuild/tools/mysql b/SysBuild/dbase/mysql similarity index 92% rename from SysBuild/tools/mysql rename to SysBuild/dbase/mysql index 6a92960..b187116 100644 --- a/SysBuild/tools/mysql +++ b/SysBuild/dbase/mysql @@ -68,7 +68,7 @@ # #Pfad zum Basis-Sourcetree : -SRCPATH=Tools/Database +SRCPATH=DBase/Server #Wenn das usgepackte Verzeichnis vom Paketnamen unterschiedlich ist #SRCDIR= @@ -81,23 +81,23 @@ premk() { mk32() { CC="gcc $BUILDOPTIONS32" \ CXX="g++ $BUILDOPTIONS32" \ + USE_ARCH=$UARCH \ ./configure --target=$TARGET32 \ --sysconfdir=/etc \ --prefix=/opt/MySQL \ - --enable-thread-save-client \ + --libexecdir=\${prefix}/sbin \ --enable-assembler \ --with-gnu-ld \ --with-server-suffix=CompuExtreme \ --with-pthread \ --with-mysqld-user=mysql \ - --with-mysqlfs \ - --with-vio \ - --with-openssl && + --with-ssl && make -j $NUMCPU && make -j $NUMCPU DESTDIR=$TMPROOT install && CheckError "Make install process failed !" 1 make distclean ClearHostSysNameing32 $TMPROOT + mv $TMPROOT/opt/MySQL/bin/mysql_config{,-32} } mk() { @@ -106,19 +106,18 @@ mk() { fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ + USE_ARCH=$UARCH \ ./configure --target=$TARGET \ --sysconfdir=/etc \ --prefix=/opt/MySQL \ $ADDOPTIONS \ - --enable-thread-save-client \ + --libexecdir=\${prefix}/sbin \ --enable-assembler \ --with-gnu-ld \ --with-server-suffix=CompuExtreme \ --with-pthread \ --with-mysqld-user=mysql \ - --with-mysqlfs \ - --with-vio \ - --with-openssl && + --with-ssl && make -j $NUMCPU && make -j $NUMCPU DESTDIR=$TMPROOT install && CheckError "Make install process failed !" 1 @@ -134,5 +133,9 @@ postmk() { cd - GetSVN Viitor_mysql $TMPROOT ClearHostSysNameing $TMPROOT + if [ "$MK64BIT" == "true" ]; then + mv $TMPROOT/opt/MySQL/bin/mysql_config{,-64} + ln -s /usr/bin/multiarch_wrapper $TMPROOT/opt/MySQL/bin/mysql_config + fi CheckError "postmk() failed !" 1 } diff --git a/SysBuild/tools/postgresql b/SysBuild/dbase/postgresql similarity index 94% rename from SysBuild/tools/postgresql rename to SysBuild/dbase/postgresql index 78b0833..43026ef 100644 --- a/SysBuild/tools/postgresql +++ b/SysBuild/dbase/postgresql @@ -69,27 +69,29 @@ # #Pfad zum Basis-Sourcetree : -SRCPATH=Tools/Database +SRCPATH=DBase/Server #Wenn das usgepackte Verzeichnis vom Paketnamen unterschiedlich ist #SRCDIR= premk() { - X11R7_Fix + #X11R7_Fix + echo "Nothing to do for premk()" } mk32() { CC="gcc $BUILDOPTIONS32" \ CXX="g++ $BUILDOPTIONS32" \ + USE_ARCH=$UARCH \ ./configure --target=$TARGET32 \ --prefix=/opt/PostgreSQL \ --enable-locale \ --enable-multibyte \ --enable-unicode-conversion \ --with-tcl \ - --with-tclconfig=/usr/X11R6/lib/ \ - --with-tkconfig=/usr/X11R6/lib/ \ + --with-tclconfig=/usr/X11R7/lib/ \ + --with-tkconfig=/usr/X11R7/lib/ \ --with-pam \ --with-openssl \ --enable-odbc \ @@ -114,6 +116,7 @@ mk() { fi CC="gcc $BUILDOPTIONS -fPIC" \ CXX="g++ $BUILDOPTIONS -fPIC" \ + USE_ARCH=$UARCH \ ./configure --target=$TARGET \ --prefix=/opt/PostgreSQL \ $ADDOPTIONS \ @@ -121,8 +124,8 @@ mk() { --enable-multibyte \ --enable-unicode-conversion \ --with-tcl \ - --with-tclconfig=/usr/X11R6/$LIBDIRS/ \ - --with-tkconfig=/usr/X11R6/$LIBDIRS/ \ + --with-tclconfig=/usr/X11R7/$LIBDIRS/ \ + --with-tkconfig=/usr/X11R7/$LIBDIRS/ \ --with-pam \ --with-python \ --with-openssl \ diff --git a/SysBuild/tools/net-snmp b/SysBuild/network/net-snmp similarity index 90% rename from SysBuild/tools/net-snmp rename to SysBuild/network/net-snmp index 709dbfa..08ca9bc 100644 --- a/SysBuild/tools/net-snmp +++ b/SysBuild/network/net-snmp @@ -71,7 +71,7 @@ # Downlad location: http://net-snmp.sourceforge.net/ #Pfad zum Basis-Sourcetree : -SRCPATH=Tools/Net +SRCPATH=Network/Servers #Wenn das usgepackte Verzeichnis vom Paketnamen unterschiedlich ist #SRCDIR= @@ -87,6 +87,7 @@ mk32() { yes ""|\ CC="gcc $BUILDOPTIONS32" \ CXX="g++ $BUILDOPTIONS32" \ + USE_ARCH=$UARCH \ ./configure --target=$TARGET32 \ --prefix=/usr \ --sysconfdir=/etc/snmp \ @@ -97,14 +98,15 @@ mk32() { --with-perl-modules \ --with-mib-modules="host,smux,tunnel" - for i in `find . -name Makefile`; do - < $i >/tmp/Makefile sed -e "s/prefix.*= /prefix\t= \${DESTDIR}/g" - mv /tmp/Makefile $i - done + #for i in `find . -name Makefile`; do + #< $i >/tmp/Makefile sed -e "s/prefix.*= /prefix\t= \${DESTDIR}/g" + #mv /tmp/Makefile $i + #done make -j $NUMCPU make -j $NUMCPU DESTDIR=$TMPROOT install make distclean + mv $TMPROOT/usr/bin/net-snmp-config{,-32} } mk() { @@ -114,6 +116,7 @@ mk() { yes ""|\ CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ + USE_ARCH=$UARCH \ ./configure --target=$TARGET \ --prefix=/usr \ $ADDOPTIONS \ @@ -125,10 +128,10 @@ mk() { --with-perl-modules \ --with-mib-modules="host,smux,tunnel" - for i in `find . -name Makefile`; do - < $i >/tmp/Makefile sed -e "s/prefix.*= /prefix\t= \${DESTDIR}/g" - mv /tmp/Makefile $i - done + #for i in `find . -name Makefile`; do + #< $i >/tmp/Makefile sed -e "s/prefix.*= /prefix\t= \${DESTDIR}/g" + #mv /tmp/Makefile $i + #done @@ -142,6 +145,10 @@ mk() { cp -rp /usr/man $TMPROOT/usr/share rm -r /usr/man fi + if [ "$MK64BIT" == "true" ]; then + mv $TMPROOT/usr/bin/net-snmp-config{,-64} + ln -s multiarch_wrapper $TMPROOT/usr/bin/net-snmp-config + fi } postmk() { diff --git a/SysBuild/tools/openldap b/SysBuild/network/openldap similarity index 74% rename from SysBuild/tools/openldap rename to SysBuild/network/openldap index 727680f..d23ee0c 100644 --- a/SysBuild/tools/openldap +++ b/SysBuild/network/openldap @@ -71,7 +71,7 @@ # #Pfad zu Basis Source Tree eintragen! -SRCPATH=Tools/Net +SRCPATH=Network/Servers #Funktion wird nach dem Entpacken der Sourcen, im Tree der Sourcen #ausgeführt (sprich unpack src; cd src; premk) @@ -80,13 +80,13 @@ SRCPATH=Tools/Net premk() { mkdir ../build-openldap cd ../build-openldap - } mk32() { - LDFLAGS="-L/usr/lib" \ - CC="gcc ${BUILDOPTIONS32}" \ - CXX="g++ ${BUILDOPTIONS32}" \ + LDFLAGS="-L/usr/lib -L/usr/lib/sasl2" \ + CC="gcc ${BUILDOPTIONS32} -I/usr/include/sasl" \ + CXX="g++ ${BUILDOPTIONS32} -I/usr/include/sasl" \ + USE_ARCH=$UARCH \ ../openldap*/configure --host=$TARGET32 \ --prefix=/usr \ --sysconfdir=/etc \ @@ -94,34 +94,51 @@ mk32() { --localstatedir=/var \ --mandir=/usr/share/man \ --disable-debug \ - --enable-backends=yes \ - --enable-sql=no \ + --enable-dynamic \ + --enable-syslog \ + --enable-crypt \ + --enable-lmpasswd \ + --enable-spasswd \ + --enable-modules \ + --enable-rlookups \ + --enable-rlookups \ + --enable-bdb \ + --enable-dnsserv \ + --enable-hdb \ + --enable-ldap \ + --enable-meta \ + --enable-monitor \ + --enable-null \ + --enable-passwd \ + --enable-perl \ + --enable-relay \ + --enable-shell \ + --enable-sock \ --enable-overlays=yes \ - --enable-crypt=yes \ - --enable-lmpasswd=yes \ - --enable-spasswd=yes \ - --enable-modules=yes \ - --enable-slurpd=yes \ --with-cyrus-sasl \ + --with-gssapi \ --with-threads \ --with-tls \ --with-mp \ - --disable-perl \ --with-gnu-ld - make depend && - make -j $NUMCPU && - make -j $NUMCPU DESTDIR=$TMPROOT install - make distclean + make LDEMULATION=elf_i386 depend + make -j $NUMCPU LDEMULATION=elf_i386 + make -j $NUMCPU LDEMULATION=elf_i386 DESTDIR=$TMPROOT install + cd ../openldap* + rm -r ../build-openldap + mkdir ../build-openldap + cd ../build-openldap } #Hier wird der Make Prozess der Sourcen definiert mk() { if [ "$MK64BIT" == "true" ]; then ADDOPTIONS="--libdir=/usr/lib64" - export LDFLAGS="-L/usr/lib64" fi - CC="gcc" \ - CXX="g++" \ + CC="gcc $BUILDOPTIONS -I/usr/include/sasl" \ + CXX="g++ $BUILDOPTIONS -I/usr/include/sasl" \ + LDFLAGS="-L/usr/$LIBDIR -L/usr/$LIBDIR/sasl2" \ + USE_ARCH=$UARCH \ ../openldap*/configure --host=$TARGET \ --prefix=/usr \ $ADDOPTIONS \ @@ -130,22 +147,35 @@ mk() { --localstatedir=/var \ --mandir=/usr/share/man \ --disable-debug \ - --enable-backends=yes \ - --enable-sql=no \ + --enable-dynamic \ + --enable-syslog \ + --enable-crypt \ + --enable-lmpasswd \ + --enable-spasswd \ + --enable-modules \ + --enable-rlookups \ + --enable-rlookups \ + --enable-bdb \ + --enable-dnsserv \ + --enable-hdb \ + --enable-ldap \ + --enable-meta \ + --enable-monitor \ + --enable-null \ + --enable-passwd \ + --enable-perl \ + --enable-relay \ + --enable-shell \ + --enable-sock \ --enable-overlays=yes \ - --enable-perl=yes \ - --enable-crypt=yes \ - --enable-lmpasswd=yes \ - --enable-spasswd=yes \ - --enable-modules=yes \ - --enable-slurpd=yes \ --with-cyrus-sasl \ + --with-gssapi \ --with-threads \ --with-tls \ --with-mp \ --with-gnu-ld - make depend && - make -j $NUMCPU && + make depend + make -j $NUMCPU make -j $NUMCPU DESTDIR=$TMPROOT install } @@ -156,9 +186,8 @@ postmk() { mkdir -p $TMPROOT/usr/share/doc/openldap cp -a ../openldap*/doc/* $TMPROOT/usr/share/doc/openldap - cd .. - rm -r build-openldap - cd openldap* + cd ../openldap* + rm -r ../build-openldap # disable start mv $TMPROOT/etc/openldap/slapd.conf $TMPROOT/etc/openldap/slapd.conf.disabled diff --git a/SysBuild/tools/openslp b/SysBuild/network/openslp similarity index 98% rename from SysBuild/tools/openslp rename to SysBuild/network/openslp index ae27569..ec866ba 100644 --- a/SysBuild/tools/openslp +++ b/SysBuild/network/openslp @@ -68,7 +68,7 @@ # #Pfad zum Basis-Sourcetree : -SRCPATH=Tools/Net +SRCPATH=Network/Lib #Wenn das usgepackte Verzeichnis vom Paketnamen unterschiedlich ist #SRCDIR= @@ -83,6 +83,7 @@ premk() { mk32() { CC="gcc $BUILDOPTIONS32" \ CXX="g++ $BUILDOPTIONS32" \ + USE_ARCH=$UARCH \ ./configure --host=$TARGET32 \ --prefix=/usr \ --enable-async-api \ @@ -98,6 +99,7 @@ mk() { fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ + USE_ARCH=$UARCH \ ./configure --host=$TARGET \ --prefix=/usr \ $ADDOPTIONS \ diff --git a/SysBuild/tools/samba b/SysBuild/network/samba similarity index 83% rename from SysBuild/tools/samba rename to SysBuild/network/samba index 0306c93..0f4a06f 100644 --- a/SysBuild/tools/samba +++ b/SysBuild/network/samba @@ -69,7 +69,7 @@ # # -SRCPATH=Tools/Net +SRCPATH=Network/Servers #Funktion wird nach dem Entpacken der Sourcen, im Tree der Sourcen #ausgeführt (sprich unpack src; cd src; premk) @@ -88,41 +88,40 @@ premk() { # tar xvzf $LFSSOURCE/$SRCPATH/smbldap-tools-0.9.2* # delivered with source - cd ../examples/VFS - tar xvjf $LFSSOURCE/$SRCPATH/samba-vscan* - cd ../../source + #cd ../examples/VFS + #tar xvjf $LFSSOURCE/$SRCPATH/samba-vscan* + #cd ../../source + cd $WD } mk32() { CC="gcc $BUILDOPTIONS32" \ CXX="g++ $BUILDOPTIONS32" \ + USE_ARCH=$UARCH \ + LDEMULATION=elf_i386 \ ./configure --target=$TARGET32 \ --with-configdir=/etc/samba \ - --with-sysconfdir=/etc/samba \ + --sysconfdir=/etc/samba \ --prefix=/opt/samba \ + --mandir=/usr/share/man \ --with-privatedir=/etc/samba \ --with-lockdir=/var/locks \ --with-swatdir=/opt/samba/swat \ --with-logfilebase=/var \ - --with-cups \ + --enable-cups \ --with-ldap \ --with-ads \ --with-krb5 \ --with-automount \ - --with-smbmount \ --with-pam \ --with-pam_smbpass \ - --with-ldapsam \ --with-quotas \ --with-acl-support \ --with-aio-support \ - --with-python \ --with-syslog \ - --with-libsmbclient \ - --without-python && - sed -e "s/lib64/lib/g" Makefile >/tmp/Makefile - mv /tmp/Makefile Makefile - make + --with-libsmbclient && + sed -i -e "s/lib64/lib/g" Makefile + make -j $NUMCPU LDEMULATION=elf_i386 make DESTDIR=$TMPROOT install make DESTDIR=$TMPROOT installclientlib make distclean @@ -132,65 +131,65 @@ mk32() { #Hier wird der Make Prozess der Sourcen definiert mk() { if [ "$MK64BIT" == "true" ]; then - ADDOPTIONS="--with-libdir=\${prefix}/lib64" + ADDOPTIONS="--libdir=\${prefix}/lib64" fi - CC="gcc $BUILDOPTIONS" \ - CXX="g++ $BUILDOPTIONS" \ + CC="gcc $BUILDOPTIONS -fPIC" \ + CXX="g++ $BUILDOPTIONS -fPIC" \ + USE_ARCH=$UARCH \ ./configure --target=$TARGET \ --with-configdir=/etc/samba \ - --with-sysconfdir=/etc/samba \ + --sysconfdir=/etc/samba \ --prefix=/opt/samba \ + --mandir=/usr/share/man \ $ADDOPTIONS \ --with-privatedir=/etc/samba \ --with-lockdir=/var/locks \ --with-swatdir=/opt/samba/swat \ --with-logfilebase=/var \ - --with-cups \ + --enable-cups \ --with-ldap \ --with-ads \ --with-krb5 \ --with-automount \ - --with-smbmount \ --with-pam \ --with-pam_smbpass \ - --with-ldapsam \ --with-quotas \ --with-acl-support \ --with-aio-support \ - --with-python \ --with-syslog \ --with-libsmbclient && - make -k -j $NUMCPU - make -j $NUMCPU - make -k -j $NUMCPU DESTDIR=$TMPROOT install - make -k -j $NUMCPU DESTDIR=$TMPROOT installclientlib + make -j $NUMCPU + make -j $NUMCPU DESTDIR=$TMPROOT install + make -j $NUMCPU DESTDIR=$TMPROOT installclientlib mv $TMPROOT/opt/samba/lib/smb.conf $TMPROOT/etc/samba # LDAP support for PDC service cd mkntpwd make -j $NUMCPU cp mkntpwd $TMPROOT/opt/samba/bin - cd ../../examples/LDAP/smbldap-tools-* - cp smbldap*/smbldap-* $TMPROOT/opt/samba/sbin - cp smbldap*/smbldap_tools.pm $TMPROOT/opt/samba/sbin - mkdir -p /etc/smbldap-tools - cp smbldap*/*.conf $TMPROOT/etc/smbldap-tools - chmod 644 $TMPROOT/etc/smbldap-tools/smbldap.conf - chmod 600 $TMPROOT/etc/smbldap-tools/smbldap_bind.conf + cd ../../examples/LDAP/ + mkdir -p $TMPROOT/etc/openldap/schema + cp *.schema $TMPROOT/etc/openldap/schema + cp *.ldif $TMPROOT/etc/openldap/schema + for i in convertSambaAccount get_next_oid ol-schema-migrate.pl; do + cp $i $TMPROOT/opt/samba/bin + chmod 755 $TMPROOT/opt/samba/bin/$i + done cd $WD - # virusscan support - make -j $NUMCPU proto - - cd ../examples/VFS/samba-vscan* - ./configure --host=$BUILDSYS \ - --target=$TARGET \ - --build=$BUILDSYS \ - --sysconfdir=/etc/samba \ - --prefix=/opt/samba - - make -j $NUMCPU - make -j $NUMCPU DESTDIR=$TMPROOT install - cd $WD + ## virusscan support + ## Deaktiviert, da nicht mehr compilebar + #make -j $NUMCPU proto + # + #cd ../examples/VFS/samba-vscan* + #./configure --host=$BUILDSYS \ + #--target=$TARGET \ + #--build=$BUILDSYS \ + #--sysconfdir=/etc/samba \ + #--prefix=/opt/samba + # + #make -j $NUMCPU + #make -j $NUMCPU DESTDIR=$TMPROOT install + #cd $WD } #Funktion wird nach Ablauf des Make Prozesses ausgeführt, und kann diff --git a/SysBuild/tools/cyrus-sasl b/SysBuild/security/cyrus-sasl similarity index 80% rename from SysBuild/tools/cyrus-sasl rename to SysBuild/security/cyrus-sasl index 0edb1c9..ac13e39 100644 --- a/SysBuild/tools/cyrus-sasl +++ b/SysBuild/security/cyrus-sasl @@ -71,7 +71,7 @@ # #Pfad zu Basis Source Tree eintragen! -SRCPATH=Tools/Lib +SRCPATH=Security/Lib #Funktion wird nach dem Entpacken der Sourcen, im Tree der Sourcen #ausgeführt (sprich unpack src; cd src; premk) @@ -82,8 +82,8 @@ premk() { } mk32() { - CC="gcc $BUILDOPTIONS32" \ - CXX="g++ $BUILDOPTIONS32" \ + CC="gcc $BUILDOPTIONS32 -fPIC" \ + CXX="g++ $BUILDOPTIONS32 -fPIC" \ USE_ARCH=$UARCH \ ./configure --host=$TARGET32 \ --prefix=/usr \ @@ -101,6 +101,15 @@ mk32() { make -j $NUMCPU && make -j $NUMCPU DESTDIR=$TMPROOT install make distclean + GenDynLib32 $TMPROOT/usr/lib/sasl2/libsasldb.a 2.1.23 + GenDynLib32 $TMPROOT/usr/lib/sasl2/libanonymous.a 2.1.23 + GenDynLib32 $TMPROOT/usr/lib/sasl2/libgssapiv2.a 2.1.23 + GenDynLib32 $TMPROOT/usr/lib/sasl2/liblogin.a 2.1.23 + GenDynLib32 $TMPROOT/usr/lib/sasl2/libotp.a 2.1.23 + GenDynLib32 $TMPROOT/usr/lib/sasl2/libplain.a 2.1.23 + GenDynLib32 $TMPROOT/usr/lib/libsasl2.a 2.1.23 + sed -i -e "s/\(dependency_libs='\)\(.*-ldl\)\(.*$\)/\1-L\/usr\/lib\/sasl2 \2 -lgssapiv2 -lgssapi_krb5\3/" \ + $TMPROOT/usr/lib/libsasl2.la } #Hier wird der Make Prozess der Sourcen definiert @@ -110,15 +119,15 @@ mk() { --with-plugindir=/usr/lib64/sasl2 " mv $TMPROOT/usr/lib/sasl2{,_32} fi - CC="gcc $BUILDOPTIONS" \ - CXX="g++ $BUILDOPTIONS" \ + CC="gcc $BUILDOPTIONS -fPIC" \ + CXX="g++ $BUILDOPTIONS -fPIC" \ USE_ARCH=$UARCH \ ./configure --host=$TARGET \ --prefix=/usr \ $ADDOPTIONS \ --with-configdir=/etc/sasl2 \ --with-saslauthd=/var/run/sasl2 \ - --with-pam=/lib/security \ + --with-pam=/$LIBDIR/security \ --with-dblib=berkeley \ --enable-login \ --enable-gssapi \ @@ -133,6 +142,15 @@ mk() { mv $TMPROOT/usr/lib/sasl2 $TMPROOT/usr/lib64 mv $TMPROOT/usr/lib/sasl2_32 $TMPROOT/usr/lib/sasl2 fi + GenDynLib $TMPROOT/usr/$LIBDIR/sasl2/libsasldb.a 2.1.23 + GenDynLib $TMPROOT/usr/$LIBDIR/sasl2/libanonymous.a 2.1.23 + GenDynLib $TMPROOT/usr/$LIBDIR/sasl2/libgssapiv2.a 2.1.23 + GenDynLib $TMPROOT/usr/$LIBDIR/sasl2/liblogin.a 2.1.23 + GenDynLib $TMPROOT/usr/$LIBDIR/sasl2/libotp.a 2.1.23 + GenDynLib $TMPROOT/usr/$LIBDIR/sasl2/libplain.a 2.1.23 + GenDynLib $TMPROOT/usr/$LIBDIR/libsasl2.a 2.1.23 + sed -i -e "s/\(dependency_libs='\)\(.*-ldl\)\(.*$\)/\1-L\/usr\/$LIBDIR\/sasl2 \2 -lgssapiv2 -lgssapi_krb5\3/" \ + $TMPROOT/usr/$LIBDIR/libsasl2.la } #Funktion wird nach Ablauf des Make Prozesses ausgeführt, und kann diff --git a/SysBuild/tools/amanda b/SysBuild/tools/amanda index 98078c6..ed62313 100644 --- a/SysBuild/tools/amanda +++ b/SysBuild/tools/amanda @@ -101,6 +101,7 @@ premk() { mk32() { CC="gcc ${BUILDOPTIONS32}" \ CXX="g++ ${BUILDOPTIONS32}" \ + USE_ARCH=$UARCH \ ../amanda*/configure --target=$TARGET32 \ --with-user=amanda \ --with-group=backup \ @@ -113,8 +114,10 @@ mk32() { --sysconfdir=/etc make -j $NUMCPU make -j $NUMCPU DESTDIR=$TMPROOT install - make distclean ClearHostSysNameing32 $TMPROOT + cd ../amanda* + rm -r ../build-amanda + cd ../build-amanda } mk() { @@ -124,6 +127,7 @@ mk() { CC="gcc ${BUILDOPTIONS}" \ CXX="g++ ${BUILDOPTIONS}" \ + USE_ARCH=$UARCH \ ../amanda*/configure --target=$TARGET \ --with-user=amanda \ --with-group=backup \ diff --git a/SysBuild/tools/cups b/SysBuild/tools/cups index e347886..d9745ba 100644 --- a/SysBuild/tools/cups +++ b/SysBuild/tools/cups @@ -83,6 +83,7 @@ premk() { mk32() { CC="gcc $BUILDOPTIONS32" \ CXX="g++ $BUILDOPTIONS32" \ + USE_ARCH=$UARCH \ ./configure --target=$TARGET32 \ --prefix=/usr \ --sysconfdir=/etc \ @@ -106,6 +107,7 @@ mk() { fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ + USE_ARCH=$UARCH \ ./configure --target=$TARGET \ --prefix=/usr \ $ADDOPTIONS \