[csw-devel] SF.net SVN: gar:[18497] csw/mgar/pkg/pilotlink/trunk

[pfelecan at users.sourceforge.net]

Revision: 18497
          http://gar.svn.sourceforge.net/gar/?rev=18497&view=rev
Author:   pfelecan
Date:     2012-06-22 08:41:45 +0000 (Fri, 22 Jun 2012)
Log Message:
-----------
all bindings but Java; still not ready for release, working on
the Java binding.

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

Added Paths:
-----------
    csw/mgar/pkg/pilotlink/trunk/files/0003-Avoid-including-redundant-SFW.patch

Modified: csw/mgar/pkg/pilotlink/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pilotlink/trunk/Makefile	2012-06-22 06:27:44 UTC (rev 18496)
+++ csw/mgar/pkg/pilotlink/trunk/Makefile	2012-06-22 08:41:45 UTC (rev 18497)
@@ -48,26 +48,31 @@
 
 PATCHFILES			=	0001-Fix-python-binding-configuration.patch
 PATCHFILES			+=	0002-Fix-ctime_r-prototype.patch
+PATCHFILES			+=	0003-Avoid-including-redundant-SFW.patch
 
-GARCOMPILER			=	GNU
-EXTRA_CFLAGS		=	-I/usr/sfw/include
+#GARCOMPILER			=	GNU
+EXTRA_INC			=	/usr/sfw/include
 EXTRA_LDFLAGS		=	-L/usr/sfw/lib -R/usr/sfw/lib -lusb
 
 CONFIGURE_ARGS		=	$(DIRPATHS)
 CONFIGURE_ARGS		+=	--enable-threads
 CONFIGURE_ARGS		+=	--enable-conduits
 CONFIGURE_ARGS		+=	--enable-libusb
-# CONFIGURE_ARGS		+=	--with-perl=$(bindir)/perl
+CONFIGURE_ARGS		+=	--with-perl=$(bindir)/perl
 # #CONFIGURE_ARGS		+=	--with-java=/usr/java
-# CONFIGURE_ARGS		+=	--with-tcl=$(libdir)
-# CONFIGURE_ARGS		+=	--with-tclinclude=$(includedir)
-# CONFIGURE_ARGS		+=	--with-python
+CONFIGURE_ARGS		+=	--with-tcl=$(libdir)
+CONFIGURE_ARGS		+=	--with-tclinclude=$(includedir)
+CONFIGURE_ARGS		+=	--with-python
 
 #LICENCE_CSWpilot-link		=	COPYING
 #LICENCE_CSWpilot-link-lib	=	COPYING.LIB
 
 include gar/category.mk
 
+# kludge to ensure that /opt/csw/include come before /usr/sfw/include
+# (needed to have USB capacity):
+CPPFLAGS	:=	$(sort $(CPPFLAGS))
+
 pre-configure-modulated:
 	@echo "executing $@"
 	cd $(WORKSRC) && libtoolize

Added: csw/mgar/pkg/pilotlink/trunk/files/0003-Avoid-including-redundant-SFW.patch
===================================================================
--- csw/mgar/pkg/pilotlink/trunk/files/0003-Avoid-including-redundant-SFW.patch	                        (rev 0)
+++ csw/mgar/pkg/pilotlink/trunk/files/0003-Avoid-including-redundant-SFW.patch	2012-06-22 08:41:45 UTC (rev 18497)
@@ -0,0 +1,24 @@
+From bed9f247bdaa4bed8cd7dedc55a46adeaff22f34 Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Fri, 22 Jun 2012 10:24:07 +0200
+Subject: [PATCH] Avoid including redundant SFW
+
+---
+ bindings/Makefile.am |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/bindings/Makefile.am b/bindings/Makefile.am
+index 7e0422c..5fd086e 100644
+--- a/bindings/Makefile.am
++++ b/bindings/Makefile.am
+@@ -1,3 +1,7 @@
++# required to avoid mixing with the pi-* include supplied by
++# SunFreeware which is needed to have the USB capacity:
++CPPFLAGS	:=	$(subst -I/usr/sfw/include,,$(CPPFLAGS))
++
+ if WITH_JAVA
+ JAVA_DIR=Java
+ else
+-- 
+1.7.10.3
+

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