summaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2009-01-21 09:49:12 +0100
committerKarolin Seeger <kseeger@samba.org>2009-11-26 11:40:47 +0100
commita34d9c6a18dba1f96e5e253357fdeece05b39efc (patch)
tree0a97406cb3c3e14969f9eb4165ef8f06fcabbe6e /packaging
parent68d68f049eaca93f38f74dbcec112ece6780a899 (diff)
downloadsamba-a34d9c6a18dba1f96e5e253357fdeece05b39efc.tar.gz
samba-a34d9c6a18dba1f96e5e253357fdeece05b39efc.tar.xz
samba-a34d9c6a18dba1f96e5e253357fdeece05b39efc.zip
packaging(RHEL-CTDB): makerpms.sh: build winbind-32bit libs in the 64bit build
Michael (cherry picked from commit a9a506b6640986548e2ae8540b7ae93960d6ece5) (cherry picked from commit 63d465cdbf522409b6ba9e6507be908d15ac997a)
Diffstat (limited to 'packaging')
-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 50fa96c2b11..8da9078f98e 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."