From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Fri, 16 Mar 2007 23:38:56 +0000 (+0000)
Subject: fis: Remove fis-static, update shared fis
X-Git-Tag: Release-2010-05/1~8868^2~1086^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ab4ab90bbb405a076f6cfa04161a6d9a27900ef;p=openembedded.git

fis: Remove fis-static, update shared fis
---

diff --git a/packages/fis/fis_1.0.bb b/packages/fis/fis_1.0.bb
index 09bfa90a36..ea4c0af6c8 100644
--- a/packages/fis/fis_1.0.bb
+++ b/packages/fis/fis_1.0.bb
@@ -5,31 +5,14 @@ DEPENDS = "boost"
 SRC_URI = "http://svn.chezphil.org/utils/trunk/fis.cc \
 	   svn://svn.chezphil.org/;module=libpbe;proto=http"
 
-PACKAGES =+ "fis-static"
-FILES_${PN}-static = "${sbindir}/fis-static"
-FILES_${PN} = "${sbindir}/fis"
-
 do_compile() {
 	${CXX} -Os -W -I${STAGING_INCDIR} -I${WORKDIR}/libpbe/trunk/include -o fis ${WORKDIR}/fis.cc \
 	${WORKDIR}/libpbe/trunk/src/Exception.cc ${WORKDIR}/libpbe/trunk/src/utils.cc
-
-	# Work around boost threading issue when compiling static
-	# We're singlethreading anyway
-
-	echo "#define BOOST_SP_DISABLE_THREADS" > ${WORKDIR}/tmpfile
-	cat ${WORKDIR}/tmpfile ${WORKDIR}/fis.cc > ${WORKDIR}/fis.new
-	mv ${WORKDIR}/fis.new ${WORKDIR}/fis.cc
-	rm ${WORKDIR}/tmpfile
-
-	${CXX} -Os -W -static -I${STAGING_INCDIR} -I${WORKDIR}/libpbe/trunk/include -o fis-static ${WORKDIR}/fis.cc \
-	${WORKDIR}/libpbe/trunk/src/Exception.cc ${WORKDIR}/libpbe/trunk/src/utils.cc
 }
 
 do_install() {
-	${STRIP} ${WORKDIR}/fis-${PV}/fis-static
 	${STRIP} ${WORKDIR}/fis-${PV}/fis
 
 	install -d ${D}/${sbindir}
-	install -m 755 ${WORKDIR}/fis-${PV}/fis-static ${D}/${sbindir}
 	install -m 755 ${WORKDIR}/fis-${PV}/fis ${D}/${sbindir}
 }