Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH] add ruby serialport extension
@ 2009-07-09 12:09 laurent.laffont at gmail.com
  2009-07-13  7:29 ` Peter Korsgaard
  0 siblings, 1 reply; 3+ messages in thread
From: laurent.laffont at gmail.com @ 2009-07-09 12:09 UTC (permalink / raw)
  To: buildroot

From: laurent laffont <laurent.laffont@gmail.com>

Handle ruby serialport extension cross compilation.
http://rubyforge.org/projects/ruby-serialport/

Signed-off-by: laurent laffont <laurent.laffont@gmail.com>
---
 package/Config.in                                  |    1 +
 package/ruby-serialport/Config.in                  |    7 +++
 .../ruby-serialport/ruby-serialport-fix-1.9.patch  |   52 +++++++++++++++++++
 package/ruby-serialport/ruby-serialport.mk         |   53 ++++++++++++++++++++
 4 files changed, 113 insertions(+), 0 deletions(-)
 create mode 100644 package/ruby-serialport/Config.in
 create mode 100644 package/ruby-serialport/ruby-serialport-fix-1.9.patch
 create mode 100644 package/ruby-serialport/ruby-serialport.mk

diff --git a/package/Config.in b/package/Config.in
index cb83563..5c22ed3 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -427,6 +427,7 @@ source "package/lua/Config.in"
 source "package/microperl/Config.in"
 source "package/python/Config.in"
 source "package/ruby/Config.in"
+source "package/ruby-serialport/Config.in"
 source "package/tcl/Config.in"
 source "package/php/Config.in"
 endmenu
diff --git a/package/ruby-serialport/Config.in b/package/ruby-serialport/Config.in
new file mode 100644
index 0000000..acdb3be
--- /dev/null
+++ b/package/ruby-serialport/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_RUBY_SERIALPORT
+	depends on BR2_PACKAGE_RUBY
+	bool "ruby-serialport"
+	help
+	  Ruby library that provides a class for using RS-232 serial ports
+	  http://rubyforge.org/projects/ruby-serialport/
+
diff --git a/package/ruby-serialport/ruby-serialport-fix-1.9.patch b/package/ruby-serialport/ruby-serialport-fix-1.9.patch
new file mode 100644
index 0000000..8203b78
--- /dev/null
+++ b/package/ruby-serialport/ruby-serialport-fix-1.9.patch
@@ -0,0 +1,52 @@
+--- a/ext/impl/posix_serialport.c	2008-12-23 20:35:07.000000000 +0000
++++ b/ext/impl/posix_serialport.c	2009-05-21 16:37:13.000000000 +0100
+@@ -38,16 +38,16 @@
+ static int get_fd_helper(obj)
+    VALUE obj;
+ {
+-   OpenFile *fptr;
++   rb_io_t *fptr;
+ 
+    GetOpenFile(obj, fptr);
+-   return (fileno(fptr->f));
++   return (fptr->fd);
+ }
+ 
+ static VALUE sp_create_impl(class, _port)
+    VALUE class, _port;
+ {
+-   OpenFile *fp;
++   rb_io_t *fp;
+    int fd;
+    int num_port;
+    char *port;
+@@ -89,7 +89,7 @@
+ 
+       case T_STRING:
+          Check_SafeStr(_port);
+-         port = RSTRING(_port)->ptr;
++         port = RSTRING_PTR(_port);
+          break;
+ 
+       default:
+@@ -130,7 +130,7 @@
+       rb_sys_fail(sTcsetattr);
+    }
+ 
+-   fp->f = rb_fdopen(fd, "r+");
++   fp->fd = fd;
+    fp->mode = FMODE_READWRITE | FMODE_SYNC;
+ 
+    return (VALUE) sp;
+diff -ur ruby-serialport-0.7.0.orig/ext/serialport.h ruby-serialport-0.7.0/ext/serialport.h
+--- ruby-serialport-0.7.0.orig/ext/serialport.h	2008-12-23 20:09:35.000000000 +0000
++++ ruby-serialport-0.7.0/ext/serialport.h	2009-05-21 16:37:13.000000000 +0100
+@@ -22,7 +22,7 @@
+ #define RUBY_SERIAL_PORT_VERSION   "0.7.0"
+ 
+ #include <ruby.h>    /* ruby inclusion */
+-#include <rubyio.h>  /* ruby io inclusion */
++#include <ruby/io.h>  /* ruby io inclusion */
+ 
+ struct modem_params
+ {
diff --git a/package/ruby-serialport/ruby-serialport.mk b/package/ruby-serialport/ruby-serialport.mk
new file mode 100644
index 0000000..797646c
--- /dev/null
+++ b/package/ruby-serialport/ruby-serialport.mk
@@ -0,0 +1,53 @@
+#############################################################
+#
+# ruby-serialport
+#
+#############################################################
+RUBY_SERIALPORT_VERSION = 0.7.0
+RUBY_SERIALPORT_SOURCE = ruby-serialport-$(RUBY_SERIALPORT_VERSION).tar.gz
+RUBY_SERIALPORT_SITE = http://rubyforge.org/frs/download.php/49992
+RUBY_SERIALPORT_DIR:=$(BUILD_DIR)/ruby-serialport-$(RUBY_SERIALPORT_VERSION)
+RUBY_SERIALPORT_CAT:=$(ZCAT)
+
+$(DL_DIR)/$(RUBY_SERIALPORT_SOURCE):
+	 $(call DOWNLOAD,$(RUBY_SERIALPORT_SITE,$(RUBY_SERIALPORT_SOURCE))
+
+ruby-serialport-source: $(DL_DIR)/$(RUBY_SERIALPORT_SOURCE)
+
+$(RUBY_SERIALPORT_DIR)/.unpacked: $(DL_DIR)/$(RUBY_SERIALPORT_SOURCE)
+	$(RUBY_SERIALPORT_CAT) $(DL_DIR)/$(RUBY_SERIALPORT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	toolchain/patch-kernel.sh $(RUBY_SERIALPORT_DIR) package/ruby-serialport/ ruby-serialport\*.patch
+	touch $@
+
+$(RUBY_SERIALPORT_DIR)/.configured: $(RUBY_SERIALPORT_DIR)/.unpacked
+	(cd $(RUBY_SERIALPORT_DIR)/ext; rm Makefile; \
+		RUBYLIB=$(RUBY_DIR):$(RUBY_DIR)/lib:$(RUBY_DIR)/.ext ruby-1.9 -e "require 'mkmf'; create_makefile('serialport')";)
+	touch $@
+
+$(RUBY_SERIALPORT_DIR)/ext/serialport.so: $(RUBY_SERIALPORT_DIR)/.configured
+	(cd $(RUBY_SERIALPORT_DIR)/ext; \
+		$(MAKE) extout=$(RUBY_DIR)/.ext)
+
+$(RUBY_SERIALPORT_DIR)/.installed: $(RUBY_SERIALPORT_DIR)/ext/serialport.so
+	(cd $(RUBY_SERIALPORT_DIR)/ext; \
+		$(MAKE) DESTDIR=$(TARGET_DIR) extout=$(RUBY_DIR)/.ext install)
+	touch $@
+
+ruby-serialport: $(RUBY_SERIALPORT_DIR)/.installed
+
+ruby-serialport-clean:
+	(cd $(RUBY_SERIALPORT_DIR)/ext; \
+		$(MAKE) DESTDIR=$(TARGET_DIR) extout=$(RUBY_DIR)/.ext clean)
+
+ruby-serialport-dirclean: 
+	rm -rf $(RUBY_SERIALPORT_DIR)
+
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(BR2_PACKAGE_RUBY_SERIALPORT),y)
+TARGETS+=ruby-serialport
+endif
-- 
1.6.3.3

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [Buildroot] [PATCH] add ruby serialport extension
  2009-07-09 12:09 [Buildroot] [PATCH] add ruby serialport extension laurent.laffont at gmail.com
@ 2009-07-13  7:29 ` Peter Korsgaard
       [not found]   ` <4a339d7c0907130123u64b93c08h3c3f3a850188b1ec@mail.gmail.com>
  0 siblings, 1 reply; 3+ messages in thread
From: Peter Korsgaard @ 2009-07-13  7:29 UTC (permalink / raw)
  To: buildroot

>>>>> "laurent" == laurent laffont <laurent.laffont@gmail.com> writes:

Hi,

 laurent> From: laurent laffont <laurent.laffont@gmail.com>
 laurent> Handle ruby serialport extension cross compilation.
 laurent> http://rubyforge.org/projects/ruby-serialport/

 laurent> Signed-off-by: laurent laffont <laurent.laffont@gmail.com>

 laurent> +++ b/package/ruby-serialport/ruby-serialport-fix-1.9.patch
 laurent> @@ -0,0 +1,52 @@
 laurent> +--- a/ext/impl/posix_serialport.c	2008-12-23 20:35:07.000000000 +0000
 laurent> ++++ b/ext/impl/posix_serialport.c	2009-05-21 16:37:13.000000000 +0100
 laurent> +@@ -38,16 +38,16 @@
 laurent> + static int get_fd_helper(obj)
 laurent> +    VALUE obj;
 laurent> + {
 laurent> +-   OpenFile *fptr;
 laurent> ++   rb_io_t *fptr;


What is this for? It doesn't seem buildroot specific?


 laurent> diff --git a/package/ruby-serialport/ruby-serialport.mk b/package/ruby-serialport/ruby-serialport.mk
 laurent> new file mode 100644
 laurent> index 0000000..797646c
 laurent> --- /dev/null
 laurent> +++ b/package/ruby-serialport/ruby-serialport.mk
 laurent> @@ -0,0 +1,53 @@
 laurent> +#############################################################
 laurent> +#
 laurent> +# ruby-serialport
 laurent> +#
 laurent> +#############################################################
 laurent> +RUBY_SERIALPORT_VERSION = 0.7.0
 laurent> +RUBY_SERIALPORT_SOURCE = ruby-serialport-$(RUBY_SERIALPORT_VERSION).tar.gz
 laurent> +RUBY_SERIALPORT_SITE = http://rubyforge.org/frs/download.php/49992
 laurent> +RUBY_SERIALPORT_DIR:=$(BUILD_DIR)/ruby-serialport-$(RUBY_SERIALPORT_VERSION)
 laurent> +RUBY_SERIALPORT_CAT:=$(ZCAT)
 laurent> +
 laurent> +$(DL_DIR)/$(RUBY_SERIALPORT_SOURCE):
 laurent> +	 $(call DOWNLOAD,$(RUBY_SERIALPORT_SITE,$(RUBY_SERIALPORT_SOURCE))
 laurent> +
 laurent> +ruby-serialport-source: $(DL_DIR)/$(RUBY_SERIALPORT_SOURCE)
 laurent> +
 laurent> +$(RUBY_SERIALPORT_DIR)/.unpacked: $(DL_DIR)/$(RUBY_SERIALPORT_SOURCE)
 laurent> +	$(RUBY_SERIALPORT_CAT) $(DL_DIR)/$(RUBY_SERIALPORT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
 laurent> +	toolchain/patch-kernel.sh $(RUBY_SERIALPORT_DIR) package/ruby-serialport/ ruby-serialport\*.patch
 laurent> +	touch $@
 laurent> +
 laurent> +$(RUBY_SERIALPORT_DIR)/.configured: $(RUBY_SERIALPORT_DIR)/.unpacked
 laurent> +	(cd $(RUBY_SERIALPORT_DIR)/ext; rm Makefile; \
 laurent> +		RUBYLIB=$(RUBY_DIR):$(RUBY_DIR)/lib:$(RUBY_DIR)/.ext ruby-1.9 -e "require 'mkmf'; create_makefile('serialport')";)


This expects the host to have ruby 1.9 installed. Either we need to
add a check with a sensible error message or you need to compile ruby
for the host in $(HOST_DIR) and use that instead. See libglib2.mk for
an example.


 laurent> +$(RUBY_SERIALPORT_DIR)/.installed: $(RUBY_SERIALPORT_DIR)/ext/serialport.so
 laurent> +	(cd $(RUBY_SERIALPORT_DIR)/ext; \
 laurent> +		$(MAKE) DESTDIR=$(TARGET_DIR) extout=$(RUBY_DIR)/.ext install)

 
Doesn't this need to be stripped?


 laurent> +	touch $@
 laurent> +
 laurent> +ruby-serialport: $(RUBY_SERIALPORT_DIR)/.installed
 laurent> +
 laurent> +ruby-serialport-clean:
 laurent> +	(cd $(RUBY_SERIALPORT_DIR)/ext; \
 laurent> +		$(MAKE) DESTDIR=$(TARGET_DIR) extout=$(RUBY_DIR)/.ext clean)


This will fail if the -source target hasn't executed yet (E.G. running
make clean; make clean) - You can fix it by prefixing the line with
'-' to tell make to ignore errors.


-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [Buildroot] [PATCH] add ruby serialport extension
       [not found]   ` <4a339d7c0907130123u64b93c08h3c3f3a850188b1ec@mail.gmail.com>
@ 2009-07-13  8:27     ` laurent laffont
  0 siblings, 0 replies; 3+ messages in thread
From: laurent laffont @ 2009-07-13  8:27 UTC (permalink / raw)
  To: buildroot

On Mon, Jul 13, 2009 at 9:29 AM, Peter Korsgaard <jacmet@uclibc.org> wrote:

> >>>>> "laurent" == laurent laffont <laurent.laffont@gmail.com> writes:
>
> Hi,
>
>  laurent> From: laurent laffont <laurent.laffont@gmail.com>
>  laurent> Handle ruby serialport extension cross compilation.
>  laurent> http://rubyforge.org/projects/ruby-serialport/
>
>  laurent> Signed-off-by: laurent laffont <laurent.laffont@gmail.com>
>
>  laurent> +++ b/package/ruby-serialport/ruby-serialport-fix-1.9.patch
>  laurent> @@ -0,0 +1,52 @@
>  laurent> +--- a/ext/impl/posix_serialport.c    2008-12-23
> 20:35:07.000000000 +0000
>  laurent> ++++ b/ext/impl/posix_serialport.c    2009-05-21
> 16:37:13.000000000 +0100
>  laurent> +@@ -38,16 +38,16 @@
>  laurent> + static int get_fd_helper(obj)
>  laurent> +    VALUE obj;
>  laurent> + {
>  laurent> +-   OpenFile *fptr;
>  laurent> ++   rb_io_t *fptr;
>
>
> What is this for? It doesn't seem buildroot specific?



This patch is needed to compile ruby-serialport with ruby 1.9.1 See
http://rubyforge.org/tracker/index.php?func=detail&aid=23788&group_id=61&atid=320


>
>
>
>  laurent> diff --git a/package/ruby-serialport/ruby-serialport.mkb/package/ruby-serialport/
> ruby-serialport.mk
>  laurent> new file mode 100644
>  laurent> index 0000000..797646c
>  laurent> --- /dev/null
>  laurent> +++ b/package/ruby-serialport/ruby-serialport.mk
>  laurent> @@ -0,0 +1,53 @@
>  laurent> +#############################################################
>  laurent> +#
>  laurent> +# ruby-serialport
>  laurent> +#
>  laurent> +#############################################################
>  laurent> +RUBY_SERIALPORT_VERSION = 0.7.0
>  laurent> +RUBY_SERIALPORT_SOURCE =
> ruby-serialport-$(RUBY_SERIALPORT_VERSION).tar.gz
>  laurent> +RUBY_SERIALPORT_SITE =
> http://rubyforge.org/frs/download.php/49992
>  laurent>
> +RUBY_SERIALPORT_DIR:=$(BUILD_DIR)/ruby-serialport-$(RUBY_SERIALPORT_VERSION)
>  laurent> +RUBY_SERIALPORT_CAT:=$(ZCAT)
>  laurent> +
>  laurent> +$(DL_DIR)/$(RUBY_SERIALPORT_SOURCE):
>  laurent> +      $(call
> DOWNLOAD,$(RUBY_SERIALPORT_SITE,$(RUBY_SERIALPORT_SOURCE))
>  laurent> +
>  laurent> +ruby-serialport-source: $(DL_DIR)/$(RUBY_SERIALPORT_SOURCE)
>  laurent> +
>  laurent> +$(RUBY_SERIALPORT_DIR)/.unpacked:
> $(DL_DIR)/$(RUBY_SERIALPORT_SOURCE)
>  laurent> +     $(RUBY_SERIALPORT_CAT) $(DL_DIR)/$(RUBY_SERIALPORT_SOURCE)
> | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
>  laurent> +     toolchain/patch-kernel.sh $(RUBY_SERIALPORT_DIR)
> package/ruby-serialport/ ruby-serialport\*.patch
>  laurent> +     touch $@
>  laurent> +
>  laurent> +$(RUBY_SERIALPORT_DIR)/.configured:
> $(RUBY_SERIALPORT_DIR)/.unpacked
>  laurent> +     (cd $(RUBY_SERIALPORT_DIR)/ext; rm Makefile; \
>  laurent> +
> RUBYLIB=$(RUBY_DIR):$(RUBY_DIR)/lib:$(RUBY_DIR)/.ext ruby-1.9 -e "require
> 'mkmf'; create_makefile('serialport')";)
>
>
> This expects the host to have ruby 1.9 installed. Either we need to
> add a check with a sensible error message or you need to compile ruby
> for the host in $(HOST_DIR) and use that instead. See libglib2.mk for
> an example.


OK, I will take look.


>
>
>
>  laurent> +$(RUBY_SERIALPORT_DIR)/.installed:
> $(RUBY_SERIALPORT_DIR)/ext/serialport.so
>  laurent> +     (cd $(RUBY_SERIALPORT_DIR)/ext; \
>  laurent> +             $(MAKE) DESTDIR=$(TARGET_DIR)
> extout=$(RUBY_DIR)/.ext install)
>
>
> Doesn't this need to be stripped?


I will try.



>
>  laurent> +     touch $@
>  laurent> +
>  laurent> +ruby-serialport: $(RUBY_SERIALPORT_DIR)/.installed
>  laurent> +
>  laurent> +ruby-serialport-clean:
>  laurent> +     (cd $(RUBY_SERIALPORT_DIR)/ext; \
>  laurent> +             $(MAKE) DESTDIR=$(TARGET_DIR)
> extout=$(RUBY_DIR)/.ext clean)
>
>
> This will fail if the -source target hasn't executed yet (E.G. running
> make clean; make clean) - You can fix it by prefixing the line with
> '-' to tell make to ignore errors.


OK. Thanks for your comments.

Regards,

Laurent Laffont
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20090713/489f8bd6/attachment-0001.htm>

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2009-07-13  8:27 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-07-09 12:09 [Buildroot] [PATCH] add ruby serialport extension laurent.laffont at gmail.com
2009-07-13  7:29 ` Peter Korsgaard
     [not found]   ` <4a339d7c0907130123u64b93c08h3c3f3a850188b1ec@mail.gmail.com>
2009-07-13  8:27     ` laurent laffont

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox