From b43a09f2a061480b4231900384613355e710ea31 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Wed, 21 Jan 2009 09:49:12 +0100 Subject: packaging(RHEL-CTDB): makerpms.sh: build winbind-32bit libs in the 64bit build Michael (cherry picked from commit a9a506b6640986548e2ae8540b7ae93960d6ece5) --- packaging/RHEL-CTDB/makerpms.sh | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'packaging') diff --git a/packaging/RHEL-CTDB/makerpms.sh b/packaging/RHEL-CTDB/makerpms.sh index 50fa96c2b1..8da9078f98 100755 --- a/packaging/RHEL-CTDB/makerpms.sh +++ b/packaging/RHEL-CTDB/makerpms.sh @@ -88,19 +88,20 @@ cp -p ${SPECFILE} ${RPMSPECDIR} popd ## -## Build +## some symlink fixes for building 32bit compat libs ## -echo "$(basename $0): Getting Ready to build release package" -pushd ${RPMSPECDIR} -${RPM} -ba $EXTRA_OPTIONS $SPECFILE -if [ "x$?" = "x0" ] && [ `arch` = "x86_64" ]; then - echo "Building 32 bit winbind libs" - # hi ho, a hacking we will go ... +if [ `arch` = "x86_64" ]; then ln -sf /lib/libcom_err.so.2 /lib/libcom_err.so ln -sf /lib/libuuid.so.1 /lib/libuuid.so - ${RPM} -ba --rebuild --target=i386 $SPECFILE fi +## +## Build +## +echo "$(basename $0): Getting Ready to build release package" + +pushd ${RPMSPECDIR} +${RPM} -ba $EXTRA_OPTIONS $SPECFILE popd echo "$(basename $0): Done." -- cgit