| Submitter | Marcin Juszkiewicz |
|---|---|
| Date | Dec. 18, 2012, 9:03 a.m. |
| Message ID | <1355821397-23458-2-git-send-email-marcin.juszkiewicz@linaro.org> |
| Download | mbox | patch |
| Permalink | /patch/41233/ |
| State | New |
| Headers | show |
Comments
On 12/18/2012 01:03 AM, Marcin Juszkiewicz wrote: > Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> > --- > meta/recipes-extended/slang/slang_2.2.4.bb | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/meta/recipes-extended/slang/slang_2.2.4.bb b/meta/recipes-extended/slang/slang_2.2.4.bb > index 60aac66..946e9f6 100644 > --- a/meta/recipes-extended/slang/slang_2.2.4.bb > +++ b/meta/recipes-extended/slang/slang_2.2.4.bb > @@ -29,6 +29,14 @@ SRC_URI[sha256sum] = "9a8257a9a2a55099af858b13338dc8f3a06dd2069f46f0df2c9c3bb84a > > EXTRA_OECONF += " --without-z --without-png --without-onig --x-includes=${STAGING_DIR_HOST}/usr/include/X11 --x-libraries=${STAGING_DIR_HOST}/usr/lib" > > +do_configure_prepend() { > + # slang keeps configure.ac and rest of autoconf files in autoconf/ directory > + # we have to go there to be able to run gnu-configize cause it expects configure.{in,ac} > + # to be present. Resulting files land in autoconf/autoconf/ so we need to move them. > + cd ${S}/autoconf && gnu-configize --force && mv autoconf/config.* . > + cd ${S} > +} Should these be ${S} or ${B} (or some combination), I believe we are trying to allow for builds to be in a different dir where ${S} != ${B}? Sau! > + > do_install() { > oe_runmake install DESTDIR=${D} -e 'INST_LIB_DIR=${STAGING_DIR_HOST}/usr/lib' > } >
On 18 December 2012 19:17, Saul Wold <sgw@linux.intel.com> wrote: >> +do_configure_prepend() { >> + # slang keeps configure.ac and rest of autoconf files in autoconf/ >> directory >> + # we have to go there to be able to run gnu-configize cause it >> expects configure.{in,ac} >> + # to be present. Resulting files land in autoconf/autoconf/ so we >> need to move them. >> + cd ${S}/autoconf && gnu-configize --force && mv autoconf/config.* . >> + cd ${S} >> +} > > Should these be ${S} or ${B} (or some combination), I believe we are trying > to allow for builds to be in a different dir where ${S} != ${B}? Yes, I would like people to consider $S and $B when writing things like this - whilst at the moment it's a disaster to attempt S!=B, I've a branch (ross/bnots on poky-contrib) where I'm fixing/disabling the problem recipes. I this case, $S then $B should be right, afaik. Ross
W dniu 18.12.2012 20:56, Burton, Ross pisze: > On 18 December 2012 19:17, Saul Wold <sgw@linux.intel.com> wrote: >>> +do_configure_prepend() { >>> + # slang keeps configure.ac and rest of autoconf files in autoconf/ >>> directory >>> + # we have to go there to be able to run gnu-configize cause it >>> expects configure.{in,ac} >>> + # to be present. Resulting files land in autoconf/autoconf/ so we >>> need to move them. >>> + cd ${S}/autoconf && gnu-configize --force && mv autoconf/config.* . >>> + cd ${S} >>> +} >> >> Should these be ${S} or ${B} (or some combination), I believe we are trying >> to allow for builds to be in a different dir where ${S} != ${B}? > > Yes, I would like people to consider $S and $B when writing things > like this - whilst at the moment it's a disaster to attempt S!=B, I've > a branch (ross/bnots on poky-contrib) where I'm fixing/disabling the > problem recipes. > > I this case, $S then $B should be right, afaik. The problem is that $S == $B in this case so hard to check which is proper (for me). I would love to use pushd/popd but they are bashisms iirc.
Patch
diff --git a/meta/recipes-extended/slang/slang_2.2.4.bb b/meta/recipes-extended/slang/slang_2.2.4.bb index 60aac66..946e9f6 100644 --- a/meta/recipes-extended/slang/slang_2.2.4.bb +++ b/meta/recipes-extended/slang/slang_2.2.4.bb @@ -29,6 +29,14 @@ SRC_URI[sha256sum] = "9a8257a9a2a55099af858b13338dc8f3a06dd2069f46f0df2c9c3bb84a EXTRA_OECONF += " --without-z --without-png --without-onig --x-includes=${STAGING_DIR_HOST}/usr/include/X11 --x-libraries=${STAGING_DIR_HOST}/usr/lib" +do_configure_prepend() { + # slang keeps configure.ac and rest of autoconf files in autoconf/ directory + # we have to go there to be able to run gnu-configize cause it expects configure.{in,ac} + # to be present. Resulting files land in autoconf/autoconf/ so we need to move them. + cd ${S}/autoconf && gnu-configize --force && mv autoconf/config.* . + cd ${S} +} + do_install() { oe_runmake install DESTDIR=${D} -e 'INST_LIB_DIR=${STAGING_DIR_HOST}/usr/lib' }
Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> --- meta/recipes-extended/slang/slang_2.2.4.bb | 8 ++++++++ 1 file changed, 8 insertions(+)