diff options
| author | jenkins4kodi <jenkins4kodi@users.noreply.github.com> | 2017-04-08 23:53:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-08 23:53:40 +0200 |
| commit | bb1cbcc3392ff6f1749f14212e0e0160f0288d5a (patch) | |
| tree | d4780fe4d86f4afd9753cd3c6031ba035b39a4a7 | |
| parent | 2b2c62955c962a184e4d437d49d1e2bfff9b9db6 (diff) | |
| parent | 561d894045a39fc93108547e36d51ff467a2e67a (diff) | |
Merge pull request #11945 from Rechi/sambaCompileFix
| -rw-r--r-- | tools/depends/target/samba-gplv3/Makefile | 3 | ||||
| -rw-r--r-- | tools/depends/target/samba-gplv3/perlArrayDefinedDeprecated.patch | 22 |
2 files changed, 24 insertions, 1 deletions
diff --git a/tools/depends/target/samba-gplv3/Makefile b/tools/depends/target/samba-gplv3/Makefile index 4af2c12e1b..b943518381 100644 --- a/tools/depends/target/samba-gplv3/Makefile +++ b/tools/depends/target/samba-gplv3/Makefile @@ -1,5 +1,5 @@ include ../../Makefile.include -DEPS= ../../Makefile.include Makefile configureEndian.patch samba_android.patch samba_off64_t.patch no_fork_and_exec.patch +DEPS= ../../Makefile.include Makefile configureEndian.patch perlArrayDefinedDeprecated.patch samba_android.patch samba_off64_t.patch no_fork_and_exec.patch # lib name, version LIBNAME=samba @@ -50,6 +50,7 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS) rm -rf $(PLATFORM); mkdir -p $(PLATFORM) cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) cd $(PLATFORM); patch -p0 -i ../configureEndian.patch + cd $(PLATFORM); patch -p1 -i ../perlArrayDefinedDeprecated.patch cd $(PLATFORM)/source3; ./autogen.sh ifeq ($(OS),android) cd $(PLATFORM); patch -p0 < ../samba_android.patch diff --git a/tools/depends/target/samba-gplv3/perlArrayDefinedDeprecated.patch b/tools/depends/target/samba-gplv3/perlArrayDefinedDeprecated.patch new file mode 100644 index 0000000000..cbff5249e2 --- /dev/null +++ b/tools/depends/target/samba-gplv3/perlArrayDefinedDeprecated.patch @@ -0,0 +1,22 @@ +--- a/pidl/lib/Parse/Pidl/ODL.pm ++++ b/pidl/lib/Parse/Pidl/ODL.pm +@@ -70,7 +70,7 @@ + next; + } + my $podl = Parse::Pidl::IDL::parse_file($idl_path, $opt_incdirs); +- if (defined(@$podl)) { ++ if (@$podl) { + require Parse::Pidl::Typelist; + my $basename = basename($idl_path, ".idl"); + +--- a/pidl/pidl ++++ b/pidl/pidl +@@ -604,7 +604,7 @@ + require Parse::Pidl::IDL; + + $pidl = Parse::Pidl::IDL::parse_file($idl_file, \@opt_incdirs); +- defined @$pidl || die "Failed to parse $idl_file"; ++ @$pidl || die "Failed to parse $idl_file"; + } + + require Parse::Pidl::Typelist; |