[csw-devel] SF.net SVN: gar:[6267] csw/mgar/pkg/openldap/trunk

[dmichelsen at users.sourceforge.net]

Revision: 6267
          http://gar.svn.sourceforge.net/gar/?rev=6267&view=rev
Author:   dmichelsen
Date:     2009-09-11 12:48:11 +0000 (Fri, 11 Sep 2009)

Log Message:
-----------
openldap: Fix building 64 bit on sparc

Modified Paths:
--------------
    csw/mgar/pkg/openldap/trunk/Makefile
    csw/mgar/pkg/openldap/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/openldap/trunk/files/patch-libtool-64bit.diff

Property Changed:
----------------
    csw/mgar/pkg/openldap/trunk/


Property changes on: csw/mgar/pkg/openldap/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2

   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Modified: csw/mgar/pkg/openldap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openldap/trunk/Makefile	2009-09-11 12:37:31 UTC (rev 6266)
+++ csw/mgar/pkg/openldap/trunk/Makefile	2009-09-11 12:48:11 UTC (rev 6267)
@@ -44,24 +44,26 @@
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
 PATCHFILES = patch-oldap-2.4.16-ntlm.diff
-DISTFILES += $(PATCHFILES)
+PATCHFILES += patch-libtool-64bit.diff
+DISTFILES += patch-oldap-2.4.16-ntlm.diff
 
 EXTRA_DOCS = README.CSW $(PATCHFILES)
 
 #EXTRA_LIB = $(prefix)/bdb44/lib 
 #EXTRA_INC = $(prefix)/bdb44/include
 
-#BUILD64 = 1
+BUILD64 = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-crypt
 CONFIGURE_ARGS += --enable-lmpasswd
-CONFIGURE_ARGS += --enable-spasswd
 CONFIGURE_ARGS += --enable-modules
 CONFIGURE_ARGS += --enable-rlookups
 CONFIGURE_ARGS += --enable-slp
 # Disable TCPwrappers in 64 bit until the libraries are available
 #   <http://opencsw.org/mantis/view.php?id=3748>
 CONFIGURE_ARGS_32 = --enable-wrappers
+# spasswd requires Cyrus SASL
+CONFIGURE_ARGS_32 += --enable-spasswd
 # Disable Cyrus SASL in 64 bit until the libraries are available
 #   <http://opencsw.org/mantis/view.php?id=3749>
 CONFIGURE_ARGS_64 += --without-cyrus-sasl

Modified: csw/mgar/pkg/openldap/trunk/checksums
===================================================================
--- csw/mgar/pkg/openldap/trunk/checksums	2009-09-11 12:37:31 UTC (rev 6266)
+++ csw/mgar/pkg/openldap/trunk/checksums	2009-09-11 12:48:11 UTC (rev 6267)
@@ -4,5 +4,6 @@
 5e82103780f8cfc2b2fbd0f77c47c158  download/openldap-2.4.17.tgz
 0e57547ad2b5fedca9f0bd4beaddfe39  download/openldap.xml
 ab2ac7519b092ce8d16124c5270bfec0  download/openldaprc
+93dc2a04fd943c198ad00edd4d88ce65  download/patch-libtool-64bit.diff
 d3dee9018137c39f357859b652e3a67c  download/patch-oldap-2.4.16-ntlm.diff
 e15c2020566e56f02118e75c89111f15  download/svc-openldap

Added: csw/mgar/pkg/openldap/trunk/files/patch-libtool-64bit.diff
===================================================================
--- csw/mgar/pkg/openldap/trunk/files/patch-libtool-64bit.diff	                        (rev 0)
+++ csw/mgar/pkg/openldap/trunk/files/patch-libtool-64bit.diff	2009-09-11 12:48:11 UTC (rev 6267)
@@ -0,0 +1,15 @@
+diff -Naur openldap-2.4.17.orig/build/ltmain.sh openldap-2.4.17.patched/build/ltmain.sh
+--- openldap-2.4.17.orig/build/ltmain.sh	2009-01-22 01:00:41.000000000 +0100
++++ openldap-2.4.17.patched/build/ltmain.sh	2009-09-11 14:26:06.136891084 +0200
+@@ -4745,7 +4745,10 @@
+ 	    case "$compile_command " in
+ 	    *" -static "*) ;;
+ 	    *) pic_flag_for_symtable=" $pic_flag";;
+-	    esac
++	    esac;;
++          *-*-solaris*)
++            LTCFLAGS="$compiler_flags"
++            ;;
+ 	  esac
+ 
+ 	  # Now compile the dynamic symbol file.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.