diff options
| author | Lukas Rusak <lorusak@gmail.com> | 2020-03-05 09:33:09 -0800 |
|---|---|---|
| committer | Lukas Rusak <lorusak@gmail.com> | 2020-03-05 09:33:32 -0800 |
| commit | 4181e251b7e63176181acc8bf6d7de031e1d94df (patch) | |
| tree | 14d4e80e0d381a0ac6f57d82710657731ed36e59 /tools/depends/target/libcdio-gplv3 | |
| parent | 4acc5fa99de6de40a51dd940f75061a7ee53de20 (diff) | |
[depends] libcdio-gplv3: add patch to remove glob reference
This patch can be removed with android api 28
Diffstat (limited to 'tools/depends/target/libcdio-gplv3')
| -rw-r--r-- | tools/depends/target/libcdio-gplv3/01-fix-glob-on-android.patch | 41 | ||||
| -rw-r--r-- | tools/depends/target/libcdio-gplv3/Makefile | 3 |
2 files changed, 43 insertions, 1 deletions
diff --git a/tools/depends/target/libcdio-gplv3/01-fix-glob-on-android.patch b/tools/depends/target/libcdio-gplv3/01-fix-glob-on-android.patch new file mode 100644 index 0000000000..669871ff05 --- /dev/null +++ b/tools/depends/target/libcdio-gplv3/01-fix-glob-on-android.patch @@ -0,0 +1,41 @@ +diff -Naur a/lib/driver/image/bincue.c b/lib/driver/image/bincue.c +--- a/lib/driver/image/bincue.c 2018-12-30 15:44:21.000000000 -0800 ++++ b/lib/driver/image/bincue.c 2020-03-05 09:27:25.906767475 -0800 +@@ -1,3 +1,4 @@ ++ + /* + Copyright (C) 2002-2006, 2008, 2011-2012, 2014, 2017 + Rocky Bernstein <rocky@gnu.org> +@@ -1045,7 +1046,7 @@ + { + char **drives = NULL; + unsigned int num_files=0; +-#ifdef HAVE_GLOB_H ++#if defined(HAVE_GLOB_H) && !defined(__ANDROID__) + unsigned int i; + glob_t globbuf; + globbuf.gl_offs = 0; +diff -Naur a/lib/driver/image/cdrdao.c b/lib/driver/image/cdrdao.c +--- a/lib/driver/image/cdrdao.c 2018-08-12 09:33:48.000000000 -0700 ++++ b/lib/driver/image/cdrdao.c 2020-03-05 09:28:25.873265269 -0800 +@@ -1149,7 +1149,7 @@ + { + char **drives = NULL; + unsigned int num_files=0; +-#ifdef HAVE_GLOB_H ++#if defined(HAVE_GLOB_H) && !defined(__ANDROID__) + unsigned int i; + glob_t globbuf; + globbuf.gl_offs = 0; +diff -Naur a/lib/driver/image/nrg.c b/lib/driver/image/nrg.c +--- a/lib/driver/image/nrg.c 2018-08-12 09:33:48.000000000 -0700 ++++ b/lib/driver/image/nrg.c 2020-03-05 09:27:59.899482793 -0800 +@@ -1167,7 +1167,7 @@ + { + char **drives = NULL; + unsigned int num_files=0; +-#ifdef HAVE_GLOB_H ++#if defined(HAVE_GLOB_H) && !defined(__ANDROID__) + unsigned int i; + glob_t globbuf; + globbuf.gl_offs = 0; diff --git a/tools/depends/target/libcdio-gplv3/Makefile b/tools/depends/target/libcdio-gplv3/Makefile index dce31596a7..a7ac211673 100644 --- a/tools/depends/target/libcdio-gplv3/Makefile +++ b/tools/depends/target/libcdio-gplv3/Makefile @@ -1,5 +1,5 @@ include ../../Makefile.include -DEPS= ../../Makefile.include Makefile osx.patch +DEPS= ../../Makefile.include Makefile osx.patch 01-fix-glob-on-android.patch # lib name, version LIBNAME=libcdio @@ -24,6 +24,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 -p1 -i ../osx.patch + cd $(PLATFORM); patch -p1 -i ../01-fix-glob-on-android.patch cd $(PLATFORM); $(AUTORECONF) -vif cd $(PLATFORM); $(CONFIGURE) |