diff options
| author |   Andre McCurdy <armccurdy@gmail.com> | 2018-05-02 13:12:18 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-05-09 21:09:11 +0100 |
| commit | eb1eacefafcbf69e48f906234f5016ae18f0bdce (patch) | |
| tree | d345dc8f50e06b18e75ebc44e7982f46ddb39b82 /meta/recipes-multimedia | |
| parent | 38abd26fe7de321e0f1fc4895f754f34dee90f6c (diff) | |
| download | openembedded-core-eb1eacefafcbf69e48f906234f5016ae18f0bdce.tar.gz | |
alsa-lib: move contents of alsa-fpu.inc into alsa-lib recipe
Merge historical .inc file into the only recipe which uses it.
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-multimedia')
| -rw-r--r-- | meta/recipes-multimedia/alsa/alsa-fpu.inc | 4 | ||||
| -rw-r--r-- | meta/recipes-multimedia/alsa/alsa-lib_1.1.5.bb | 13 |
2 files changed, 7 insertions, 10 deletions
diff --git a/meta/recipes-multimedia/alsa/alsa-fpu.inc b/meta/recipes-multimedia/alsa/alsa-fpu.inc deleted file mode 100644 index 355a9dfcd1..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-fpu.inc +++ /dev/null @@ -1,4 +0,0 @@ -def get_alsa_fpu_setting(bb, d): - if d.getVar('TARGET_FPU') in [ 'soft' ]: - return "--with-softfloat" - return "" diff --git a/meta/recipes-multimedia/alsa/alsa-lib_1.1.5.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.1.5.bb index c5bf107e5e..fb6b4fb501 100644 --- a/meta/recipes-multimedia/alsa/alsa-lib_1.1.5.bb +++ b/meta/recipes-multimedia/alsa/alsa-lib_1.1.5.bb @@ -6,20 +6,19 @@ LICENSE = "LGPLv2.1 & GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 \ file://src/socket.c;beginline=1;endline=26;md5=11ff89a8a7a4a690a5c78effe8159545" -BBCLASSEXTEND = "native nativesdk" - SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/${BP}.tar.bz2" SRC_URI[md5sum] = "a2b465c3a5265d8a57f3ff39c6c4fc29" SRC_URI[sha256sum] = "f4f68ad3c6da36b0b5241ac3c798a7a71e0e97d51f972e9f723b3f20a9650ae6" inherit autotools pkgconfig -require alsa-fpu.inc -EXTRA_OECONF += "${@get_alsa_fpu_setting(bb, d)} " - -EXTRA_OECONF += "--disable-python" +EXTRA_OECONF += " \ + ${@bb.utils.contains('TARGET_FPU', 'soft', '--with-softfloat', '', d)} \ + --disable-python \ +" PACKAGES =+ "alsa-server libasound alsa-conf alsa-doc" + FILES_libasound = "${libdir}/libasound.so.*" FILES_alsa-server = "${bindir}/*" FILES_alsa-conf = "${datadir}/alsa/" @@ -38,3 +37,5 @@ RCONFLICTS_${PN}-dev = "alsa-dev" RPROVIDES_alsa-conf = "alsa-conf-base" RREPLACES_alsa-conf = "alsa-conf-base" RCONFLICTS_alsa-conf = "alsa-conf-base" + +BBCLASSEXTEND = "native nativesdk" |