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

[dmichelsen at users.sourceforge.net]

Revision: 15222
          http://gar.svn.sourceforge.net/gar/?rev=15222&view=rev
Author:   dmichelsen
Date:     2011-07-26 09:35:06 +0000 (Tue, 26 Jul 2011)

Log Message:
-----------
apr-util: Additional binding against FreeTDS, split packages

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 17:56:45 UTC (rev 15221)
+++ csw/mgar/pkg/apr-util/trunk/Makefile	2011-07-26 09:35:06 UTC (rev 15222)
@@ -19,34 +19,80 @@
 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 += $(call baseisadirs,$(libdir),apr-util-1/.*)
+# 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
-RUNTIME_DEP_PKGS_CSWlibaprutil1-0 += CSWlibsqlite3-0
-RUNTIME_DEP_PKGS_CSWlibaprutil1-0 += CSWbdb48
-RUNTIME_DEP_PKGS_CSWlibaprutil1-0 += CSWoldaprt
 OBSOLETED_BY_CSWlibaprutil1-0 += CSWapr-util
-# These are private libraries in lib/apr-util-1/ and it is ok to have no soname
-CHECKPKG_OVERRIDES_CSWlibaprutil1-0 += shared-lib-package-contains-so-symlink
 
+
+PACKAGES += CSWlibaprutil1-dbd-freetds
+SPKG_DESC_CSWlibaprutil1-dbd-freetds = Apache Portable Runtime database binding, apr-util-1/apr_dbd_freetds-1.so
+PKGFILES_CSWlibaprutil1-dbd-freetds += $(call baseisadirs,$(libdir),apr-util-1/apr_dbd_freetds.*\.so)
+RUNTIME_DEP_PKGS_CSWlibaprutil1-dbd-freetds += CSWlibaprutil1-0
+CHECKPKG_OVERRIDES_CSWlibaprutil1-dbd-freetds += surplus-dependency|CSWlibaprutil1-0
+RUNTIME_DEP_PKGS_CSWlibaprutil1-dbd-freetds += CSWfreetds
+# FreeTDS has not been included in legacy CSWapr-util
+
+PACKAGES += CSWlibaprutil1-dbd-odbc
+SPKG_DESC_CSWlibaprutil1-dbd-odbc = Apache Portable Runtime database binding, apr-util-1/apr_dbd_odbc-1.so
+PKGFILES_CSWlibaprutil1-dbd-odbc += $(call baseisadirs,$(libdir),apr-util-1/apr_dbd_odbc.*\.so)
+# Depend on base library, there is no explicit binding in the dbd libraries, though
+RUNTIME_DEP_PKGS_CSWlibaprutil1-dbd-odbc += CSWlibaprutil1-0
+CHECKPKG_OVERRIDES_CSWlibaprutil1-dbd-odbc += surplus-dependency|CSWlibaprutil1-0
+RUNTIME_DEP_PKGS_CSWlibaprutil1-dbd-odbc += CSWunixodbc
+OBSOLETED_BY_CSWlibaprutil1-dbd-odbc += CSWapr-util
+
+PACKAGES += CSWlibaprutil1-dbd-sqlite3
+SPKG_DESC_CSWlibaprutil1-dbd-sqlite3 = Apache Portable Runtime database binding, apr-util-1/apr_dbd_sqlite3-1.so
+PKGFILES_CSWlibaprutil1-dbd-sqlite3 += $(call baseisadirs,$(libdir),apr-util-1/apr_dbd_sqlite3.*\.so)
+RUNTIME_DEP_PKGS_CSWlibaprutil1-dbd-sqlite3 += CSWlibaprutil1-0
+CHECKPKG_OVERRIDES_CSWlibaprutil1-dbd-sqlite3 += surplus-dependency|CSWlibaprutil1-0
+RUNTIME_DEP_PKGS_CSWlibaprutil1-dbd-sqlite3 += CSWlibsqlite3-0
+OBSOLETED_BY_CSWlibaprutil1-dbd-sqlite3 += CSWapr-util
+
+PACKAGES += CSWlibaprutil1-dbm-db
+SPKG_DESC_CSWlibaprutil1-dbm-db = Apache Portable Runtime database binding, apr-util-1/apr_dbm_db-1.so
+PKGFILES_CSWlibaprutil1-dbm-db += $(call baseisadirs,$(libdir),apr-util-1/apr_dbm_db.*\.so)
+RUNTIME_DEP_PKGS_CSWlibaprutil1-dbm-db += CSWlibaprutil1-0
+CHECKPKG_OVERRIDES_CSWlibaprutil1-dbm-db += surplus-dependency|CSWlibaprutil1-0
+RUNTIME_DEP_PKGS_CSWlibaprutil1-dbm-db += CSWbdb48
+OBSOLETED_BY_CSWlibaprutil1-dbm-db += CSWapr-util
+
+PACKAGES += CSWlibaprutil1-ldap
+SPKG_DESC_CSWlibaprutil1-ldap = Apache Portable Runtime database binding, apr-util-1/apr_ldap-1.so
+PKGFILES_CSWlibaprutil1-ldap += $(call baseisadirs,$(libdir),apr-util-1/apr_ldap.*\.so)
+RUNTIME_DEP_PKGS_CSWlibaprutil1-ldap += CSWlibaprutil1-0
+CHECKPKG_OVERRIDES_CSWlibaprutil1-ldap += surplus-dependency|CSWlibaprutil1-0
+RUNTIME_DEP_PKGS_CSWlibaprutil1-ldap += CSWoldaprt
+OBSOLETED_BY_CSWlibaprutil1-ldap += CSWapr-util
+
 PACKAGES += CSWlibaprutil-dev
 SPKG_DESC_CSWlibaprutil-dev += Apache Portable Runtime Utilities, libaprutil-dev
 # PKGFILES is catchall
 RUNTIME_DEP_PKGS_CSWlibaprutil-dev += CSWlibaprutil1-0
 
 # We need this to get bdb48/lib into the runpath
-EXTRA_LIB = $(prefix)/bdb48/lib
+EXTRA_LIB += $(prefix)/bdb48/lib
 
+# EXTRA_INC += $(prefix)/instantclient_10_2/$(MM_LIBDIR)/sdk/include
+# EXTRA_LIB += $(prefix)/instantclient_10_2
+
 BUILD64 = 1
+NOISALIST = 1
 
-NOISALIST = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --with-apr=$(bindir)/apr-1-config
+CONFIGURE_ARGS += --with-dbm=db48
+CONFIGURE_ARGS += --with-berkeley-db=$(prefix)/bdb48/include:$(prefix)/bdb48/lib/$(MM_LIBDIR)
 CONFIGURE_ARGS += --with-ldap
-CONFIGURE_ARGS += --with-berkeley-db=/opt/csw/bdb48/include:/opt/csw/bdb48/lib/$(MM_LIBDIR)
-CONFIGURE_ARGS += --without-freetds
+CONFIGURE_ARGS += --with-freetds
 CONFIGURE_ARGS += --without-sqlite2
+CONFIGURE_ARGS += --with-sqlite3
+# Enabling Oracle takes some more with the current instantclient layout
+#CONFIGURE_ARGS += --with-oracle=$(prefix)/instantclient_10_2/$(MM_LIBDIR)
+#CONFIGURE_ARGS += --with-oracle-include=$(prefix)/instantclient_10_2/$(MM_LIBDIR)/sdk/include
+CONFIGURE_ARGS += --with-freetds
+CONFIGURE_ARGS += --with-odbc
 
 include gar/category.mk


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