diff options
| author | Ross Burton <ross.burton@intel.com> | 2017-11-30 12:47:12 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-12-10 22:41:40 +0000 |
| commit | 28b7ff06d685873aee54b6c27caab3e9518c004a (patch) | |
| tree | 8cbb22971320d096b47bf3943951e6e4d8e8be0a | |
| parent | 0582396081b638811174f9371feacbbf4593bd1a (diff) | |
| download | openembedded-core-28b7ff06d685873aee54b6c27caab3e9518c004a.tar.gz openembedded-core-28b7ff06d685873aee54b6c27caab3e9518c004a.tar.bz2 openembedded-core-28b7ff06d685873aee54b6c27caab3e9518c004a.zip | |
gperf: merge inc into bb
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/recipes-extended/gperf/gperf.inc | 22 | ||||
| -rw-r--r-- | meta/recipes-extended/gperf/gperf_3.1.bb | 23 |
2 files changed, 21 insertions, 24 deletions
diff --git a/meta/recipes-extended/gperf/gperf.inc b/meta/recipes-extended/gperf/gperf.inc deleted file mode 100644 index a8ce230f65..0000000000 --- a/meta/recipes-extended/gperf/gperf.inc +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "GNU gperf is a perfect hash function generator" -HOMEPAGE = "http://www.gnu.org/software/gperf" -SUMMARY = "Generate a perfect hash function from a set of keywords" -LICENSE = "GPLv3+" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://src/main.cc;beginline=8;endline=19;md5=dec8f611845d047387ed56b5b85fa99b" - -SRC_URI = "${GNU_MIRROR}/gperf/gperf-${PV}.tar.gz" - -inherit autotools - -# autoreconf couldn't find acinclude.m4 when stepping into subdirectory. Instead of -# duplicating acinclude.m4 in every subdirectory, use absolute include path to aclocal -EXTRA_AUTORECONF += " -I ${S}" - -do_configure_prepend() { - if [ ! -e ${S}/acinclude.m4 ]; then - cat ${S}/aclocal.m4 > ${S}/acinclude.m4 - fi -} - -BBCLASSEXTEND = "native" diff --git a/meta/recipes-extended/gperf/gperf_3.1.bb b/meta/recipes-extended/gperf/gperf_3.1.bb index 942820b91d..c680ee183c 100644 --- a/meta/recipes-extended/gperf/gperf_3.1.bb +++ b/meta/recipes-extended/gperf/gperf_3.1.bb @@ -1,5 +1,24 @@ -require gperf.inc - +DESCRIPTION = "GNU gperf is a perfect hash function generator" +HOMEPAGE = "http://www.gnu.org/software/gperf" +SUMMARY = "Generate a perfect hash function from a set of keywords" +LICENSE = "GPLv3+" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://src/main.cc;beginline=8;endline=19;md5=dec8f611845d047387ed56b5b85fa99b" +SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz" SRC_URI[md5sum] = "9e251c0a618ad0824b51117d5d9db87e" SRC_URI[sha256sum] = "588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2" + +inherit autotools + +# autoreconf couldn't find acinclude.m4 when stepping into subdirectory. Instead of +# duplicating acinclude.m4 in every subdirectory, use absolute include path to aclocal +EXTRA_AUTORECONF += " -I ${S}" + +do_configure_prepend() { + if [ ! -e ${S}/acinclude.m4 ]; then + cat ${S}/aclocal.m4 > ${S}/acinclude.m4 + fi +} + +BBCLASSEXTEND = "native" |