This patch to Dude's GNUTLS guarantees that the 32-bit versions of
libgnutls-openssl.so and libgnutls-extras link against
/opt/foss/lib/libgnutls.so
and not /usr/lib/libgnutls.so.
Tested: x64-Dude S10, x86-Dude S10, x86-Dude SXCE,
x64-hg-dev S10, x86-hg-dev S10, x86-hg-dev SXCE.
If someone can figure out what libtool is doing wrong, I'm more
than willing to pull this patch. But in the meantime, It's working.
This is also tested by putting this in Solaris-GNUTLS-1.4.5.tar.gz and
building from the hg-dev.
Index: SPECS/gnutls.pspc
===================================================================
--- SPECS/gnutls.pspc (revision 2813)
+++ SPECS/gnutls.pspc (working copy)
@@ -23,6 +23,8 @@
%{_includedir}/*
%dir %attr (0755, root, sys) %{_datadir}
%{_datadir}/locale/*/LC_MESSAGES/gnutls.mo
+%dir %attr (0755, root, other) %{_datadir}/info
+%{_datadir}/info/gnutls.info*
%dir %attr (0755, root, bin) %{_mandir}
%{_mandir}/*
%dir %attr (0755, root, other) %{_datadir}/aclocal
Index: GNUTLS/1.4.5/Solaris/build.sh
===================================================================
--- GNUTLS/1.4.5/Solaris/build.sh (revision 2813)
+++ GNUTLS/1.4.5/Solaris/build.sh (working copy)
@@ -1,4 +1,20 @@
-#!/bin/sh
+#!/bin/ksh
+#
+# This solves a nasty libtool problem for 32-bit
+# libgnutls-openssl and libgnutls-extras, so
+# they think against /opt/foss/lib/libgnutls.so
+# and not /usr/lib/libgnutls.so. After the
+# installs, this link disappears
+#
+CWD=`pwd`
+cd /opt/foss/lib
+if [ -e /opt/foss/lib/libgnutls.so ] ; then
+ echo "ERROR: /opt/foss/lib/libgnutls.so exists"
+ exit 1
+fi
+pfexec /usr/bin/ln -s
/var/tmp/pkgbuild-${LOGNAME}/FOSSgnutls-1.4.5-build/opt/foss/lib/libgnutls.so
.
+cd ${CWD}
+
PATH=$_bindir:$PATH
$MAKE
