[oe-commits] org.oe.dev merge of '574f948e2e34c92b8569814f4622a4be67664b8b'

[koen commit]

merge of '574f948e2e34c92b8569814f4622a4be67664b8b'
     and 'e10b25001ecd4fdb4051e6efb417dacc1dd2b985'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 1e0c7e9af08cc3d33b61608f1780d80214f1c51a
ViewMTN: http://monotone.openembedded.org/revision/info/1e0c7e9af08cc3d33b61608f1780d80214f1c51a
Files:
1
packages/guile/guile_1.8.5.bb
packages/images/fso-image.bb
Diffs:

#
# mt diff -r574f948e2e34c92b8569814f4622a4be67664b8b -r1e0c7e9af08cc3d33b61608f1780d80214f1c51a
#
#
#
# add_file "packages/guile/guile_1.8.5.bb"
#  content [c0a78b97b73fb09255824c0c15c37be62f7235d7]
#
============================================================
--- packages/guile/guile_1.8.5.bb	c0a78b97b73fb09255824c0c15c37be62f7235d7
+++ packages/guile/guile_1.8.5.bb	c0a78b97b73fb09255824c0c15c37be62f7235d7
@@ -0,0 +1,32 @@
+DESCRIPTION = "Guile is an interpreter for the Scheme programming language, \
+packaged as a library which can be incorporated into your programs."
+HOMEPAGE = "http://www.gnu.org/software/guile/guile.html"
+SECTION = "devel/scheme"
+DEPENDS = "guile-native"
+LICENSE = "GPL"
+
+SRC_URI = "http://ftp.gnu.org/pub/gnu/guile/guile-${PV}.tar.gz \
+           file://configure-fix.patch;patch=1 "
+
+inherit autotools
+
+acpaths = "-I ${S}/guile-config"
+
+EXTRA_OECONF = " \
+		--without-threads \
+		--without-included-ltdl \
+               "		
+
+do_compile() {
+	(cd libguile; oe_runmake CC="${BUILD_CC}" CFLAGS="${BUILD_CFLAGS}" LDFLAGS="${BUILD_LDFLAGS}" guile_filter_doc_snarfage)
+	oe_runmake preinstguile="`which guile`"
+        
+        sed -i -e s:${STAGING_DIR_TARGET}::g \
+               -e s:/${TARGET_SYS}::g \
+                  guile-1.8.pc
+}
+
+do_stage() {
+	autotools_stage_all
+}
+


#
# mt diff -re10b25001ecd4fdb4051e6efb417dacc1dd2b985 -r1e0c7e9af08cc3d33b61608f1780d80214f1c51a
#
#
#
# patch "packages/images/fso-image.bb"
#  from [b99075ca5c8d2c0969bc4bce5dfb6ef65323fc46]
#    to [c1ef8880079b495bdb218a51113abbbd36449724]
#
============================================================
--- packages/images/fso-image.bb	b99075ca5c8d2c0969bc4bce5dfb6ef65323fc46
+++ packages/images/fso-image.bb	c1ef8880079b495bdb218a51113abbbd36449724
@@ -57,6 +57,7 @@ AUDIO_INSTALL = "\
   alsa-oss \
   alsa-state \
   alsa-utils-aplay \
+  alsa-utils-amixer \
   gst-meta-audio \
   gst-plugin-mad \
   gst-plugin-modplug \