mirrors/buildroot
0
0
Fork 0
mirror of https://git.busybox.net/buildroot.git synced 2024-11-27 15:33:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

package/libdrm: adjust patch switching to pkg-config for libatomic_ops

Browse Source 
In commit fa6c7d1659 ("libdrm: fix
libatomic_ops linking"), a patch was added to switch to
PKG_CHECK_MODULES() to detect libatomic_ops instead of
AC_CHECK_HEADER.

However, as explained in
https://autotools.io/pkgconfig/pkg_check_modules.html:

"In contrast with almost all of the original macros, though, the default
 action-if-not-found will end the execution with an error for not having
 found the dependency."

This makes the configure script bail out when libatomic_ops is not
available, which is not what we want in libdrm's configure
script. This commit adjusts the PKG_CHECK_MODULES() call to avoid
failing.

Fixes:

  http://autobuild.buildroot.net/results/cea/cea777dc997f86c1122c8b818d264215a0e77e5a/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Bernd Kuhls 2018-01-07 18:07:38 +01:00 committed by Thomas Petazzoni
parent a0b3d592ff
commit a27ef82d51
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/libdrm/0003-configure-Makefile.am-use-pkg-config-to-discover-lib.patch
View File

@ -23,6 +23,8 @@ and we don't link against it.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Peter Seiderer <ps.report@gmx.net>
[Bernd: PKG_CHECK_MODULES should not fail when libatomic_ops is missing]
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
--- ---
amdgpu/Makefile.am | 2 +- amdgpu/Makefile.am | 2 +-
configure.ac | 2 +- configure.ac | 2 +-
@ -57,7 +59,7 @@ index 35378b33..501d0871 100644
if test "x$drm_cv_atomic_primitives" = "xnone"; then if test "x$drm_cv_atomic_primitives" = "xnone"; then
- AC_CHECK_HEADER([atomic_ops.h], drm_cv_atomic_primitives="libatomic-ops") - AC_CHECK_HEADER([atomic_ops.h], drm_cv_atomic_primitives="libatomic-ops")
+ PKG_CHECK_MODULES(ATOMIC_OPS, [atomic_ops], drm_cv_atomic_primitives="libatomic-ops") + PKG_CHECK_MODULES(ATOMIC_OPS, [atomic_ops], drm_cv_atomic_primitives="libatomic-ops", true)
fi fi
# atomic functions defined in <atomic.h> & libc on Solaris # atomic functions defined in <atomic.h> & libc on Solaris