[oe-commits] org.oe.dev fis: Make one shared and one static version, split into two packages

[nail commit]

fis: Make one shared and one static version, split into two packages

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

#
# mt diff -r9b860048ee37af02f834a987bb9fb64ca90d2374 -r6a7bea85d9b5a30b073af0b51caffbeab9374833
#
# 
# 
# patch "packages/fis/fis_1.0.bb"
#  from [73db9e8997167110894ae77ed780dcf3efafceae]
#    to [67c8335c0bf1610da0ec6f154f56f225311c64b8]
# 
============================================================
--- packages/fis/fis_1.0.bb	73db9e8997167110894ae77ed780dcf3efafceae
+++ packages/fis/fis_1.0.bb	67c8335c0bf1610da0ec6f154f56f225311c64b8
@@ -1,13 +1,34 @@ DESCRIPTION = "Tool to edit the Redboot 
 DESCRIPTION = "Tool to edit the Redboot FIS partition layout from userspace"
+PR = "r1"
 
 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
-#	${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
-#	${STRIP} ${WORKDIR}/fis-${PV}/fis-static
+
+	install -d ${D}/${sbindir}
+	install -m 755 ${WORKDIR}/fis-${PV}/fis-static ${D}/${sbindir}
+	install -m 755 ${WORKDIR}/fis-${PV}/fis ${D}/${sbindir}
 }