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

[dmichelsen at users.sourceforge.net]

Revision: 11063
          http://gar.svn.sourceforge.net/gar/?rev=11063&view=rev
Author:   dmichelsen
Date:     2010-09-28 10:41:16 +0000 (Tue, 28 Sep 2010)

Log Message:
-----------
openldap: Restructure module building due to bug in handling back_perl, make sure libldap is correctly bound as documented in #4555

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

Modified: csw/mgar/pkg/openldap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openldap/trunk/Makefile	2010-09-28 08:42:27 UTC (rev 11062)
+++ csw/mgar/pkg/openldap/trunk/Makefile	2010-09-28 10:41:16 UTC (rev 11063)
@@ -68,6 +68,14 @@
 
 MIGRATECONF = openldap
 
+# Is this causing this?
+#   https://www.opencsw.org/mantis/view.php?id=4555
+NOISALIST = 1
+LD_OPTIONS =
+EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS)
+
+NODIRPATHS = --docdir
+
 BUILD64 = 1
 NOISAEXEC = 1
 CONFIGURE_ARGS = $(DIRPATHS)
@@ -76,21 +84,29 @@
 CONFIGURE_ARGS += --enable-modules
 CONFIGURE_ARGS += --enable-rlookups
 CONFIGURE_ARGS += --enable-slp
+CONFIGURE_ARGS += --enable-backends=mod
+CONFIGURE_ARGS += --enable-overlays=mod
+
+# Disable MySQL Cluster
+CONFIGURE_ARGS += --disable-ndb
+
 # 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
+
+# We have Perl only for 32 bit:
+#   <http://opencsw.org/mantis/view.php?id=4484>
+CONFIGURE_ARGS_32 += --enable-perl=mod
+CONFIGURE_ARGS_64 += --enable-perl=no
+
 CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MEMORYMODEL))
-CONFIGURE_ARGS += --enable-backends=mod
-CONFIGURE_ARGS += --enable-overlays=mod
 
-# Disable MySQL Cluster
-CONFIGURE_ARGS += --disable-ndb
-
 SKIPTEST ?= 1
 TEST_TARGET = check
 
@@ -103,6 +119,10 @@
 MERGE_SCRIPTS_isa-default64-garversion-2.4.22 = copy-relocated-only
 MERGE_DIRS_isa-default64-garversion-2.4.22 = $(bindir) $(sbindir) $(libexecdir) $(libdir)
 
+# Perl backend is built, although it has been told not to.
+EXTRA_PAX_ARGS = -s,.*/opt/csw/libexec/sparcv9/openldap/back_perl.*,,
+EXTRA_PAX_ARGS = -s,.*/opt/csw/libexec/amd64/openldap/back_perl.*,,
+
 PKGFILES_CSWoldapclient  = $(bindir)/.*
 PKGFILES_CSWoldapclient += $(mandir)/man1/.*
 
@@ -119,9 +139,6 @@
 ARCHALL_CSWoldapdevel = 1
 CHECKPKG_OVERRIDES_CSWoldapdevel += archall-devel-package
 
-# override because checking an amd binary on i386 is pointless
-CHECKPKG_OVERRIDES_CSWoldap += soname-not-found|libm.so.2|is|needed|by|opt/csw/libexec/amd64/openldap/back_perl-2.4.so.2.5.5
-
 include gar/category.mk
 
 CFLAGS := $(filter-out -I%,$(CFLAGS))


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