[oe-commits] org.oe.dev fis: Remove fis-static, update shared fis

[nail commit]

fis: Remove fis-static, update shared fis

Author: nail at nslu2-linux.org
Branch: org.openembedded.dev
Revision: ee278dc3761030c4580d14178796befa85c10dcb
ViewMTN: http://monotone.openembedded.org/revision.psp?id=ee278dc3761030c4580d14178796befa85c10dcb
Files:
1
packages/fis/fis_1.0.bb
Diffs:

#
# mt diff -rbf66034d46ac24a7fe9e632720d5a9fab9e34fbf -ree278dc3761030c4580d14178796befa85c10dcb
#
# 
# 
# patch "packages/fis/fis_1.0.bb"
#  from [0e7372425f5c86462a4423d89bd1fefbb00504bc]
#    to [b59314029a5865481afeb4bbedee2d2a729803f1]
# 
============================================================
--- packages/fis/fis_1.0.bb	0e7372425f5c86462a4423d89bd1fefbb00504bc
+++ packages/fis/fis_1.0.bb	b59314029a5865481afeb4bbedee2d2a729803f1
@@ -5,31 +5,14 @@ SRC_URI = "http://svn.chezphil.org/utils
 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}
 }