[csw-devel] SF.net SVN: gar:[16866] csw/mgar/pkg/sasl/trunk

[guengel at users.sourceforge.net]

Revision: 16866
          http://gar.svn.sourceforge.net/gar/?rev=16866&view=rev
Author:   guengel
Date:     2012-01-20 18:23:20 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
sasl/trunk: link against berkeley db 4.8.

Modified Paths:
--------------
    csw/mgar/pkg/sasl/trunk/Makefile
    csw/mgar/pkg/sasl/trunk/files/changelog.CSW

Modified: csw/mgar/pkg/sasl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sasl/trunk/Makefile	2012-01-20 17:07:48 UTC (rev 16865)
+++ csw/mgar/pkg/sasl/trunk/Makefile	2012-01-20 18:23:20 UTC (rev 16866)
@@ -41,7 +41,7 @@
 PACKAGES += CSWsasl
 SPKG_DESC_CSWsasl = Cyrus Simple Authentication and Security Layer
 RUNTIME_DEP_PKGS_CSWsasl = CSWosslrt
-RUNTIME_DEP_PKGS_CSWsasl += CSWbdb47
+RUNTIME_DEP_PKGS_CSWsasl += CSWbdb48
 RUNTIME_DEP_PKGS_CSWsasl += CSWlibsasl2-2
 
 PACKAGES += CSWsaslauthd
@@ -126,7 +126,7 @@
 BUILD_DEP_PKGS += CSWoldapdevel 
 BUILD_DEP_PKGS += CSWlibsqlite3-dev
 BUILD_DEP_PKGS += CSWossldevel
-BUILD_DEP_PKGS += CSWbdb47devel
+BUILD_DEP_PKGS += CSWbdb48devel
 
 EXTRA_CFLAGS = -D__EXTENSIONS__
 
@@ -134,16 +134,15 @@
 
 EXTRA_INC  = $(includedir)/gssapi
 EXTRA_INC += $(includedir)/mysql
+EXTRA_INC += $(prefix)/bdb48/include
 EXTRA_INC += /opt/csw/postgresql/include
 
+EXTRA_LIB  = $(prefix)/bdb48/lib
+EXTRA_LIB += $(prefix)/postgresql/lib
+
 # Do not use LD_OPTIONS as it breaks tests by using the installed libraries
 # before the newly built ones.
 EXTRA_RUNPATH_ISALIST	= $(EXTRA_RUNPATH_DIRS)
-# We use EXTRA_RUNPATH for bdb to make sure it is linked against $(prefix)/bdb47/lib/$(MM_LIBDIR))
-# which silences the check deprecated-library message.
-EXTRA_RUNPATH_DIRS = $(prefix)/bdb47/lib/$(MM_LIBDIR)
-EXTRA_LDFLAGS	 = -L$(abspath $(prefix)/bdb47/lib/$(MM_LIBDIR)) -R$(abspath $(prefix)/bdb47/lib/$(MM_LIBDIR))
-EXTRA_LDFLAGS	+= -L$(abspath $(prefix)/postgresql/lib/$(MM_LIBDIR)) -R$(abspath $(prefix)/postgresql/lib/$(MM_LIBDIR))
 
 BUILD64 = 1
 NOISALIST = 1
@@ -162,8 +161,9 @@
 CONFIGURE_ARGS += --enable-scram
 CONFIGURE_ARGS += --enable-otp
 CONFIGURE_ARGS += --enable-gssapi
-CONFIGURE_ARGS += --with-bdb-libdir=$(abspath /opt/csw/bdb47/lib/$(MM_LIBDIR))
-CONFIGURE_ARGS += --with-bdb-incdir=/opt/csw/bdb47/include/ 
+CONFIGURE_ARGS += --with-bdb-libdir=$(abspath /opt/csw/bdb48/lib/$(MM_LIBDIR))
+CONFIGURE_ARGS += --with-bdb-incdir=/opt/csw/bdb48/include/ 
+CONFIGURE_ARGS += --with-bdb=db-4.8
 CONFIGURE_ARGS += --with-saslauthd=$(localstatedir)/saslauthd 
 CONFIGURE_ARGS += --with-ipctype=unix 
 CONFIGURE_ARGS += --with-ldap=$(libdir)

Modified: csw/mgar/pkg/sasl/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/sasl/trunk/files/changelog.CSW	2012-01-20 17:07:48 UTC (rev 16865)
+++ csw/mgar/pkg/sasl/trunk/files/changelog.CSW	2012-01-20 18:23:20 UTC (rev 16866)
@@ -1,3 +1,9 @@
+sasl (2.1.25,REV=2012.01.20)
+
+  * Link against Berkeley DB 4.8.
+
+ -- Rafael Ostertag <raos at opencsw.org>  Fri, 20 Jan 2012 19:20:16 +0100
+
 sasl (2.1.25,REV=2012.01.04)
 
   * README.sasl, README.saslauthd: moved changelog entries to

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