* [PATCH 1/2] python: fix SSL for 2.6
@ 2010-02-15 19:35 Jesse Gilles
2010-02-15 19:45 ` [PATCH 2/2] ruby: fix 1.8.7-p248 compile Jesse Gilles
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Jesse Gilles @ 2010-02-15 19:35 UTC (permalink / raw)
To: openembedded-devel
Hi all,
I am new to the mailing list and I have a couple of patches to
contribute.
This fixes SSL support for python 2.6. Looks like the python module for
SSL was missing from the package.
Thanks,
Jesse
* Add SSL module to build -- fixes "import ssl"
diff --git a/contrib/python/generate-manifest-2.6.py b/contrib/python/generate-manifest-2.6.py
index fe0e385..890d1c0 100755
--- a/contrib/python/generate-manifest-2.6.py
+++ b/contrib/python/generate-manifest-2.6.py
@@ -248,7 +248,7 @@ if __name__ == "__main__":
m.addPackage( "python-io", "Python Low-Level I/O", "python-core python-math",
"lib-dynload/_socket.so lib-dynload/_ssl.so lib-dynload/select.so lib-dynload/termios.so lib-dynload/cStringIO.so " +
- "pipes.* socket.* tempfile.* StringIO.* " )
+ "pipes.* socket.* ssl.* tempfile.* StringIO.* " )
m.addPackage( "python-json", "Python JSON Support", "python-core python-math python-re",
"json" ) # package
diff --git a/recipes/python/python-2.6-manifest.inc b/recipes/python/python-2.6-manifest.inc
index cee12c8..188ee31 100644
--- a/recipes/python/python-2.6-manifest.inc
+++ b/recipes/python/python-2.6-manifest.inc
@@ -51,7 +51,7 @@ FILES_python-core="${libdir}/python2.6/__future__.* ${libdir}/python2.6/_abcoll.
DESCRIPTION_python-io="Python Low-Level I/O"
RDEPENDS_python-io="python-core python-math"
-FILES_python-io="${libdir}/python2.6/lib-dynload/_socket.so ${libdir}/python2.6/lib-dynload/_ssl.so ${libdir}/python2.6/lib-dynload/select.so ${libdir}/python2.6/lib-dynload/termios.so ${libdir}/python2.6/lib-dynload/cStringIO.so ${libdir}/python2.6/pipes.* ${libdir}/python2.6/socket.* ${libdir}/python2.6/tempfile.* ${libdir}/python2.6/StringIO.* "
+FILES_python-io="${libdir}/python2.6/lib-dynload/_socket.so ${libdir}/python2.6/lib-dynload/_ssl.so ${libdir}/python2.6/lib-dynload/select.so ${libdir}/python2.6/lib-dynload/termios.so ${libdir}/python2.6/lib-dynload/cStringIO.so ${libdir}/python2.6/pipes.* ${libdir}/python2.6/socket.* ${libdir}/python2.6/ssl.* ${libdir}/python2.6/tempfile.* ${libdir}/python2.6/StringIO.* "
DESCRIPTION_python-compiler="Python Compiler Support"
RDEPENDS_python-compiler="python-core"
diff --git a/recipes/python/python.inc b/recipes/python/python.inc
index 7e61f79..aff18db 100644
--- a/recipes/python/python.inc
+++ b/recipes/python/python.inc
@@ -4,7 +4,7 @@ LICENSE = "PSF"
SECTION = "devel/python"
PRIORITY = "optional"
# bump this on every change in contrib/python/generate-manifest-2.6.py
-INC_PR = "ml8"
+INC_PR = "ml9"
DEFAULT_PREFERENCE = "-26"
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 2/2] ruby: fix 1.8.7-p248 compile
2010-02-15 19:35 [PATCH 1/2] python: fix SSL for 2.6 Jesse Gilles
@ 2010-02-15 19:45 ` Jesse Gilles
2010-02-23 20:12 ` [PATCH 1/2] python: fix SSL for 2.6 Jesse Gilles
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Jesse Gilles @ 2010-02-15 19:45 UTC (permalink / raw)
To: openembedded-devel
* Update ruby library path so extensions needing mkmf can build and
find the right ruby headers. Fixes building of ext/dl.
diff --git a/recipes/ruby/files/extmk.patch b/recipes/ruby/files/extmk.patch
new file mode 100644
index 0000000..8b68450
--- /dev/null
+++ b/recipes/ruby/files/extmk.patch
@@ -0,0 +1,13 @@
+diff -ru ruby-1.8.7-p248.orig/ext/extmk.rb ruby-1.8.7-p248/ext/extmk.rb
+--- ruby-1.8.7-p248.orig/ext/extmk.rb 2009-12-24 03:01:58.000000000 -0600
++++ ruby-1.8.7-p248/ext/extmk.rb 2010-02-12 15:55:27.370061558 -0600
+@@ -354,8 +354,8 @@
+ $ruby = '$(topdir)/miniruby' + EXEEXT
+ end
+ $ruby << " -I'$(topdir)'"
++$ruby << " -I'$(top_srcdir)/lib'"
+ unless CROSS_COMPILING
+- $ruby << " -I'$(top_srcdir)/lib'"
+ $ruby << " -I'$(extout)/$(arch)' -I'$(extout)/common'" if $extout
+ $ruby << " -I./- -I'$(top_srcdir)/ext' -rpurelib.rb"
+ ENV["RUBYLIB"] = "-"
diff --git a/recipes/ruby/ruby_1.8.7-p248.bb b/recipes/ruby/ruby_1.8.7-p248.bb
index 8d95373..827327b 100644
--- a/recipes/ruby/ruby_1.8.7-p248.bb
+++ b/recipes/ruby/ruby_1.8.7-p248.bb
@@ -2,6 +2,7 @@ require ruby.inc
DEPENDS = "ruby-native zlib openssl"
SRC_URI = "ftp://ftp.ruby-lang.org/pub/ruby/${SHRT_VER}/ruby-${PV}.tar.gz \
file://extmk_run.patch;patch=1 \
+ file://extmk.patch;patch=1 \
"
FILES_${PN}-dbg += "${libdir}/ruby/1.8/*/.debug \
${libdir}/ruby/1.8/*/*/.debug"
On Mon, 2010-02-15 at 13:35 -0600, Jesse Gilles wrote:
> Hi all,
>
> I am new to the mailing list and I have a couple of patches to
> contribute.
>
> This fixes SSL support for python 2.6. Looks like the python module for
> SSL was missing from the package.
>
> Thanks,
> Jesse
>
> * Add SSL module to build -- fixes "import ssl"
>
> diff --git a/contrib/python/generate-manifest-2.6.py b/contrib/python/generate-manifest-2.6.py
> index fe0e385..890d1c0 100755
> --- a/contrib/python/generate-manifest-2.6.py
> +++ b/contrib/python/generate-manifest-2.6.py
> @@ -248,7 +248,7 @@ if __name__ == "__main__":
>
> m.addPackage( "python-io", "Python Low-Level I/O", "python-core python-math",
> "lib-dynload/_socket.so lib-dynload/_ssl.so lib-dynload/select.so lib-dynload/termios.so lib-dynload/cStringIO.so " +
> - "pipes.* socket.* tempfile.* StringIO.* " )
> + "pipes.* socket.* ssl.* tempfile.* StringIO.* " )
>
> m.addPackage( "python-json", "Python JSON Support", "python-core python-math python-re",
> "json" ) # package
> diff --git a/recipes/python/python-2.6-manifest.inc b/recipes/python/python-2.6-manifest.inc
> index cee12c8..188ee31 100644
> --- a/recipes/python/python-2.6-manifest.inc
> +++ b/recipes/python/python-2.6-manifest.inc
> @@ -51,7 +51,7 @@ FILES_python-core="${libdir}/python2.6/__future__.* ${libdir}/python2.6/_abcoll.
>
> DESCRIPTION_python-io="Python Low-Level I/O"
> RDEPENDS_python-io="python-core python-math"
> -FILES_python-io="${libdir}/python2.6/lib-dynload/_socket.so ${libdir}/python2.6/lib-dynload/_ssl.so ${libdir}/python2.6/lib-dynload/select.so ${libdir}/python2.6/lib-dynload/termios.so ${libdir}/python2.6/lib-dynload/cStringIO.so ${libdir}/python2.6/pipes.* ${libdir}/python2.6/socket.* ${libdir}/python2.6/tempfile.* ${libdir}/python2.6/StringIO.* "
> +FILES_python-io="${libdir}/python2.6/lib-dynload/_socket.so ${libdir}/python2.6/lib-dynload/_ssl.so ${libdir}/python2.6/lib-dynload/select.so ${libdir}/python2.6/lib-dynload/termios.so ${libdir}/python2.6/lib-dynload/cStringIO.so ${libdir}/python2.6/pipes.* ${libdir}/python2.6/socket.* ${libdir}/python2.6/ssl.* ${libdir}/python2.6/tempfile.* ${libdir}/python2.6/StringIO.* "
>
> DESCRIPTION_python-compiler="Python Compiler Support"
> RDEPENDS_python-compiler="python-core"
> diff --git a/recipes/python/python.inc b/recipes/python/python.inc
> index 7e61f79..aff18db 100644
> --- a/recipes/python/python.inc
> +++ b/recipes/python/python.inc
> @@ -4,7 +4,7 @@ LICENSE = "PSF"
> SECTION = "devel/python"
> PRIORITY = "optional"
> # bump this on every change in contrib/python/generate-manifest-2.6.py
> -INC_PR = "ml8"
> +INC_PR = "ml9"
>
> DEFAULT_PREFERENCE = "-26"
>
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 1/2] python: fix SSL for 2.6
2010-02-15 19:35 [PATCH 1/2] python: fix SSL for 2.6 Jesse Gilles
2010-02-15 19:45 ` [PATCH 2/2] ruby: fix 1.8.7-p248 compile Jesse Gilles
@ 2010-02-23 20:12 ` Jesse Gilles
2010-04-08 9:32 ` Stefan Schmidt
2010-05-05 12:23 ` Michael 'Mickey' Lauer
3 siblings, 0 replies; 5+ messages in thread
From: Jesse Gilles @ 2010-02-23 20:12 UTC (permalink / raw)
To: openembedded-devel
Any feedback on either of these patches?
Thanks,
Jesse
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] python: fix SSL for 2.6
2010-02-15 19:35 [PATCH 1/2] python: fix SSL for 2.6 Jesse Gilles
2010-02-15 19:45 ` [PATCH 2/2] ruby: fix 1.8.7-p248 compile Jesse Gilles
2010-02-23 20:12 ` [PATCH 1/2] python: fix SSL for 2.6 Jesse Gilles
@ 2010-04-08 9:32 ` Stefan Schmidt
2010-05-05 12:23 ` Michael 'Mickey' Lauer
3 siblings, 0 replies; 5+ messages in thread
From: Stefan Schmidt @ 2010-04-08 9:32 UTC (permalink / raw)
To: openembedded-devel; +Cc: Michael Lauer
Hallo.
On Mon, 2010-02-15 at 13:35, Jesse Gilles wrote:
>
> This fixes SSL support for python 2.6. Looks like the python module for
> SSL was missing from the package.
Mickey, can you have a look at this? Thanks.
> * Add SSL module to build -- fixes "import ssl"
>
> diff --git a/contrib/python/generate-manifest-2.6.py b/contrib/python/generate-manifest-2.6.py
> index fe0e385..890d1c0 100755
> --- a/contrib/python/generate-manifest-2.6.py
> +++ b/contrib/python/generate-manifest-2.6.py
> @@ -248,7 +248,7 @@ if __name__ == "__main__":
>
> m.addPackage( "python-io", "Python Low-Level I/O", "python-core python-math",
> "lib-dynload/_socket.so lib-dynload/_ssl.so lib-dynload/select.so lib-dynload/termios.so lib-dynload/cStringIO.so " +
> - "pipes.* socket.* tempfile.* StringIO.* " )
> + "pipes.* socket.* ssl.* tempfile.* StringIO.* " )
>
> m.addPackage( "python-json", "Python JSON Support", "python-core python-math python-re",
> "json" ) # package
> diff --git a/recipes/python/python-2.6-manifest.inc b/recipes/python/python-2.6-manifest.inc
> index cee12c8..188ee31 100644
> --- a/recipes/python/python-2.6-manifest.inc
> +++ b/recipes/python/python-2.6-manifest.inc
> @@ -51,7 +51,7 @@ FILES_python-core="${libdir}/python2.6/__future__.* ${libdir}/python2.6/_abcoll.
>
> DESCRIPTION_python-io="Python Low-Level I/O"
> RDEPENDS_python-io="python-core python-math"
> -FILES_python-io="${libdir}/python2.6/lib-dynload/_socket.so ${libdir}/python2.6/lib-dynload/_ssl.so ${libdir}/python2.6/lib-dynload/select.so ${libdir}/python2.6/lib-dynload/termios.so ${libdir}/python2.6/lib-dynload/cStringIO.so ${libdir}/python2.6/pipes.* ${libdir}/python2.6/socket.* ${libdir}/python2.6/tempfile.* ${libdir}/python2.6/StringIO.* "
> +FILES_python-io="${libdir}/python2.6/lib-dynload/_socket.so ${libdir}/python2.6/lib-dynload/_ssl.so ${libdir}/python2.6/lib-dynload/select.so ${libdir}/python2.6/lib-dynload/termios.so ${libdir}/python2.6/lib-dynload/cStringIO.so ${libdir}/python2.6/pipes.* ${libdir}/python2.6/socket.* ${libdir}/python2.6/ssl.* ${libdir}/python2.6/tempfile.* ${libdir}/python2.6/StringIO.* "
>
> DESCRIPTION_python-compiler="Python Compiler Support"
> RDEPENDS_python-compiler="python-core"
> diff --git a/recipes/python/python.inc b/recipes/python/python.inc
> index 7e61f79..aff18db 100644
> --- a/recipes/python/python.inc
> +++ b/recipes/python/python.inc
> @@ -4,7 +4,7 @@ LICENSE = "PSF"
> SECTION = "devel/python"
> PRIORITY = "optional"
> # bump this on every change in contrib/python/generate-manifest-2.6.py
> -INC_PR = "ml8"
> +INC_PR = "ml9"
>
> DEFAULT_PREFERENCE = "-26"
regards
Stefan Schmidt
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH 1/2] python: fix SSL for 2.6
2010-02-15 19:35 [PATCH 1/2] python: fix SSL for 2.6 Jesse Gilles
` (2 preceding siblings ...)
2010-04-08 9:32 ` Stefan Schmidt
@ 2010-05-05 12:23 ` Michael 'Mickey' Lauer
3 siblings, 0 replies; 5+ messages in thread
From: Michael 'Mickey' Lauer @ 2010-05-05 12:23 UTC (permalink / raw)
To: openembedded-devel
Applied, thanks.
Sorry for the delay.
--
:M:
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-05-05 12:26 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-02-15 19:35 [PATCH 1/2] python: fix SSL for 2.6 Jesse Gilles
2010-02-15 19:45 ` [PATCH 2/2] ruby: fix 1.8.7-p248 compile Jesse Gilles
2010-02-23 20:12 ` [PATCH 1/2] python: fix SSL for 2.6 Jesse Gilles
2010-04-08 9:32 ` Stefan Schmidt
2010-05-05 12:23 ` Michael 'Mickey' Lauer
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.