[csw-devel] SF.net SVN: gar:[15219] csw/mgar/pkg/apr-util/trunk/Makefile

[dmichelsen at users.sourceforge.net]

Revision: 15219
          http://gar.svn.sourceforge.net/gar/?rev=15219&view=rev
Author:   dmichelsen
Date:     2011-07-25 14:50:20 +0000 (Mon, 25 Jul 2011)

Log Message:
-----------
apr-util: Fix up for 64 bit

Modified Paths:
--------------
    csw/mgar/pkg/apr-util/trunk/Makefile

Modified: csw/mgar/pkg/apr-util/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apr-util/trunk/Makefile	2011-07-25 14:45:15 UTC (rev 15218)
+++ csw/mgar/pkg/apr-util/trunk/Makefile	2011-07-25 14:50:20 UTC (rev 15219)
@@ -19,8 +19,8 @@
 CATALOGNAME_CSWlibaprutil1-0 = libaprutil1_0
 SPKG_DESC_CSWlibaprutil1-0 += Apache Portable Runtime Utilities, libaprutil-1.so.0 and private libraries
 PKGFILES_CSWlibaprutil1-0 += $(call pkgfiles_lib,libaprutil-1.so.0)
-PKGFILES_CSWlibaprutil1-0 += $(libdir)/apr-util-1/.*
-RUNTIME_DEP_PKGS_CSWlibaprutil1-0 += CSWapr
+PKGFILES_CSWlibaprutil1-0 += $(call baseisadirs,$(libdir),apr-util-1/.*)
+RUNTIME_DEP_PKGS_CSWlibaprutil1-0 += CSWlibapr1-0
 RUNTIME_DEP_PKGS_CSWlibaprutil1-0 += CSWiconv
 RUNTIME_DEP_PKGS_CSWlibaprutil1-0 += CSWlibexpat1
 RUNTIME_DEP_PKGS_CSWlibaprutil1-0 += CSWunixodbc
@@ -39,11 +39,14 @@
 # We need this to get bdb48/lib into the runpath
 EXTRA_LIB = $(prefix)/bdb48/lib
 
+BUILD64 = 1
+
 NOISALIST = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --with-apr=$(bindir)/apr-1-config
 CONFIGURE_ARGS += --with-ldap
-CONFIGURE_ARGS += --with-berkeley-db=/opt/csw/bdb48
-CONFIGURE_ARGS += --without-freetds --without-sqlite2
+CONFIGURE_ARGS += --with-berkeley-db=/opt/csw/bdb48/include:/opt/csw/bdb48/lib/$(MM_LIBDIR)
+CONFIGURE_ARGS += --without-freetds
+CONFIGURE_ARGS += --without-sqlite2
 
 include gar/category.mk


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