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

[dmichelsen at users.sourceforge.net]

Revision: 20387
          http://gar.svn.sourceforge.net/gar/?rev=20387&view=rev
Author:   dmichelsen
Date:     2013-03-07 16:47:51 +0000 (Thu, 07 Mar 2013)
Log Message:
-----------
unixodbc/trunk: Use 32/64 bit specific include for types

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

Modified: csw/mgar/pkg/unixodbc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/unixodbc/trunk/Makefile	2013-03-07 16:42:54 UTC (rev 20386)
+++ csw/mgar/pkg/unixodbc/trunk/Makefile	2013-03-07 16:47:51 UTC (rev 20387)
@@ -22,7 +22,6 @@
 PACKAGES += CSWunixodbc
 SPKG_DESC_CSWunixodbc = $(DESCRIPTION)
 # PKGFILES is catchall
-RUNTIME_DEP_PKGS_CSWunixodbc += CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWunixodbc += CSWlibreadline6
 RUNTIME_DEP_PKGS_CSWunixodbc += CSWlibltdl7
 RUNTIME_DEP_PKGS_CSWunixodbc += CSWlibodbcinst2
@@ -71,3 +70,11 @@
 MIGRATE_FILES_CSWunixodbc += ODBCDataSources
 
 include gar/category.mk
+
+post-merge-all:
+	gdiff -D 64bit \
+		$(WORKROOTDIR)/install-isa-$(ISA_DEFAULT64)$(includedir)/unixodbc_conf.h \
+		$(WORKROOTDIR)/install-isa-$(ISA_DEFAULT)$(includedir)/unixodbc_conf.h \
+	| sed -e 's/ifndef 64bit/if defined __amd64 || defined __x86_64 || defined __sparcv9/' \
+	> $(PKGROOT)$(includedir)/unixodbc_conf.h
+	@$(MAKECOOKIE)

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