diff options
| author | Miguel Borges de Freitas <enen92@users.noreply.github.com> | 2022-12-15 10:54:54 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-15 10:54:54 +0000 |
| commit | 86fd0f522fe37600e0548b963e1bafae39f6075b (patch) | |
| tree | 14214072a6d00a4369995a6acdaf0b184606545d /tools | |
| parent | 26381e88c55a7f2d180eb156a2e85dc5997b88fd (diff) | |
| parent | 5722d74e3bcd856df5ad1a74b90779ba89f1489e (diff) | |
Merge pull request #22267 from enen92/a_silicon_disk_backport
[discs] Allow compilation of darwin driver on apple silicon
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/depends/target/libcdio-gplv3/Makefile | 2 | ||||
| -rw-r--r-- | tools/depends/target/libcdio-gplv3/osx.patch | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/tools/depends/target/libcdio-gplv3/Makefile b/tools/depends/target/libcdio-gplv3/Makefile index dfbc21d0b0..dc4bb4cd76 100644 --- a/tools/depends/target/libcdio-gplv3/Makefile +++ b/tools/depends/target/libcdio-gplv3/Makefile @@ -23,7 +23,9 @@ all: .installed-$(PLATFORM) $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE).$(HASH_TYPE) $(DEPS) rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM) cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) +ifeq ($(TARGET_PLATFORM),macosx) cd $(PLATFORM); patch -p1 -i ../osx.patch +endif cd $(PLATFORM); patch -p1 -i ../01-fix-glob-on-android.patch cd $(PLATFORM); $(AUTORECONF) -vif cd $(PLATFORM); $(CONFIGURE) diff --git a/tools/depends/target/libcdio-gplv3/osx.patch b/tools/depends/target/libcdio-gplv3/osx.patch index b981f38e03..ab8415edd1 100644 --- a/tools/depends/target/libcdio-gplv3/osx.patch +++ b/tools/depends/target/libcdio-gplv3/osx.patch @@ -13,7 +13,7 @@ ## [Define 1 if you have AIX CD-ROM support]) ;; - darwin[[6-9]].*|darwin[[1-9]][[0-9]].*) -+ x86_64-apple-darwin*) ++ *-apple-darwin*) AC_CHECK_HEADERS(IOKit/IOKitLib.h CoreFoundation/CFBase.h, [have_iokit_h="yes"]) if test "x$have_iokit_h" = "xyes" ; then |