From e562db0c15f1fbd620c621de0b8d5b2418be301b Mon Sep 17 00:00:00 2001 From: kueller Date: Tue, 19 May 2009 13:21:38 +0000 Subject: [PATCH] attr und acl bauen jetzt 32 und 64 Bit libs - und das auch Dynamisch git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@4711 504e572c-2e33-0410-9681-be2bf7408885 --- BaseBuild/Basesys/acl | 60 ++++++++++++++++++++++++++++------ BaseBuild/Basesys/attr | 73 +++++++++++++++++++++++++++++++++++------- 2 files changed, 112 insertions(+), 21 deletions(-) diff --git a/BaseBuild/Basesys/acl b/BaseBuild/Basesys/acl index cfdfb51..5c552d9 100644 --- a/BaseBuild/Basesys/acl +++ b/BaseBuild/Basesys/acl @@ -78,6 +78,46 @@ premk() { fi } +mk32() { + CC="gcc ${BUILDOPTIONS32} -I/usr/include" \ + CXX="g++ ${BUILDOPTIONS32} -I/usr/include" \ + USE_ARCH=$UARCH \ + ./configure --host=$TARGET \ + --prefix=/ \ + --libdir=/usr/lib \ + --mandir=/usr/share/man + #sed -i -e "s%LIBTOOL.*$%LIBTOOL = /usr/bin/libtool --tag help%" include/builddefs + make -j $NUMCPU USE_ARCH=$UARCH + make -j $NUMCPU PKG_BIN_DIR=$TMPROOT/usr/bin \ + PKG_LIB_DIR=$TMPROOT/usr/lib \ + PKG_SBIN_DIR=$TMPROOT/sbin \ + PKG_SLIB_DIR=$TMPROOT/lib \ + PKG_INC_DIR=$TMPROOT/usr/include/xfs \ + PKG_MAN_DIR=$TMPROOT/usr/share/man \ + PKG_DOC_DIR=$TMPROOT/usr/share/doc/xfsprogs \ + USE_ARCH=$UARCH install + make -j $NUMCPU PKG_BIN_DIR=$TMPROOT/usr/bin \ + PKG_LIB_DIR=$TMPROOT/usr/lib \ + PKG_SBIN_DIR=$TMPROOT/sbin \ + PKG_SLIB_DIR=$TMPROOT/lib \ + PKG_INC_DIR=$TMPROOT/usr/include/xfs \ + PKG_MAN_DIR=$TMPROOT/usr/share/man \ + PKG_DOC_DIR=$TMPROOT/usr/share/doc/xfsprogs \ + USE_ARCH=$UARCH install-dev + rm $TMPROOT/usr/lib/libacl.a + cp libacl/.libs/libacl.{so,a} $TMPROOT/usr/lib + ln -sf ../usr/lib/libacl.a $TMPROOT/lib/libacl.a + ln -sf ../usr/lib/libacl.la $TMPROOT/lib/libacl.la + sed -i -e "s%libdir=.*$%libdir=\'/usr/lib\'%" \ + -e "s%/usr/sbin/libattr.la%/lib/libattr.la%" $TMPROOT/usr/lib/libacl.la + GenDynLib32 $TMPROOT/usr/lib/libacl.a 2.2.47 + cd .. + rm -r acl* + UnPack $MAKEDIR $LFSSOURCE/$SRCPATH/acl_*.tar.* + cd acl* +} + + mk() { if [ "$MK64BIT" == "true" ]; then ADDOPTIONS="--libdir=/usr/lib64" @@ -87,36 +127,36 @@ mk() { fi CC="gcc ${BUILDOPTIONS} -I/usr/include" \ CXX="g++ ${BUILDOPTIONS} -I/usr/include" \ + USE_ARCH=$UARCH \ ./configure --host=$TARGET \ --prefix=/ \ $ADDOPTIONS \ --mandir=/usr/share/man - sed -e "s%LIBTOOL.*$%LIBTOOL = /usr/bin/libtool --tag help%" \ - include/builddefs >/tmp/builddefs - mv /tmp/builddefs include/builddefs - make -j $NUMCPU + #sed -i -e "s%LIBTOOL.*$%LIBTOOL = /usr/bin/libtool --tag help%" include/builddefs + make -j $NUMCPU USE_ARCH=$UARCH \ make -j $NUMCPU PKG_BIN_DIR=$TMPROOT/usr/bin \ PKG_LIB_DIR=$TMPROOT/usr/$LIBDIR \ PKG_SBIN_DIR=$TMPROOT/sbin \ 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 + PKG_DOC_DIR=$TMPROOT/usr/share/doc/xfsprogs \ + USE_ARCH=$UARCH install make -j $NUMCPU PKG_BIN_DIR=$TMPROOT/usr/bin \ PKG_LIB_DIR=$TMPROOT/usr/$LIBDIR \ PKG_SBIN_DIR=$TMPROOT/sbin \ 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 + PKG_DOC_DIR=$TMPROOT/usr/share/doc/xfsprogs \ + USE_ARCH=$UARCH install-dev 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 + sed -i -e "s%libdir=.*$%libdir=\'/usr/$LIBDIR\'%" \ + -e "s%/usr/sbin/libattr.la%/$LIBDIR/libattr.la%" $TMPROOT/usr/$LIBDIR/libacl.la + GenDynLib $TMPROOT/usr/$LIBDIR/libacl.a 2.2.47 } postmk() { diff --git a/BaseBuild/Basesys/attr b/BaseBuild/Basesys/attr index 9f40651..ee8c589 100644 --- a/BaseBuild/Basesys/attr +++ b/BaseBuild/Basesys/attr @@ -74,12 +74,62 @@ premk() { fi } +mk32() { + CC="gcc ${BUILDOPTIONS32}" \ + CXX="g++ ${BUILDOPTIONS32}" \ + USE_ARCH=$UARCH \ + ./configure --host=$TARGET \ + --build=$TARGET \ + --target=$TARGET \ + --prefix=/ \ + --mandir=/usr/share/man + #sed -i -e "s%LIBTOOL.*$%LIBTOOL = /usr/bin/libtool --tag help%" include/builddefs + make -j $NUMCPU USE_ARCH=$UARCH + make -j $NUMCPU PKG_BIN_DIR=$TMPROOT/usr/bin \ + PKG_LIB_DIR=$TMPROOT/usr/lib \ + PKG_SBIN_DIR=$TMPROOT/sbin \ + PKG_SLIB_DIR=$TMPROOT/lib \ + PKG_INC_DIR=$TMPROOT/usr/include/attr \ + PKG_MAN_DIR=$TMPROOT/usr/share/man \ + PKG_DOC_DIR=$TMPROOT/usr/share/doc/xfsprogs \ + USE_ARCH=$UARCH install + make -j $NUMCPU PKG_BIN_DIR=$TMPROOT/usr/bin \ + PKG_LIB_DIR=$TMPROOT/usr/lib \ + PKG_SBIN_DIR=$TMPROOT/sbin \ + PKG_SLIB_DIR=$TMPROOT/lib \ + PKG_INC_DIR=$TMPROOT/usr/include/attr \ + PKG_MAN_DIR=$TMPROOT/usr/share/man \ + PKG_DOC_DIR=$TMPROOT/usr/share/doc/xfsprogs \ + USE_ARCH=$UARCH install-lib + make -j $NUMCPU PKG_BIN_DIR=$TMPROOT/usr/bin \ + PKG_LIB_DIR=$TMPROOT/usr/lib \ + PKG_SBIN_DIR=$TMPROOT/sbin \ + PKG_SLIB_DIR=$TMPROOT/lib \ + PKG_INC_DIR=$TMPROOT/usr/include/attr \ + PKG_MAN_DIR=$TMPROOT/usr/share/man \ + PKG_DOC_DIR=$TMPROOT/usr/share/doc/xfsprogs \ + USE_ARCH=$UARCH install-dev + rm $TMPROOT/usr/lib/libattr.{a,la} + cp libattr/.libs/libattr.{so,a}* $TMPROOT/usr/lib + cp /libexec/libattr.la $TMPROOT/usr/lib + ln -sf ../usr/lib/libattr.a $TMPROOT/lib/libattr.a + ln -sf ../usr/lib/libattr.la $TMPROOT/lib/libattr.la + ln -sf ../../lib/libattr.so $TMPROOT/usr/lib/libattr.so + rm $TMPROOT/lib/libattr.so + ln -s ../usr/lib/libattr.so.1.1.0 $TMPROOT/lib/libattr.so + sed -e "s/libdir=.*$/libdir=\'\/lib/" $TMPROOT/lib/libattr.la >/tmp/libattr.la + mv /tmp/libattr.la $TMPROOT/lib/libattr.la + rm $TMPROOT/usr/lib/libattr.so + ln -s libattr.so.1.1.0 $TMPROOT/usr/lib/libattr.so + cd .. + rm -r attr* + UnPack $MAKEDIR $LFSSOURCE/$SRCPATH/attr_*.tar.* + cd attr* +} + mk() { if [ "$MK64BIT" == "true" ]; then - ADDOPTIONS="--libdir=/usr/lib64" mkdir -p $TMPROOT/usr/lib64 $TMPROOT/lib64 - else - ADDOPTIONS="--libdir=/usr/lib" fi CC="gcc ${BUILDOPTIONS}" \ CXX="g++ ${BUILDOPTIONS}" \ @@ -87,33 +137,34 @@ mk() { --build=$TARGET \ --target=$TARGET \ --prefix=/ \ - $ADDOPTIONS \ + --libdir=/usr/$LIBDIR \ --mandir=/usr/share/man - sed -e "s%LIBTOOL.*$%LIBTOOL = /usr/bin/libtool --tag help%" \ - include/builddefs >/tmp/builddefs - mv /tmp/builddefs include/builddefs - make -j $NUMCPU + #sed -i -e "s%LIBTOOL.*$%LIBTOOL = /usr/bin/libtool --tag help%" include/builddefs + make -j $NUMCPU USE_ARCH=$UARCH make -j $NUMCPU PKG_BIN_DIR=$TMPROOT/usr/bin \ PKG_LIB_DIR=$TMPROOT/usr/$LIBDIR \ PKG_SBIN_DIR=$TMPROOT/sbin \ 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 + PKG_DOC_DIR=$TMPROOT/usr/share/doc/xfsprogs \ + USE_ARCH=$UARCH install make -j $NUMCPU PKG_BIN_DIR=$TMPROOT/usr/bin \ PKG_LIB_DIR=$TMPROOT/usr/$LIBDIR \ PKG_SBIN_DIR=$TMPROOT/sbin \ 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 + PKG_DOC_DIR=$TMPROOT/usr/share/doc/xfsprogs \ + USE_ARCH=$UARCH install-lib make -j $NUMCPU PKG_BIN_DIR=$TMPROOT/usr/bin \ PKG_LIB_DIR=$TMPROOT/usr/$LIBDIR \ PKG_SBIN_DIR=$TMPROOT/sbin \ 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 + PKG_DOC_DIR=$TMPROOT/usr/share/doc/xfsprogs \ + USE_ARCH=$UARCH install-dev rm $TMPROOT/usr/$LIBDIR/libattr.{a,la} cp libattr/.libs/libattr.{so,a}* $TMPROOT/usr/$LIBDIR cp /libexec/libattr.la $TMPROOT/usr/$LIBDIR