diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2011-03-19 17:15:15 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2011-03-19 17:15:15 -0700 |
| commit | 08f214deb957944b4354870d4a8969e68e500055 (patch) | |
| tree | d285887334703927750bf78254ca051c4630f788 | |
| parent | 1d4881adf73db6f66f6df366e4676e0d9f23919a (diff) | |
| download | openembedded-08f214deb957944b4354870d4a8969e68e500055.tar.gz | |
autoconf213: Fix build failure due to missing Makefile.am
We share autoconf.inc between autoconf 2.13 and 2.6x
and 2.13 does not have Makefile.am so we make it conditional
We define do_configure to just run configure
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | recipes/autoconf/autoconf.inc | 11 | ||||
| -rw-r--r-- | recipes/autoconf/autoconf213_2.13.bb | 6 |
2 files changed, 13 insertions, 4 deletions
diff --git a/recipes/autoconf/autoconf.inc b/recipes/autoconf/autoconf.inc index 7f22c2b0ec..40d9413ce1 100644 --- a/recipes/autoconf/autoconf.inc +++ b/recipes/autoconf/autoconf.inc @@ -25,13 +25,18 @@ do_configure_prepend () { export ac_cv_path_M4="${ac_cv_path_M4=${bindir}/m4}" export ac_cv_prog_gnu_m4="${ac_cv_prog_gnu_m4=yes}" fi - - sed -i -e's,^SUBDIRS = .*,SUBDIRS = ${SUBDIRS},' ${S}/Makefile.am + if [ -e ${S}/Makefile.am ] + then + sed -i -e's,^SUBDIRS = .*,SUBDIRS = ${SUBDIRS},' ${S}/Makefile.am + fi } do_configure_append() { # replace paths to STAGING_BINDIR_NATIVE/perl with ${bindir}/perl - sed -i -e "1s:#!.*:#! /usr/bin/env perl:" ${S}/bin/*.in + if [ -e ${S}/bin ] + then + sed -i -e "1s:#!.*:#! /usr/bin/env perl:" ${S}/bin/*.in + fi } PARALLEL_MAKE = "" diff --git a/recipes/autoconf/autoconf213_2.13.bb b/recipes/autoconf/autoconf213_2.13.bb index cd550739be..089f5a5733 100644 --- a/recipes/autoconf/autoconf213_2.13.bb +++ b/recipes/autoconf/autoconf213_2.13.bb @@ -3,7 +3,11 @@ LICENSE = "GPLv2+" SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.gz" EXTRA_OECONF = "--program-transform-name=s/\$/2.13/" EXTRA_OEMAKE = 'acdatadir="${datadir}/autoconf-${PV}" infodir="${datadir}/autoconf-${PV}/info"' -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" S = "${WORKDIR}/autoconf-${PV}" SRC_URI[md5sum] = "9de56d4a161a723228220b0f425dc711" SRC_URI[sha256sum] = "f0611136bee505811e9ca11ca7ac188ef5323a8e2ef19cffd3edb3cf08fd791e" + +do_configure (){ + oe_runconf +} |