[csw-devel] SF.net SVN: gar:[18485] csw/mgar/pkg/pilotlink/trunk
pfelecan at users.sourceforge.net
pfelecan at users.sourceforge.net
Thu Jun 21 16:44:41 CEST 2012
Revision: 18485
http://gar.svn.sourceforge.net/gar/?rev=18485&view=rev
Author: pfelecan
Date: 2012-06-21 14:44:40 +0000 (Thu, 21 Jun 2012)
Log Message:
-----------
takeover and migration from a private recipe to a GAR based one; not
ready for release as the split is not done and the language bindings
are to be done, especially the TLC one.
Modified Paths:
--------------
csw/mgar/pkg/pilotlink/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/pilotlink/trunk/files/0001-Fix-python-binding-configuration.patch
csw/mgar/pkg/pilotlink/trunk/files/0002-Fix-ctime_r-prototype.patch
Removed Paths:
-------------
csw/mgar/pkg/pilotlink/trunk/files/0001-Fix-shebang-in-configure.patch
Modified: csw/mgar/pkg/pilotlink/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pilotlink/trunk/Makefile 2012-06-21 13:45:35 UTC (rev 18484)
+++ csw/mgar/pkg/pilotlink/trunk/Makefile 2012-06-21 14:44:40 UTC (rev 18485)
@@ -30,30 +30,65 @@
BUILD_DEP_PKGS += CSWperl
BUILD_DEP_PKGS += CSWtcl
-BUILD_DEP_PKGS += CSWpython
+BUILD_DEP_PKGS += CSWpython-dev
+BUILD_DEP_PKGS += SUNWlibusb
+#BUILD_DEP_PKGS += SUNWj6dev
+BUILD_DEP_PKGS += CSWdoxygen
RUNTIME_DEP_PKGS = CSWperl
RUNTIME_DEP_PKGS += CSWtcl
RUNTIME_DEP_PKGS += CSWpython
+RUNTIME_DEP_PKGS += SUNWlibusb
+#RUNTIME_DEP_PKGS += SUNWj6rt
+
# This cannot be tracked with checkpkg
# CHECKPKG_OVERRIDES_CSWpilot-link += surplus-dependency|CSWperl
# CHECKPKG_OVERRIDES_CSWpilot-link += surplus-dependency|CSWtcl
# CHECKPKG_OVERRIDES_CSWpilot-link += surplus-dependency|CSWpython
-PATCHFILE = 0001-Fix-shebang-in-configure.patch
+PATCHFILES = 0001-Fix-python-binding-configuration.patch
+PATCHFILES += 0002-Fix-ctime_r-prototype.patch
GARCOMPILER = GNU
+EXTRA_CFLAGS = -I/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=perlexec=$(bindir)/perl
-CONFIGURE_ARGS += --with-java
-CONFIGURE_ARGS += --with-tcl=$(libdir)
-CONFIGURE_ARGS += --with-tclinclude
-CONFIGURE_ARGS += --with-python
+# 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
#LICENCE_CSWpilot-link = COPYING
#LICENCE_CSWpilot-link-lib = COPYING.LIB
include gar/category.mk
+pre-configure-modulated:
+ @echo "executing $@"
+ cd $(WORKSRC) && libtoolize
+ cd $(WORKSRC) && aclocal -I m4
+ cd $(WORKSRC) && automake -a
+ cd $(WORKSRC) && autoconf
+ $(MAKECOOKIE)
+
+documents = \
+ doc/README \
+ doc/README.libusb \
+ doc/README.usb
+
+post-install-modulated: pkgdocdir = $(docdir)/$(NAME)
+post-install-modulated:
+ ginstall --directory --mode=u=rwx,go=rx $(DESTDIR)$(pkgdocdir)
+ cd $(WORKSRC) && ginstall --preserve-timestamps --mode=u=rw,go=r $(documents) $(DESTDIR)$(pkgdocdir)
+ ginstall --directory --mode=u=rwx,go=rx $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man7
+ cd $(WORKSRC) && ginstall --preserve-timestamps --mode=u=rw,go=r doc/man/*.1 $(DESTDIR)$(mandir)/man1
+ cd $(WORKSRC) && ginstall --preserve-timestamps --mode=u=rw,go=r doc/man/*.7 $(DESTDIR)$(mandir)/man7
+
+# this is private and not available publicly
+mydependencies:
+ $(HOME)/bin/ocswdeplist --package $(NAME)
Added: csw/mgar/pkg/pilotlink/trunk/files/0001-Fix-python-binding-configuration.patch
===================================================================
--- csw/mgar/pkg/pilotlink/trunk/files/0001-Fix-python-binding-configuration.patch (rev 0)
+++ csw/mgar/pkg/pilotlink/trunk/files/0001-Fix-python-binding-configuration.patch 2012-06-21 14:44:40 UTC (rev 18485)
@@ -0,0 +1,28 @@
+From 1622b681a02e9d98243ffd31b06ac92a7249519c Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Thu, 21 Jun 2012 13:04:30 +0200
+Subject: [PATCH] Fix python binding configuration
+
+---
+ m4/python.m4 | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/m4/python.m4 b/m4/python.m4
+index c24ad59..52d0668 100644
+--- a/m4/python.m4
++++ b/m4/python.m4
+@@ -31,9 +31,9 @@ AC_DEFUN([AM_CHECK_PYTHON],
+ if test "$PYTHON_VERSION" != ""; then
+ if test -f $PYTHON_PREFIX/include/python$PYTHON_VERSION/Python.h; then
+ AC_MSG_RESULT($PYTHON_PREFIX/include/python$PYTHON_VERSION/Python.h)
+- PYTHON_LIB_LOC="-L$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/config"
++ PYTHON_LIB_LOC="-L$PYTHON_EXEC_PREFIX/lib/python/config"
+ PYTHON_CFLAGS="-I$PYTHON_PREFIX/include/python$PYTHON_VERSION"
+- PYTHON_MAKEFILE="$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/config/Makefile"
++ PYTHON_MAKEFILE="$PYTHON_EXEC_PREFIX/lib/python/config/Makefile"
+
+ PYTHON_LOCALMODLIBS=`sed -n -e 's/^LOCALMODLIBS=\(.*\)/\1/p' $PYTHON_MAKEFILE`
+ PYTHON_BASEMODLIBS=`sed -n -e 's/^BASEMODLIBS=\(.*\)/\1/p' $PYTHON_MAKEFILE`
+--
+1.7.10.3
+
Deleted: csw/mgar/pkg/pilotlink/trunk/files/0001-Fix-shebang-in-configure.patch
===================================================================
--- csw/mgar/pkg/pilotlink/trunk/files/0001-Fix-shebang-in-configure.patch 2012-06-21 13:45:35 UTC (rev 18484)
+++ csw/mgar/pkg/pilotlink/trunk/files/0001-Fix-shebang-in-configure.patch 2012-06-21 14:44:40 UTC (rev 18485)
@@ -1,22 +0,0 @@
-From f6dc47f801735eec1bd85d49938645f0e58c13b5 Mon Sep 17 00:00:00 2001
-From: Peter Felecan <pfelecan at opencsw.org>
-Date: Wed, 20 Jun 2012 16:16:11 +0200
-Subject: [PATCH] Fix shebang in configure
-
----
- configure | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure b/configure
-index b3e7e83..755f883 100755
---- a/configure
-+++ b/configure
-@@ -1,4 +1,4 @@
--#! /bin/sh
-+#! /usr/bin/env bash
- # Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.65.
- #
---
-1.7.10.3
-
Added: csw/mgar/pkg/pilotlink/trunk/files/0002-Fix-ctime_r-prototype.patch
===================================================================
--- csw/mgar/pkg/pilotlink/trunk/files/0002-Fix-ctime_r-prototype.patch (rev 0)
+++ csw/mgar/pkg/pilotlink/trunk/files/0002-Fix-ctime_r-prototype.patch 2012-06-21 14:44:40 UTC (rev 18485)
@@ -0,0 +1,41 @@
+From a1ab73bd475abdb3322102a5a172e1b2a74dba87 Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Thu, 21 Jun 2012 14:10:17 +0200
+Subject: [PATCH] Fix ctime_r prototype
+
+---
+ tests/vfs-test.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tests/vfs-test.c b/tests/vfs-test.c
+index 0e617c7..949258d 100644
+--- a/tests/vfs-test.c
++++ b/tests/vfs-test.c
+@@ -379,21 +379,21 @@ int main (int argc, char **argv)
+ result = dlp_VFSFileGetDate (sd, fileRef, vfsFileDateCreated, &t1);
+ CHECK_RESULT(dlp_VFSFileGetDate);
+ if (result >= 0) {
+- ctime_r (&t1, name);
++ ctime_r (&t1, name, sizeof(name));
+ LOG((PI_DBG_USER, PI_DBG_LVL_INFO, "* Date created: %s", name));
+ }
+
+ result = dlp_VFSFileGetDate (sd, fileRef, vfsFileDateModified, &t2);
+ CHECK_RESULT(dlp_VFSFileGetDate);
+ if (result >= 0) {
+- ctime_r (&t2, name);
++ ctime_r (&t2, name, sizeof(name));
+ LOG((PI_DBG_USER, PI_DBG_LVL_INFO, "* Date modified: %s", name));
+ }
+
+ result = dlp_VFSFileGetDate (sd, fileRef, vfsFileDateAccessed, &t2);
+ CHECK_RESULT(dlp_VFSFileGetDate);
+ if (result >= 0) {
+- ctime_r (&t2, name);
++ ctime_r (&t2, name, sizeof(name));
+ LOG((PI_DBG_USER, PI_DBG_LVL_INFO, "* Date accessed: %s", name));
+ }
+
+--
+1.7.10.3
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list