[PATCH] added a .bb for node.js

[PATCH] added a .bb for node.js

[AJ ONeal]

---
 recipes/node/files/libev-arm-cross.patch |   45 ++++++++++++++++++++++++++++++
 recipes/node/files/node-arm-cross.patch  |   31 ++++++++++++++++++++
 recipes/node/node_0.1.104.bb             |   28 ++++++++++++++++++
 recipes/node/node_v0.1.104.bb            |   23 +++++++++++++++
 4 files changed, 127 insertions(+), 0 deletions(-)
 create mode 100644 recipes/node/files/libev-arm-cross.patch
 create mode 100644 recipes/node/files/node-arm-cross.patch
 create mode 100644 recipes/node/node_0.1.104.bb
 create mode 100644 recipes/node/node_v0.1.104.bb

diff --git a/recipes/node/files/libev-arm-cross.patch b/recipes/node/files/libev-arm-cross.patch
new file mode 100644
index 0000000..340dd98
--- /dev/null
+++ b/recipes/node/files/libev-arm-cross.patch
@@ -0,0 +1,45 @@
+diff --git node-v0.1.104/deps/libev/wscript.orig node-v0.1.104/deps/libev/wscript
+index 19e7bb2..a62f418 100644
+--- node-v0.1.104/deps/libev/wscript.orig
++++ node-v0.1.104/deps/libev/wscript
+@@ -40,20 +40,27 @@ def configure(conf):
+   if conf.check_cc(header_name="sys/eventfd.h"):
+     conf.check_cc(header_name="sys/eventfd.h", function_name="eventfd")
+ 
++  # TODO find a way to determine this from the environment
++  CROSS = True
++  TARGET_OS = "linux"
+ 
+-  code = """
+-      #include <syscall.h>
+-      #include <time.h>
+-      #include <stdio.h>
+-
+-      int main() {
+-          struct timespec ts; 
+-          int status = syscall(SYS_clock_gettime, CLOCK_REALTIME, &ts);
+-          return 0;
+-      }
+-  """
+-  conf.check_cc(fragment=code, define_name="HAVE_CLOCK_SYSCALL", execute=True,
+-                msg="Checking for SYS_clock_gettime")
++  if CROSS:
++    if TARGET_OS == 'linux':
++      conf.define("HAVE_CLOCK_SYSCALL", 1)
++  else:
++    code = """
++        #include <syscall.h>
++        #include <time.h>
++        #include <stdio.h>
++
++        int main() {
++            struct timespec ts; 
++            int status = syscall(SYS_clock_gettime, CLOCK_REALTIME, &ts);
++            return 0;
++        }
++    """
++    conf.check_cc(fragment=code, define_name="HAVE_CLOCK_SYSCALL", execute=True,
++                  msg="Checking for SYS_clock_gettime")
+ 
+   have_librt = conf.check(lib='rt', uselib_store='RT')
+   if have_librt:
diff --git a/recipes/node/files/node-arm-cross.patch b/recipes/node/files/node-arm-cross.patch
new file mode 100644
index 0000000..8ee6c18
--- /dev/null
+++ b/recipes/node/files/node-arm-cross.patch
@@ -0,0 +1,31 @@
+diff --git node-v0.1.104/wscript.orig node-v0.1.104/wscript
+index ba60514..d6a54fe 100644
+--- node-v0.1.104/wscript.orig
++++ node-v0.1.104/wscript
+@@ -313,17 +313,25 @@ def v8_cmd(bld, variant):
+   # cannot see symbols in the executable which are hidden, even if the
+   # executable is statically linked together...
+ 
++  HOST_CPU = 'not-arm' # TODO probe for this
++  snapshot = 'snapshot=on'
++
+   # XXX Remove this when v8 defaults x86_64 to native builds
+   arch = ""
+   if bld.env['DEST_CPU'] == 'x86_64':
+     arch = "arch=x64"
++  elif bld.env['DEST_CPU'] == 'arm':
++    arch = "arch=arm"
++
++  if bld.env['DEST_CPU'] != HOST_CPU:
++    snapshot = ""
+ 
+   if variant == "default":
+     mode = "release"
+   else:
+     mode = "debug"
+ 
+-  cmd_R = 'python "%s" -j %d -C "%s" -Y "%s" visibility=default mode=%s %s library=static snapshot=on'
++  cmd_R = 'python "%s" -j %d -C "%s" -Y "%s" visibility=default mode=%s %s library=static ' + snapshot
+ 
+   cmd = cmd_R % ( scons
+                 , Options.options.jobs
diff --git a/recipes/node/node_0.1.104.bb b/recipes/node/node_0.1.104.bb
new file mode 100644
index 0000000..a99eaff
--- /dev/null
+++ b/recipes/node/node_0.1.104.bb
@@ -0,0 +1,28 @@
+DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript"
+PR = "r0"
+DEPENDS = "openssl"
+SRC_URI = " \
+http://nodejs.org/dist/node-v${PV}.tar.gz \
+file://libev-arm-cross.patch;apply=yes \
+file://node-arm-cross.patch;apply=yes \
+"
+SRC_URI[md5sum] = "907fa1e0a2f1f0c3df5efc97fd05a7d2"
+SRC_URI[sha256sum] = "a1c776f44bc07305dc0e56df17cc3260eaafa0394c3b06c27448ad85bec272df"
+S = "${WORKDIR}/node-v${PV}"
+do_configure () {
+export DEST_CPU=arm
+./configure
+# skip complaints about 'config.log'
+cat /dev/null > ${S}/build/config.log
+}
+do_qa_configure () {
+}
+do_compile () {
+export DEST_CPU=arm
+make
+}
+do_install () {
+install -d ${D}${bindir}/
+install -m 0755 ${S}/node ${D}${bindir}/
+}
+FILES_${PN} = "${bindir}/node"
diff --git a/recipes/node/node_v0.1.104.bb b/recipes/node/node_v0.1.104.bb
new file mode 100644
index 0000000..368b8fb
--- /dev/null
+++ b/recipes/node/node_v0.1.104.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript"
+PR = "r0"
+DEPENDS = "openssl"
+SRC_URI = " \
+http://nodejs.org/dist/node-v${PV}.tar.gz \
+"
+#libev-cross.patch
+#node-cross.patch
+SRC_URI[md5sum] = "907fa1e0a2f1f0c3df5efc97fd05a7d2"
+SRC_URI[sha256sum] = "a1c776f44bc07305dc0e56df17cc3260eaafa0394c3b06c27448ad85bec272df"
+S = "${WORKDIR}/node-v${PV}"
+do_configure () {
+./configure
+}
+do_compile () {
+export DEST_CPU=arm
+make
+}
+do_install () {
+install -d ${D}${bindir}/
+install -m 0755 ${S}/node ${D}${bindir}/
+}
+FILES_${PN} = "${bindir}/node"
-- 
1.6.0.4

Re: [PATCH] added a .bb for node.js

[AJ ONeal]

P.S. Is this correct way for me to add a recipe? I didn't notice a
particular document for it on the website.

AJ ONeal

Re: [PATCH] added a .bb for node.js

[Paul Menzel]

[-- Attachment #1: Type: text/plain, Size: 585 bytes --]

Am Donnerstag, den 19.08.2010, 00:15 -0600 schrieb AJ ONeal:
> P.S. Is this correct way for me to add a recipe? I didn't notice a
> particular document for it on the website.

You are also missing a Signed-off-by line.

The process is documented in the Wiki [1] including an example. (Left
navigation bar, choose »Devs« for an overview and choose »Policies«
under subcategories.)

Please also remember to update the patch queue [2].


Thanks,

Paul


[1] http://wiki.openembedded.net/index.php/Commit_Policy
[2] http://wiki.openembedded.net/index.php/Patchwork

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [PATCH] added a .bb for node.js

[AJ ONeal]

>
> Please also remember to update the patch queue [2].
>

Update it to what?

That link you gave me is very unclear

It is desirable to update the state of the patch in the patch queue. This
> could also be added to the script.


The patch is listed as "new". I'd agree with that state. It certainly isn't
"accepted" - that's someone else's job to put that, right?

Re: [PATCH] added a .bb for node.js

[Paul Menzel]

[-- Attachment #1: Type: text/plain, Size: 743 bytes --]

Am Montag, den 23.08.2010, 15:25 -0600 schrieb AJ ONeal:
> >
> > Please also remember to update the patch queue [2].
> >
> 
> Update it to what?
> 
> That link you gave me is very unclear
> 
> It is desirable to update the state of the patch in the patch queue. This
> > could also be added to the script.

This sentence addresses the case when your patch is accepted.

> The patch is listed as "new". I'd agree with that state. It certainly isn't
> "accepted" - that's someone else's job to put that, right?

Reading the reviews your patch got you need to improve it a little bit.
So after you send in the next iteration of your patch – v2 in our case –
you should update the state to superseded.


Thanks,

Paul

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [PATCH] added a .bb for node.js

[AJ ONeal]

>
> > > Please also remember to update the patch queue [2].
> > >
> >
> > Update it to what?
> >
> > That link you gave me is very unclear
> >
> > It is desirable to update the state of the patch in the patch queue. This
> > > could also be added to the script.
>
> This sentence addresses the case when your patch is accepted.
>

I already marked the first two as superseded


> > The patch is listed as "new". I'd agree with that state. It certainly
> isn't
> > "accepted" - that's someone else's job to put that, right?
>
> Reading the reviews your patch got you need to improve it a little bit.
> So after you send in the next iteration of your patch – v2 in our case –
> you should update the state to superseded.
>

If you look at the newest patch I already implemented all of those changes
excepting that I didn't do the Signed-off-by and the patch includes the [v2]
in the commit message.

Do you still want me to submit again with just those changes?

>> All I do to add that is --signoff, correct?

> No. Please take a look at the link I gave you [1] and the other patches
> sent to this list.

Again, I don't think that's very clear

- Include a Signed-off-by: line indicating the change has valid certificate

of origin as per the Linux kernel


What is a valid certificate of origin?

How about an example? You correct me where I'm mistaken and then I'll copy
this to the wiki as reference




Let's say you create a new recipe and you'd like to submit it for inclusion
(and you've already tested that it works, of course).

Now commit with a good strong helpful message

    git add recipes/nodejs/
    git commit # don't use the -m option

The message should look like this

    added recipe for node.js

    * added recipe for node.js (bug #5555 - no nodejs recipe)
    ** patched libev's wscript to not try to execute code
    ** patched node's wscript to not search in '/usr/include'

    Signed-off-by: AJ ONeal <coolaj86@gmail.com>

Create your patch

    git format-patch -1 # or however many commits are part of this change

If you are submitting a second version also add "--subject-prefix [v2]"

    git send-email

Your patch will be immediately visible on
http://patchwork.openembedded.org/patch/
Once your patch has been accepted or rejected, update the status to
"accepted" or "rejected"

If you get soft-rejected (a lot of feedback), make the changes, submit the
next version, and update the status of the previous patch to "superseded"

Appendix: Properly configuring git (using tekkub@gmail.com as an example
user)

    sudo apt-get install git-core git-email
    git config --global user.name "Tekkub"
    git config --global user.email "tekkub@gmail.com"
    git config --global sendemail.smtpserver smtp.gmail.com
    git config --global sendemail.smtpserverport 587
    git config --global sendemail.smtpencryption tls
    git config --global sendemail.smtpuser tekkupl@gmail.com

Re: [PATCH] added a .bb for node.js

[J. L.]

Great write up AJ once again I wasnt even aware of some of those
steps. Probably why a patch I tried to send in a long while ago never
showed up again nor did I hear anything. Thanks for taking the time to
write out those steps and very clearly, hope to see more on your blog
as well about all this. I hope I will get the hang of all this soon,
but I still cant get programs I want to build using BB.



On Mon, Aug 23, 2010 at 4:20 PM, AJ ONeal <coolaj86@gmail.com> wrote:
>>
>> > > Please also remember to update the patch queue [2].
>> > >
>> >
>> > Update it to what?
>> >
>> > That link you gave me is very unclear
>> >
>> > It is desirable to update the state of the patch in the patch queue. This
>> > > could also be added to the script.
>>
>> This sentence addresses the case when your patch is accepted.
>>
>
> I already marked the first two as superseded
>
>
>> > The patch is listed as "new". I'd agree with that state. It certainly
>> isn't
>> > "accepted" - that's someone else's job to put that, right?
>>
>> Reading the reviews your patch got you need to improve it a little bit.
>> So after you send in the next iteration of your patch – v2 in our case –
>> you should update the state to superseded.
>>
>
> If you look at the newest patch I already implemented all of those changes
> excepting that I didn't do the Signed-off-by and the patch includes the [v2]
> in the commit message.
>
> Do you still want me to submit again with just those changes?
>
>>> All I do to add that is --signoff, correct?
>
>> No. Please take a look at the link I gave you [1] and the other patches
>> sent to this list.
>
> Again, I don't think that's very clear
>
> - Include a Signed-off-by: line indicating the change has valid certificate
>
> of origin as per the Linux kernel
>
>
> What is a valid certificate of origin?
>
> How about an example? You correct me where I'm mistaken and then I'll copy
> this to the wiki as reference
>
>
>
>
> Let's say you create a new recipe and you'd like to submit it for inclusion
> (and you've already tested that it works, of course).
>
> Now commit with a good strong helpful message
>
>    git add recipes/nodejs/
>    git commit # don't use the -m option
>
> The message should look like this
>
>    added recipe for node.js
>
>    * added recipe for node.js (bug #5555 - no nodejs recipe)
>    ** patched libev's wscript to not try to execute code
>    ** patched node's wscript to not search in '/usr/include'
>
>    Signed-off-by: AJ ONeal <coolaj86@gmail.com>
>
> Create your patch
>
>    git format-patch -1 # or however many commits are part of this change
>
> If you are submitting a second version also add "--subject-prefix [v2]"
>
>    git send-email
>
> Your patch will be immediately visible on
> http://patchwork.openembedded.org/patch/
> Once your patch has been accepted or rejected, update the status to
> "accepted" or "rejected"
>
> If you get soft-rejected (a lot of feedback), make the changes, submit the
> next version, and update the status of the previous patch to "superseded"
>
> Appendix: Properly configuring git (using tekkub@gmail.com as an example
> user)
>
>    sudo apt-get install git-core git-email
>    git config --global user.name "Tekkub"
>    git config --global user.email "tekkub@gmail.com"
>    git config --global sendemail.smtpserver smtp.gmail.com
>    git config --global sendemail.smtpserverport 587
>    git config --global sendemail.smtpencryption tls
>    git config --global sendemail.smtpuser tekkupl@gmail.com
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>

Re: [PATCH] added a .bb for node.js

[AJ ONeal]

>
> You are also missing a Signed-off-by line.
>

All I do to add that is --signoff, correct?

Re: [PATCH] added a .bb for node.js

[Paul Menzel]

[-- Attachment #1: Type: text/plain, Size: 512 bytes --]

Am Montag, den 23.08.2010, 15:27 -0600 schrieb AJ ONeal:
> >
> > You are also missing a Signed-off-by line.
> >
> 
> All I do to add that is --signoff, correct?

No. Please take a look at the link I gave you [1] and the other patches
sent to this list.

Signed-off-by: Your Name <address>

is needed below your commit message. Git can do this for you with the
`-s` option for `git commit` or `git format-patch -s`.


Thanks,

Paul


[1] http://wiki.openembedded.net/index.php/Commit_Policy

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [PATCH] added a .bb for node.js

[Frans Meulenbroeks]

Can't judge the patches, but will give some feedback on one of your
recipe versions

2010/8/19 AJ ONeal <coolaj86@gmail.com>:

> diff --git a/recipes/node/node_0.1.104.bb b/recipes/node/node_0.1.104.bb
> new file mode 100644
> index 0000000..a99eaff
> --- /dev/null
> +++ b/recipes/node/node_0.1.104.bb
> @@ -0,0 +1,28 @@
> +DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript"

can you add std headers like HOMEPAGE and LICENSE
see other recipes for examples

> +PR = "r0"
> +DEPENDS = "openssl"
> +SRC_URI = " \
> +http://nodejs.org/dist/node-v${PV}.tar.gz \
> +file://libev-arm-cross.patch;apply=yes \
> +file://node-arm-cross.patch;apply=yes \
please indent (with spaces); apply=yes is default for patch files so
no need to add it
> +"
> +SRC_URI[md5sum] = "907fa1e0a2f1f0c3df5efc97fd05a7d2"
> +SRC_URI[sha256sum] = "a1c776f44bc07305dc0e56df17cc3260eaafa0394c3b06c27448ad85bec272df"
> +S = "${WORKDIR}/node-v${PV}"
> +do_configure () {
> +export DEST_CPU=arm
> +./configure
> +# skip complaints about 'config.log'
> +cat /dev/null > ${S}/build/config.log
> +}
> +do_qa_configure () {
> +}
needed?

> +do_compile () {
> +export DEST_CPU=arm
> +make
if it works use: oe_runmake DEST_CPU=arm
> +}
> +do_install () {
> +install -d ${D}${bindir}/
> +install -m 0755 ${S}/node ${D}${bindir}/
is there no make install? If so you probably should do
oe_runmake install
maybe overriding DESTDIR or whatever your makefile uses

> +}
> +FILES_${PN} = "${bindir}/node"

I think your bindir will be in the package anyway (and shouldn't it be
${D}${bindir}; don't do this often enough to know for sure, peek into
other recipes)

Please resubmit as v2

Frans

Re: [PATCH] added a .bb for node.js

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 19-08-10 08:07, AJ ONeal wrote:

> diff --git a/recipes/node/node_0.1.104.bb b/recipes/node/node_0.1.104.bb
> new file mode 100644
> index 0000000..a99eaff
> --- /dev/null
> +++ b/recipes/node/node_0.1.104.bb
> @@ -0,0 +1,28 @@
> +DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript"

> +PR = "r0"

r0 is the default, so remove that line, it only increases parse time.

> +DEPENDS = "openssl"
> +SRC_URI = " \
> +http://nodejs.org/dist/node-v${PV}.tar.gz \
> +file://libev-arm-cross.patch;apply=yes \
> +file://node-arm-cross.patch;apply=yes \
> +"
> +SRC_URI[md5sum] = "907fa1e0a2f1f0c3df5efc97fd05a7d2"
> +SRC_URI[sha256sum] = "a1c776f44bc07305dc0e56df17cc3260eaafa0394c3b06c27448ad85bec272df"
> +S = "${WORKDIR}/node-v${PV}"
> +do_configure () {

> +export DEST_CPU=arm

NAK, we support more than ARM cpus in OE

> +./configure
> +# skip complaints about 'config.log'
> +cat /dev/null > ${S}/build/config.log
> +}
> +do_qa_configure () {
> +}

NAK, fix the bugs instead of silencing the warning

> +do_compile () {
> +export DEST_CPU=arm
> +make
> +}

again, NAK, we support more than ARM cpus in OE


> +do_install () {
> +install -d ${D}${bindir}/
> +install -m 0755 ${S}/node ${D}${bindir}/
> +}

'make install' doesn't work?


-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFMbO1HMkyGM64RGpERAjwhAJsGHT8vVCVIso0dGsRsyTzT1UFW2wCgrrGj
NNapHt4oedB+qSPatTwatKc=
=HuvB
-----END PGP SIGNATURE-----

Re: [PATCH] added a .bb for node.js

[AJ ONeal]

>
>
> > +do_install () {
> > +install -d ${D}${bindir}/
> > +install -m 0755 ${S}/node ${D}${bindir}/
> > +}
>
> 'make install' doesn't work?
>
>
No, if I do `make install` it will try to install to the host location. I
tried adding ./configure --prefix=${D}, but that ends up installing to
`./work/arm......./usr/bin/bin`


I don't know how to add the [v2] onto a patch, but I'm going to submit again
with what I have working.

Re: [PATCH] added a .bb for node.js

[Frans Meulenbroeks]

2010/8/22 AJ ONeal <coolaj86@gmail.com>:
>>

> I don't know how to add the [v2] onto a patch, but I'm going to submit again
> with what I have working.
>
There is an option with git format-patch, which I always forget.
The alternative is to edit the file format-patch gave you and change
the subeject line before doing a git send-mail

Frans

Re: [PATCH] added a .bb for node.js

[AJ ONeal]

I did

git commit -m "[v2] blah blah blah"
git format-patch -1
git send-email *blah*

AJ ONeal


On Sun, Aug 22, 2010 at 1:55 AM, Frans Meulenbroeks <
fransmeulenbroeks@gmail.com> wrote:

> 2010/8/22 AJ ONeal <coolaj86@gmail.com>:
> >>
>
> > I don't know how to add the [v2] onto a patch, but I'm going to submit
> again
> > with what I have working.
> >
> There is an option with git format-patch, which I always forget.
> The alternative is to edit the file format-patch gave you and change
> the subeject line before doing a git send-mail
>
> Frans
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>

Re: [PATCH] added a .bb for node.js

[Frans Meulenbroeks]

2010/8/23 AJ ONeal <coolaj86@gmail.com>:
> I did
>
> git commit -m "[v2] blah blah blah"

Not really the desired way as now [v2] becomes part of the commit message.

Frans

> git format-patch -1
> git send-email *blah*
>
> AJ ONeal

Re: [PATCH] added a .bb for node.js

[Paul Menzel]

[-- Attachment #1: Type: text/plain, Size: 459 bytes --]

Am Montag, den 23.08.2010, 07:45 +0200 schrieb Frans Meulenbroeks:
> 2010/8/23 AJ ONeal <coolaj86@gmail.com>:
> > I did
> >
> > git commit -m "[v2] blah blah blah"
> 
> Not really the desired way as now [v2] becomes part of the commit message.

Git’s manual pages are very good: `git help format-patch`.
`--subject-prefix` is the option you are looking for to add »v2«.

> > git format-patch -1
> > git send-email *blah*


Thanks,

Paul

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [PATCH] added a .bb for node.js

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 22-08-10 05:04, AJ ONeal wrote:
>>
>>
>>> +do_install () {
>>> +install -d ${D}${bindir}/
>>> +install -m 0755 ${S}/node ${D}${bindir}/
>>> +}
>>
>> 'make install' doesn't work?
>>
>>
> No, if I do `make install` it will try to install to the host location. I
> tried adding ./configure --prefix=${D}, but that ends up installing to
> `./work/arm......./usr/bin/bin`
> 
> 
> I don't know how to add the [v2] onto a patch, but I'm going to submit again
> with what I have working.

Doesn't nodejs have some form of DESTDIR option? I think it did when I
built it natively.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFMcjY5MkyGM64RGpERAjXEAKCFFujj6YTak9NMbwqahDlyqotSigCdH+b5
wTjCxcVVoDHk4QJSVRxawqo=
=zN0i
-----END PGP SIGNATURE-----

Re: [PATCH] added a .bb for node.js

[AJ ONeal]

>
> >>
> > No, if I do `make install` it will try to install to the host location. I
> > tried adding ./configure --prefix=${D}, but that ends up installing to
> > `./work/arm......./usr/bin/bin`
> >
> >
> > I don't know how to add the [v2] onto a patch, but I'm going to submit
> again
> > with what I have working.
>
> Doesn't nodejs have some form of DESTDIR option? I think it did when I
> built it natively.
>
>
You're going to have to give me an example. What should it be set to?

${D}
${bindir}
${something-else-entirely}

I don't really understand these things do or what they're for. I was just
blindly copying the only example that I could find.

Re: [PATCH] added a .bb for node.js

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

And the PN should be nodejs


On 19-08-10 08:07, AJ ONeal wrote:
> ---
>  recipes/node/files/libev-arm-cross.patch |   45 ++++++++++++++++++++++++++++++
>  recipes/node/files/node-arm-cross.patch  |   31 ++++++++++++++++++++
>  recipes/node/node_0.1.104.bb             |   28 ++++++++++++++++++
>  recipes/node/node_v0.1.104.bb            |   23 +++++++++++++++
>  4 files changed, 127 insertions(+), 0 deletions(-)
>  create mode 100644 recipes/node/files/libev-arm-cross.patch
>  create mode 100644 recipes/node/files/node-arm-cross.patch
>  create mode 100644 recipes/node/node_0.1.104.bb
>  create mode 100644 recipes/node/node_v0.1.104.bb
> 
> diff --git a/recipes/node/files/libev-arm-cross.patch b/recipes/node/files/libev-arm-cross.patch
> new file mode 100644
> index 0000000..340dd98
> --- /dev/null
> +++ b/recipes/node/files/libev-arm-cross.patch
> @@ -0,0 +1,45 @@
> +diff --git node-v0.1.104/deps/libev/wscript.orig node-v0.1.104/deps/libev/wscript
> +index 19e7bb2..a62f418 100644
> +--- node-v0.1.104/deps/libev/wscript.orig
> ++++ node-v0.1.104/deps/libev/wscript
> +@@ -40,20 +40,27 @@ def configure(conf):
> +   if conf.check_cc(header_name="sys/eventfd.h"):
> +     conf.check_cc(header_name="sys/eventfd.h", function_name="eventfd")
> + 
> ++  # TODO find a way to determine this from the environment
> ++  CROSS = True
> ++  TARGET_OS = "linux"
> + 
> +-  code = """
> +-      #include <syscall.h>
> +-      #include <time.h>
> +-      #include <stdio.h>
> +-
> +-      int main() {
> +-          struct timespec ts; 
> +-          int status = syscall(SYS_clock_gettime, CLOCK_REALTIME, &ts);
> +-          return 0;
> +-      }
> +-  """
> +-  conf.check_cc(fragment=code, define_name="HAVE_CLOCK_SYSCALL", execute=True,
> +-                msg="Checking for SYS_clock_gettime")
> ++  if CROSS:
> ++    if TARGET_OS == 'linux':
> ++      conf.define("HAVE_CLOCK_SYSCALL", 1)
> ++  else:
> ++    code = """
> ++        #include <syscall.h>
> ++        #include <time.h>
> ++        #include <stdio.h>
> ++
> ++        int main() {
> ++            struct timespec ts; 
> ++            int status = syscall(SYS_clock_gettime, CLOCK_REALTIME, &ts);
> ++            return 0;
> ++        }
> ++    """
> ++    conf.check_cc(fragment=code, define_name="HAVE_CLOCK_SYSCALL", execute=True,
> ++                  msg="Checking for SYS_clock_gettime")
> + 
> +   have_librt = conf.check(lib='rt', uselib_store='RT')
> +   if have_librt:
> diff --git a/recipes/node/files/node-arm-cross.patch b/recipes/node/files/node-arm-cross.patch
> new file mode 100644
> index 0000000..8ee6c18
> --- /dev/null
> +++ b/recipes/node/files/node-arm-cross.patch
> @@ -0,0 +1,31 @@
> +diff --git node-v0.1.104/wscript.orig node-v0.1.104/wscript
> +index ba60514..d6a54fe 100644
> +--- node-v0.1.104/wscript.orig
> ++++ node-v0.1.104/wscript
> +@@ -313,17 +313,25 @@ def v8_cmd(bld, variant):
> +   # cannot see symbols in the executable which are hidden, even if the
> +   # executable is statically linked together...
> + 
> ++  HOST_CPU = 'not-arm' # TODO probe for this
> ++  snapshot = 'snapshot=on'
> ++
> +   # XXX Remove this when v8 defaults x86_64 to native builds
> +   arch = ""
> +   if bld.env['DEST_CPU'] == 'x86_64':
> +     arch = "arch=x64"
> ++  elif bld.env['DEST_CPU'] == 'arm':
> ++    arch = "arch=arm"
> ++
> ++  if bld.env['DEST_CPU'] != HOST_CPU:
> ++    snapshot = ""
> + 
> +   if variant == "default":
> +     mode = "release"
> +   else:
> +     mode = "debug"
> + 
> +-  cmd_R = 'python "%s" -j %d -C "%s" -Y "%s" visibility=default mode=%s %s library=static snapshot=on'
> ++  cmd_R = 'python "%s" -j %d -C "%s" -Y "%s" visibility=default mode=%s %s library=static ' + snapshot
> + 
> +   cmd = cmd_R % ( scons
> +                 , Options.options.jobs
> diff --git a/recipes/node/node_0.1.104.bb b/recipes/node/node_0.1.104.bb
> new file mode 100644
> index 0000000..a99eaff
> --- /dev/null
> +++ b/recipes/node/node_0.1.104.bb
> @@ -0,0 +1,28 @@
> +DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript"
> +PR = "r0"
> +DEPENDS = "openssl"
> +SRC_URI = " \
> +http://nodejs.org/dist/node-v${PV}.tar.gz \
> +file://libev-arm-cross.patch;apply=yes \
> +file://node-arm-cross.patch;apply=yes \
> +"
> +SRC_URI[md5sum] = "907fa1e0a2f1f0c3df5efc97fd05a7d2"
> +SRC_URI[sha256sum] = "a1c776f44bc07305dc0e56df17cc3260eaafa0394c3b06c27448ad85bec272df"
> +S = "${WORKDIR}/node-v${PV}"
> +do_configure () {
> +export DEST_CPU=arm
> +./configure
> +# skip complaints about 'config.log'
> +cat /dev/null > ${S}/build/config.log
> +}
> +do_qa_configure () {
> +}
> +do_compile () {
> +export DEST_CPU=arm
> +make
> +}
> +do_install () {
> +install -d ${D}${bindir}/
> +install -m 0755 ${S}/node ${D}${bindir}/
> +}
> +FILES_${PN} = "${bindir}/node"
> diff --git a/recipes/node/node_v0.1.104.bb b/recipes/node/node_v0.1.104.bb
> new file mode 100644
> index 0000000..368b8fb
> --- /dev/null
> +++ b/recipes/node/node_v0.1.104.bb
> @@ -0,0 +1,23 @@
> +DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript"
> +PR = "r0"
> +DEPENDS = "openssl"
> +SRC_URI = " \
> +http://nodejs.org/dist/node-v${PV}.tar.gz \
> +"
> +#libev-cross.patch
> +#node-cross.patch
> +SRC_URI[md5sum] = "907fa1e0a2f1f0c3df5efc97fd05a7d2"
> +SRC_URI[sha256sum] = "a1c776f44bc07305dc0e56df17cc3260eaafa0394c3b06c27448ad85bec272df"
> +S = "${WORKDIR}/node-v${PV}"
> +do_configure () {
> +./configure
> +}
> +do_compile () {
> +export DEST_CPU=arm
> +make
> +}
> +do_install () {
> +install -d ${D}${bindir}/
> +install -m 0755 ${S}/node ${D}${bindir}/
> +}
> +FILES_${PN} = "${bindir}/node"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFMbO7IMkyGM64RGpERAutSAJ4rEznKqUERzRw63i45U5HKZDzn8wCfWwbp
GrHdH6tC0/HZ6/kCY+wxExQ=
=GrlM
-----END PGP SIGNATURE-----