summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2009-01-21 09:49:12 +0100
committerMichael Adam <obnox@samba.org>2009-11-13 16:19:33 +0100
commitb43a09f2a061480b4231900384613355e710ea31 (patch)
tree3abf93f91265ef87aeeed929fdbbcfda11d6eaaa
parent233a05fb933ead9edb51dca8c755170d767070c5 (diff)
downloadsamba-b43a09f2a061480b4231900384613355e710ea31.tar.gz
samba-b43a09f2a061480b4231900384613355e710ea31.tar.bz2
samba-b43a09f2a061480b4231900384613355e710ea31.zip
packaging(RHEL-CTDB): makerpms.sh: build winbind-32bit libs in the 64bit build
Michael (cherry picked from commit a9a506b6640986548e2ae8540b7ae93960d6ece5)
-rwxr-xr-xpackaging/RHEL-CTDB/makerpms.sh17
1 files changed, 9 insertions, 8 deletions
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."