oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Use perl module JSON:PP, part of core, instead of JSON package

Browse Source 
This patch removes the need for an external package.

Ported from
https://github.com/openwrt/packages/blob/master/net/samba4/patches/105-perl-json-pp.patch
402f4ba4ef (diff-208d4e0345c9d29fbec23d6f655ba794afd3052f5cb8dd73944db72ce81b847b)

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
This commit is contained in:
Andrew Sim
2023-06-10 09:00:24 +02:00
committed by Nico Williams
parent 2a38fa17b5
commit f62e2f2784
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cf/make-proto.pl
View File

@@ -4,7 +4,7 @@
use Getopt::Std; use Getopt::Std;
use File::Compare; use File::Compare;
use JSON; use JSON::PP
my $comment = 0; my $comment = 0;
my $doxygen = 0; my $doxygen = 0;
@@ -70,7 +70,7 @@ if($opt_x) {
my $EXP; my $EXP;
local $/; local $/;
open(EXP, '<', $opt_x) || die "open ${opt_x}"; open(EXP, '<', $opt_x) || die "open ${opt_x}";
my $obj = JSON->new->utf8->decode(<EXP>); my $obj = JSON::PP->new->utf8->decode(<EXP>);
close $EXP; close $EXP;
foreach my $x (keys %$obj) { foreach my $x (keys %$obj) {

1
configure.ac
View File

@@ -56,7 +56,6 @@ if ! test -f "$srcdir/lib/asn1/der-protos.h" ||
AC_KRB_PROG_PERL AC_KRB_PROG_PERL
AC_KRB_PERL_MOD(Getopt::Std) AC_KRB_PERL_MOD(Getopt::Std)
AC_KRB_PERL_MOD(File::Compare) AC_KRB_PERL_MOD(File::Compare)
AC_KRB_PERL_MOD(JSON)
fi fi
AC_KRB_PROG_YACC AC_KRB_PROG_YACC