From 88320ffdf3926d7638b6f3fb0b9e9eebd7fe226c Mon Sep 17 00:00:00 2001 From: John Bowler Date: Fri, 15 Jul 2005 06:23:53 +0000 Subject: mpd does not build on osuclibc because libvorbis will not build, that happens because it attempts a static link with the -lm library in the wrong place. monotone split into two versions, one for the netsync-4 versions (up to and including 0.19) one for netsync-5 versions. Both may be installed on one NSLU2, allowing the system to handle both <=0.19 and >=0.20 servers. --- packages/monotone/monotone-4_0.19.bb | 52 ++++++++++++++++++++++++++++++++++++ packages/monotone/monotone-5_0.20.bb | 51 +++++++++++++++++++++++++++++++++++ packages/monotone/monotone_0.19.bb | 41 ---------------------------- packages/monotone/monotone_0.20.bb | 50 ---------------------------------- 4 files changed, 103 insertions(+), 91 deletions(-) create mode 100644 packages/monotone/monotone-4_0.19.bb create mode 100644 packages/monotone/monotone-5_0.20.bb delete mode 100644 packages/monotone/monotone_0.19.bb delete mode 100644 packages/monotone/monotone_0.20.bb (limited to 'packages/monotone') diff --git a/packages/monotone/monotone-4_0.19.bb b/packages/monotone/monotone-4_0.19.bb new file mode 100644 index 0000000000..b90f0eacb9 --- /dev/null +++ b/packages/monotone/monotone-4_0.19.bb @@ -0,0 +1,52 @@ +# This package builds the devio program +DESCRIPTION = "monotone - an SCM" +HOMEPAGE = "http://www.venge.net/" +MAINTAINER = "John Bowler " +SECTION = "devel" +PRIORITY = "optional" +LICENSE = "MIT" +SUBV = "1" +PR = "r0" + +SRC_URI = "http://www.venge.net/monotone/downloads/monotone_${PV}-${SUBV}.tar.gz \ + file://txt2c-cross.patch;patch=1 \ + file://cryptopp-endianness.patch;patch=1" +DEPENDS += "boost" +# Following may be required, not proved yet... +#TARGET_CFLAGS += "-fno-strict-aliasing" + +PACKAGES = "${PN} ${PN}-doc ${PN}-testsuite" +tsd = "/home/monotone/${PN}" +FILES_${PN}-testsuite = "${tsd}/testsuite ${tsd}/tests" +RDEPENDS_${PN}-testsuite += "bash sed grep cvs" +# The testsuite also requires the following - not yet available... +#RDEPENDS_${PN}-testsuite += "patch perl" + +S = "${WORKDIR}/monotone-${PV}" + +# no cross compile support - it tries to run the test program even with +# --enable_ipv6=yes +EXTRA_OECONF = "--disable-ipv6 \ + --disable-dependency-tracking \ + --disable-rpath \ + --disable-nls \ + --with-gnu-ld \ + " + +inherit autotools update-alternatives + +ALTERNATIVE_NAME = "monotone" +ALTERNATIVE_LINK = "${bindir}/monotone" +ALTERNATIVE_PATH = "${bindir}/${PN}" +ALTERNATIVE_PRIORITY = "40" + + +# This makes the testsuite as a package and renames the monotone executable +# to include the netsync suffix. +do_install_append() { + install -d ${D}${tsd} + install -c -m 755 testsuite ${D}${tsd}/testsuite + cp -a tests ${D}${tsd}/tests + # + mv ${D}${bindir}/monotone ${D}${bindir}/${PN} +} diff --git a/packages/monotone/monotone-5_0.20.bb b/packages/monotone/monotone-5_0.20.bb new file mode 100644 index 0000000000..ec98ec26d2 --- /dev/null +++ b/packages/monotone/monotone-5_0.20.bb @@ -0,0 +1,51 @@ +# This package builds the devio program +DESCRIPTION = "monotone - an SCM" +HOMEPAGE = "http://www.venge.net/" +MAINTAINER = "John Bowler " +SECTION = "devel" +PRIORITY = "optional" +LICENSE = "MIT" +PR = "r0" + +SRC_URI = "http://venge.net/monotone/downloads/monotone-${PV}.tar.gz \ + file://txt2c-cross.patch;patch=1 \ + file://cryptopp-endianness.patch;patch=1" +DEPENDS += "boost" +# Following may be required, not proved yet... +#TARGET_CFLAGS += "-fno-strict-aliasing" + +PACKAGES = "${PN} ${PN}-doc ${PN}-testsuite" +tsd = "/home/monotone/${PN}" +FILES_${PN}-testsuite = "${tsd}/testsuite ${tsd}/tests" +RDEPENDS_${PN}-testsuite += "bash sed grep cvs" +# The testsuite also requires the following - not yet available... +#RDEPENDS_${PN}-testsuite += "patch perl" + +S = "${WORKDIR}/monotone-${PV}" + +# no cross compile support - it tries to run the test program even with +# --enable_ipv6=yes +EXTRA_OECONF = "--disable-ipv6 \ + --disable-dependency-tracking \ + --disable-rpath \ + --disable-nls \ + --with-gnu-ld \ + " + +inherit autotools update-alternatives + +ALTERNATIVE_NAME = "monotone" +ALTERNATIVE_LINK = "${bindir}/monotone" +ALTERNATIVE_PATH = "${bindir}/${PN}" +ALTERNATIVE_PRIORITY = "50" + + +# This makes the testsuite as a package and renames the monotone executable +# to include the netsync suffix. +do_install_append() { + install -d ${D}${tsd} + install -c -m 755 testsuite ${D}${tsd}/testsuite + cp -a tests ${D}${tsd}/tests + # + mv ${D}${bindir}/monotone ${D}${bindir}/${PN} +} diff --git a/packages/monotone/monotone_0.19.bb b/packages/monotone/monotone_0.19.bb deleted file mode 100644 index 276bed4b6f..0000000000 --- a/packages/monotone/monotone_0.19.bb +++ /dev/null @@ -1,41 +0,0 @@ -# This package builds the devio program -DESCRIPTION = "monotone - an SCM" -HOMEPAGE = "http://www.venge.net/" -MAINTAINER = "John Bowler " -SECTION = "devel" -PRIORITY = "optional" -LICENSE = "MIT" -SUBV = "1" -PR = "r2" - -SRC_URI = "http://www.venge.net/monotone/downloads/monotone_${PV}-${SUBV}.tar.gz \ - file://txt2c-cross.patch;patch=1 \ - file://cryptopp-endianness.patch;patch=1" -DEPENDS += "boost" -# Following may be required, not proved yet... -#TARGET_CFLAGS += "-fno-strict-aliasing" - -PACKAGES = "${PN} ${PN}-doc ${PN}-testsuite" -tsd = "/home/monotone" -FILES_${PN}-testsuite = "${tsd}/testsuite ${tsd}/tests" -RDEPENDS_${PN}-testsuite += "bash sed grep cvs" -# The testsuite also requires the following - not yet available... -#RDEPENDS_${PN}-testsuite += "patch perl" - -# no cross compile support - it tries to run the test program even with -# --enable_ipv6=yes -EXTRA_OECONF = "--disable-ipv6 \ - --disable-dependency-tracking \ - --disable-rpath \ - --disable-nls \ - --with-gnu-ld \ - " - -inherit autotools - -# This makes the testsuite as a package -do_install_append() { - install -d ${D}${tsd} - install -c -m 755 testsuite ${D}${tsd}/testsuite - cp -a tests ${D}${tsd}/tests -} diff --git a/packages/monotone/monotone_0.20.bb b/packages/monotone/monotone_0.20.bb deleted file mode 100644 index 05c59ba5ca..0000000000 --- a/packages/monotone/monotone_0.20.bb +++ /dev/null @@ -1,50 +0,0 @@ -# This package builds the devio program -DESCRIPTION = "monotone - an SCM" -HOMEPAGE = "http://www.venge.net/" -MAINTAINER = "John Bowler " -SECTION = "devel" -PRIORITY = "optional" -LICENSE = "MIT" -PR = "r1" - -#WARNING: monotone-0.20 uses a new netsync protocol, at present the -# OpenEmbedded monotone archives use monotone-0.19 as the server, -# therefore OE builds of 0.20 are disabled here. The protocol version -# is checked, 0.19 has version 4, 0.20 has version 5, it is not -# possible to pull using 0.20 from a 0.19 server. -# The 0.20 and 0.19 databases (the files) are compatible, so it is -# possible to use 0.20 then swap back to 0.19 for netsync with the -# older server. -DEFAULT_PREFERENCE = "-1" - -SRC_URI = "http://venge.net/monotone/downloads/monotone-${PV}.tar.gz \ - file://txt2c-cross.patch;patch=1 \ - file://cryptopp-endianness.patch;patch=1" -DEPENDS += "boost" -# Following may be required, not proved yet... -#TARGET_CFLAGS += "-fno-strict-aliasing" - -PACKAGES = "${PN} ${PN}-doc ${PN}-testsuite" -tsd = "/home/monotone" -FILES_${PN}-testsuite = "${tsd}/testsuite ${tsd}/tests" -RDEPENDS_${PN}-testsuite += "bash sed grep cvs" -# The testsuite also requires the following - not yet available... -#RDEPENDS_${PN}-testsuite += "patch perl" - -# no cross compile support - it tries to run the test program even with -# --enable_ipv6=yes -EXTRA_OECONF = "--disable-ipv6 \ - --disable-dependency-tracking \ - --disable-rpath \ - --disable-nls \ - --with-gnu-ld \ - " - -inherit autotools - -# This makes the testsuite as a package -do_install_append() { - install -d ${D}${tsd} - install -c -m 755 testsuite ${D}${tsd}/testsuite - cp -a tests ${D}${tsd}/tests -} -- cgit v1.2.3