NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/norm: bump to version 1.5.8

Browse Source 
- Drop first and third patches (already in version)
- Add hash for license file

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Fabrice Fontaine 2019-05-21 22:38:16 +02:00 committed by Peter Korsgaard
parent 527e8ca4b6
commit e0dae84942
5 changed files with 4 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
package/norm/0001-fix-bigendian-build.patch
View File

@ -1,17 +0,0 @@
Fix big-endian build breakage in protolib.
Patch status: submitted to author via email.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
diff -Nura norm-1.5r6.orig/protolib/include/protoSpace.h norm-1.5r6/protolib/include/protoSpace.h
--- norm-1.5r6.orig/protolib/include/protoSpace.h 2016-03-08 19:48:21.326357963 -0300
+++ norm-1.5r6/protolib/include/protoSpace.h 2016-03-08 19:48:46.647234075 -0300
@@ -89,7 +89,7 @@
}
#else
ProtoTree::Endian GetEndian() const
- return ProtoTree::ENDIAN_BIG;
+ {return ProtoTree::ENDIAN_BIG;}
void SetNode(Node* theNode)
{memcpy(key+sizeof(double), &theNode, sizeof(Node*));}
Node* GetNode() const

0
package/norm/0002-protolib-drop-linux-version-check.patch → package/norm/0001-protolib-drop-linux-version-check.patch
View File

46
package/norm/0003-fix-const-qualifier-gcc7.patch
View File

@ -1,46 +0,0 @@
protolib: remove const qualifiers in ProtoSortedTreeTemplate
The methods PeekPrevItem() and PeekNextItem() in
ProtoSortedTreeTemplate were using a const qualifier, but not the
corresponding methods in ProtoSortedTree, causing a build failure with
gcc 7.x:
norm-1.5r6/protolib/include/protoTree.h: In member function 'ITEM_TYPE* ProtoSortedTreeTemplate<ITEM_TYPE>::Iterator::PeekPrevItem() const':
norm-1.5r6/protolib/include/protoTree.h:652:93: error: no matching function for call to 'ProtoSortedTreeTemplate<ITEM_TYPE>::Iterator::PeekPrevItem() const'
{return static_cast<ITEM_TYPE*>(ProtoSortedTree::Iterator::PeekPrevItem());}
^
norm-1.5r6/protolib/include/protoTree.h:565:23: note: candidate: ProtoSortedTree::Item* ProtoSortedTree::Iterator::PeekPrevItem() <near match>
Item* PeekPrevItem()
^~~~~~~~~~~~
Since the same methods in ProtoTreeTemplate don't have the const
qualifier, we take the simple solution of dropping such qualifiers
from ProtoSortedTreeTemplate as well, which fixes the build of norm
with gcc 7.x.
Many thanks to Romain Naour <romain.naour@gmail.com> for pointing out
the solution.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
[Patch has been submitted upstream and accepted, but mailing list
archive not updated.]
Index: b/protolib/include/protoTree.h
===================================================================
--- a/protolib/include/protoTree.h
+++ b/protolib/include/protoTree.h
@@ -648,12 +648,12 @@
ITEM_TYPE* GetPrevItem()
{return static_cast<ITEM_TYPE*>(ProtoSortedTree::Iterator::GetPrevItem());}
- ITEM_TYPE* PeekPrevItem() const
+ ITEM_TYPE* PeekPrevItem()
{return static_cast<ITEM_TYPE*>(ProtoSortedTree::Iterator::PeekPrevItem());}
ITEM_TYPE* GetNextItem()
{return static_cast<ITEM_TYPE*>(ProtoSortedTree::Iterator::GetNextItem());}
- ITEM_TYPE* PeekNextItem() const
+ ITEM_TYPE* PeekNextItem()
{return static_cast<ITEM_TYPE*>(ProtoSortedTree::Iterator::PeekNextItem());}
}; // end class ProtoSortedTreeTemplate::Iterator

3
package/norm/norm.hash
View File

@ -1,2 +1,3 @@
# Locally calculated
sha256 20ea2e8dd5d5e1ff1ff91dc7dab6db53a77d7b7183d8cf2425c215fd294f22a7 src-norm-1.5r6.tgz
sha256 4480a6ea53fb7ce45b4bc2061d18fbfd46ee9990fc2ed9a9dc303ce4d87888a6 src-norm-1.5.8.tgz
sha256 ba4b7e49b0163d6839830e3f47505696c6eaac77ccd93531831dc837b2160608 LICENSE.TXT

4
package/norm/norm.mk
View File

@ -4,8 +4,8 @@
#
################################################################################
NORM_VERSION = 1.5r6
NORM_SITE = http://downloads.pf.itd.nrl.navy.mil/norm/archive
NORM_VERSION = 1.5.8
NORM_SITE = http://downloads.pf.itd.nrl.navy.mil/norm
NORM_SOURCE = src-norm-$(NORM_VERSION).tgz
NORM_INSTALL_STAGING = YES
NORM_LICENSE = NRL License