Commit 65be347f authored by Victorien Le Couviour--Tuffet's avatar Victorien Le Couviour--Tuffet Committed by Thomas Guillem

contrib: aom: fix lib pthread linkage

Fixes android NDK 17 build
parent 1aaff3b9
diff --git a/build/cmake/pkg_config.cmake b/build/cmake/pkg_config.cmake
index 64e2021..1cab2a3 100644
--- a/build/cmake/pkg_config.cmake
+++ b/build/cmake/pkg_config.cmake
@@ -47,12 +47,6 @@ file(APPEND "${pkgconfig_file}"
file(APPEND "${pkgconfig_file}" "Version: ${package_version}\n")
file(APPEND "${pkgconfig_file}" "Requires:\n")
file(APPEND "${pkgconfig_file}" "Conflicts:\n")
-if(CONFIG_MULTITHREAD AND HAVE_PTHREAD_H)
- file(APPEND "${pkgconfig_file}"
- "Libs: -L\${prefix}/lib -l${pkg_name} -lm -lpthread\n")
- file(APPEND "${pkgconfig_file}" "Libs.private: -lm -lpthread\n")
-else()
- file(APPEND "${pkgconfig_file}" "Libs: -L\${prefix}/lib -l${pkg_name} -lm\n")
- file(APPEND "${pkgconfig_file}" "Libs.private: -lm\n")
-endif()
+file(APPEND "${pkgconfig_file}" "Libs: -L\${prefix}/lib -l${pkg_name} -lm\n")
+file(APPEND "${pkgconfig_file}" "Libs.private: -lm\n")
file(APPEND "${pkgconfig_file}" "Cflags: -I\${prefix}/include\n")
......@@ -22,6 +22,9 @@ aom: aom-$(AOM_VERSION).tar.gz .sum-aom
$(APPLY) $(SRC)/aom/0001-film-grain-copy-user_priv-from-the-source-img.patch
ifdef HAVE_WINSTORE
$(APPLY) $(SRC)/aom/aom-pthreads-win32.patch
endif
ifdef HAVE_ANDROID
$(APPLY) $(SRC)/aom/aom-android-pthreads.patch
endif
$(MOVE)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment