mirror of
https://git.yoctoproject.org/poky
synced 2026-04-18 21:32:12 +02:00
opensp: upgrade to 1.5.2
Removed all patches, they've been integrated upstream. :) Added --disable-doc-build to prevent creation of docs, which otherwise fails with the following configure error: could not find xmlto; set XMLTO or consider --disable-doc-build Removed configure_prepend step that was deleting the m4/ directory, since some macros needed for the build are defined there, and I've not encountered any problems with keeping them there in my testing. (From OE-Core rev: cbd055917b04bf8fc640eee289e443230de139a2) Signed-off-by: Scott Garman <scott.a.garman@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Scott Garman
committed by
Richard Purdie
Richard Purdie
parent
e11c495886
commit
cc9b58e7a7
@@ -1,65 +0,0 @@
|
||||
Patch obtained from OpenEmbedded.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
|
||||
|
||||
--- OpenSP-1.5/include/Attribute.h~attributevalue 2000-03-09 13:30:56.000000000 -0500
|
||||
+++ OpenSP-1.5/include/Attribute.h 2004-01-20 14:11:36.000000000 -0500
|
||||
@@ -31,6 +31,28 @@
|
||||
class AttributeContext;
|
||||
class Syntax;
|
||||
|
||||
+class SP_API AttributeValue : public Resource {
|
||||
+public:
|
||||
+ enum Type {
|
||||
+ implied,
|
||||
+ cdata,
|
||||
+ tokenized
|
||||
+ };
|
||||
+ AttributeValue();
|
||||
+ virtual ~AttributeValue();
|
||||
+ virtual AttributeSemantics *makeSemantics(const DeclaredValue *,
|
||||
+ AttributeContext &,
|
||||
+ const StringC &,
|
||||
+ unsigned &,
|
||||
+ unsigned &) const;
|
||||
+ virtual Type info(const Text *&, const StringC *&) const = 0;
|
||||
+ virtual const Text *text() const;
|
||||
+ virtual Boolean recoverUnquoted(const StringC &, const Location &,
|
||||
+ AttributeContext &, const StringC &);
|
||||
+ static Boolean handleAsUnterminated(const Text &, AttributeContext &);
|
||||
+};
|
||||
+
|
||||
+
|
||||
class SP_API AttributeDefinitionDesc {
|
||||
public:
|
||||
AttributeDefinitionDesc() { }
|
||||
@@ -380,27 +402,6 @@
|
||||
ConstPtr<Notation> notation_;
|
||||
};
|
||||
|
||||
-class SP_API AttributeValue : public Resource {
|
||||
-public:
|
||||
- enum Type {
|
||||
- implied,
|
||||
- cdata,
|
||||
- tokenized
|
||||
- };
|
||||
- AttributeValue();
|
||||
- virtual ~AttributeValue();
|
||||
- virtual AttributeSemantics *makeSemantics(const DeclaredValue *,
|
||||
- AttributeContext &,
|
||||
- const StringC &,
|
||||
- unsigned &,
|
||||
- unsigned &) const;
|
||||
- virtual Type info(const Text *&, const StringC *&) const = 0;
|
||||
- virtual const Text *text() const;
|
||||
- virtual Boolean recoverUnquoted(const StringC &, const Location &,
|
||||
- AttributeContext &, const StringC &);
|
||||
- static Boolean handleAsUnterminated(const Text &, AttributeContext &);
|
||||
-};
|
||||
-
|
||||
class SP_API ImpliedAttributeValue : public AttributeValue {
|
||||
public:
|
||||
ImpliedAttributeValue();
|
||||
@@ -1,17 +0,0 @@
|
||||
Patch obtained from OpenEmbedded.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
|
||||
|
||||
Index: OpenSP-1.5/doc/Makefile.am
|
||||
===================================================================
|
||||
--- OpenSP-1.5.orig/doc/Makefile.am 2000-05-06 09:10:32.000000000 +1000
|
||||
+++ OpenSP-1.5/doc/Makefile.am 2007-06-02 12:46:50.000000000 +1000
|
||||
@@ -1,6 +1,5 @@
|
||||
## Process this file with automake to produce Makefile.in
|
||||
|
||||
-docdir = $(prefix)/doc
|
||||
pkgdocdir = $(docdir)/@PACKAGE@
|
||||
|
||||
MAINTAINERCLEANFILES = Makefile.in
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,18 +0,0 @@
|
||||
Patch obtained from OpenEmbedded.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
|
||||
|
||||
Index: OpenSP-1.5/include/RangeMap.cxx
|
||||
===================================================================
|
||||
--- OpenSP-1.5.orig/include/RangeMap.cxx 2000-02-26 03:55:21.000000000 +1100
|
||||
+++ OpenSP-1.5/include/RangeMap.cxx 2007-06-02 11:48:17.000000000 +1000
|
||||
@@ -7,6 +7,7 @@
|
||||
#include "RangeMap.h"
|
||||
#include "ISet.h"
|
||||
#include "types.h"
|
||||
+#include "constant.h"
|
||||
|
||||
#ifdef SP_NAMESPACE
|
||||
namespace SP_NAMESPACE {
|
||||
@@ -5,35 +5,29 @@ SECTION = "libs"
|
||||
LICENSE = "BSD"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=641ff1e4511f0a87044ad42f87cb1045"
|
||||
|
||||
PR = "r2"
|
||||
PR = "r0"
|
||||
|
||||
# At -Os it encounters calls to some inline functions which are then
|
||||
# not found in any other objects with gcc 4.5
|
||||
FULL_OPTIMIZATION += "-O2"
|
||||
|
||||
SRC_URI = "${SOURCEFORGE_MIRROR}/openjade/OpenSP-${PV}.tar.gz \
|
||||
file://m4.patch \
|
||||
file://attributevalue.patch \
|
||||
file://rangmap-fix.patch \
|
||||
file://fix-docdir.patch"
|
||||
SRC_URI = "${SOURCEFORGE_MIRROR}/openjade/OpenSP-${PV}.tar.gz"
|
||||
|
||||
SRC_URI[md5sum] = "87f56e79ae0c20397f4207d61d154303"
|
||||
SRC_URI[sha256sum] = "987eeb9460185950e066e5db3b5fa531e53e213742b545288405552a5a7bb704"
|
||||
SRC_URI[md5sum] = "670b223c5d12cee40c9137be86b6c39b"
|
||||
SRC_URI[sha256sum] = "57f4898498a368918b0d49c826aa434bb5b703d2c3b169beb348016ab25617ce"
|
||||
|
||||
S = "${WORKDIR}/OpenSP-${PV}"
|
||||
|
||||
inherit autotools gettext
|
||||
|
||||
EXTRA_OECONF = "--disable-doc-build"
|
||||
|
||||
EXTRA_OECONF_virtclass-native = "\
|
||||
--disable-doc-build \
|
||||
--enable-default-catalog=${sysconfdir}/sgml/catalog \
|
||||
--enable-default-search-path=${datadir}/sgml \
|
||||
"
|
||||
|
||||
do_configure_prepend () {
|
||||
# Stale m4 macros cause a variety of problems
|
||||
rm -rf ${S}/m4/*
|
||||
}
|
||||
|
||||
do_install_append() {
|
||||
# Set up symlinks to often-used alternate names. See
|
||||
# http://www.linuxfromscratch.org/blfs/view/stable/pst/opensp.html
|
||||
Reference in New Issue
Block a user