uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead

https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948
this can do it nicely.

Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
Anton Arapov 2021-04-03 12:58:10 +02:00 committed by Alan Daniels
commit 56de2bcd43
30691 changed files with 3076956 additions and 0 deletions

View file

@ -0,0 +1,13 @@
--- a/tinyxml.pc 1970-01-01 01:00:00.000000000 +0100
+++ b/tinyxml.pc 2012-12-29 08:52:07.512266072 +0100
@@ -0,0 +1,10 @@
+prefix=@out@
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: TinyXML
+Description: A simple, small, C++ XML parser
+Version: @version@
+Libs: -L${libdir} -ltinyxml
+Cflags: -I${includedir}

View file

@ -0,0 +1,17 @@
diff -u a/Makefile b/Makefile
--- a/Makefile 2011-05-14 22:24:57.000000000 -0400
+++ b/Makefile 2016-04-01 14:53:05.000000000 -0400
@@ -19,9 +19,9 @@
#****************************************************************************
-CC := gcc
-CXX := g++
-LD := g++
+CC ?= gcc
+CXX ?= g++
+LD ?= g++
AR := ar rc
RANLIB := ranlib
Common subdirectories: a/docs and b/docs

View file

@ -0,0 +1,64 @@
? entity.patch
Index: a/tinyxml.cpp
===================================================================
RCS file: b/tinyxml.cpp,v
retrieving revision 1.105
diff -u -r1.105 a/tinyxml.cpp
--- tinyxml.cpp 5 Jun 2010 19:06:57 -0000 1.105
+++ tinyxml.cpp 19 Jul 2010 21:24:16 -0000
@@ -57,30 +57,7 @@
{
unsigned char c = (unsigned char) str[i];
- if ( c == '&'
- && i < ( (int)str.length() - 2 )
- && str[i+1] == '#'
- && str[i+2] == 'x' )
- {
- // Hexadecimal character reference.
- // Pass through unchanged.
- // &#xA9; -- copyright symbol, for example.
- //
- // The -1 is a bug fix from Rob Laveaux. It keeps
- // an overflow from happening if there is no ';'.
- // There are actually 2 ways to exit this loop -
- // while fails (error case) and break (semicolon found).
- // However, there is no mechanism (currently) for
- // this function to return an error.
- while ( i<(int)str.length()-1 )
- {
- outString->append( str.c_str() + i, 1 );
- ++i;
- if ( str[i] == ';' )
- break;
- }
- }
- else if ( c == '&' )
+ if ( c == '&' )
{
outString->append( entity[0].str, entity[0].strLength );
++i;
Index: a/xmltest.cpp
===================================================================
RCS file: b/xmltest.cpp,v
retrieving revision 1.89
diff -u -r1.89 a/xmltest.cpp
--- xmltest.cpp 5 Jun 2010 17:41:52 -0000 1.89
+++ xmltest.cpp 19 Jul 2010 21:24:16 -0000
@@ -1340,6 +1340,16 @@
}*/
}
+ #ifdef TIXML_USE_STL
+ {
+ TiXmlDocument xml;
+ xml.Parse("<foo>foo&amp;#xa+bar</foo>");
+ std::string str;
+ str << xml;
+ XmlTest( "Entity escaping", "<foo>foo&amp;#xa+bar</foo>", str.c_str() );
+ }
+ #endif
+
/* 1417717 experiment
{
TiXmlDocument xml;

View file

@ -0,0 +1,80 @@
{ lib, stdenv, fetchurl, unzip }:
let
version = "2.6.2";
SHLIB_EXT = stdenv.hostPlatform.extensions.sharedLibrary;
in stdenv.mkDerivation {
pname = "tinyxml";
inherit version;
src = fetchurl {
url = "mirror://sourceforge/project/tinyxml/tinyxml/${version}/tinyxml_2_6_2.zip";
sha256 = "04nmw6im2d1xp12yir8va93xns5iz816pwi25n9cql3g3i8bjsxc";
};
patches = [
# add pkg-config file
./2.6.2-add-pkgconfig.patch
# https://sourceforge.net/tracker/index.php?func=detail&aid=3031828&group_id=13559&atid=313559
./2.6.2-entity.patch
# Use CC, CXX, and LD from environment
./2.6.2-cxx.patch
];
preConfigure = "export LD=${stdenv.cc.targetPrefix}c++";
hardeningDisable = [ "format" ];
NIX_CFLAGS_COMPILE =
lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.9";
nativeBuildInputs = [ unzip ];
buildPhase = ''
# use STL (xbmc requires it)
sed '1i#define TIXML_USE_STL 1' -i tinyxml.h
sed '1i#define TIXML_USE_STL 1' -i xmltest.cpp
# build xmltest
make
# build the lib as a shared library
''${CXX} -Wall -O2 -shared -fpic tinyxml.cpp \
tinyxmlerror.cpp tinyxmlparser.cpp \
tinystr.cpp -o libtinyxml${SHLIB_EXT}
'';
doCheck = true;
checkPhase = ''
./xmltest
result=$?
if [[ $result != 0 ]] ; then
exit $result
fi
'';
installPhase = ''
mkdir -pv $out/include/
mkdir -pv $out/lib/pkgconfig/
mkdir -pv $out/share/doc/tinyxml/
cp -v libtinyxml${SHLIB_EXT} $out/lib/
cp -v *.h $out/include/
substituteInPlace tinyxml.pc --replace "@out@" "$out"
substituteInPlace tinyxml.pc --replace "@version@" "${version}"
cp -v tinyxml.pc $out/lib/pkgconfig/
cp -v docs/* $out/share/doc/tinyxml/
'' + lib.optionalString stdenv.isDarwin ''
install_name_tool -id $out/lib/libtinyxml.dylib $out/lib/libtinyxml.dylib
'';
meta = {
description = "Simple, small, C++ XML parser that can be easily integrating into other programs";
homepage = "http://www.grinninglizard.com/tinyxml/index.html";
license = lib.licenses.free;
platforms = lib.platforms.unix;
};
}