diff options
| author | Fabrice Fontaine <fontaine.fabrice@gmail.com> | 2020-12-01 20:27:03 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2020-12-01 23:01:27 +0100 |
| commit | 07f8ea39139299c83777a338a30cd480633d5706 (patch) | |
| tree | 3f783d64b15861d7a35d1bc8a70c9d494ea85b2c | |
| parent | c773336463bc605e2e5ceb8288937b7aacb26d04 (diff) | |
| download | buildroot-07f8ea39139299c83777a338a30cd480633d5706.tar.bz2 | |
package/libcap: fix libcap.pc
libcap builds an incorrect libcap.pc because libdir is pulled from the
host os:
ifndef lib
lib=$(shell ldd /usr/bin/ld|egrep "ld-linux|ld.so"|cut -d/ -f2)
endif
Fix this error by passing lib=lib and prefix in
{HOST_LIBCAP,LIBCAP}_BUILD_CMDS
Fixes:
- https://bugs.buildroot.org/show_bug.cgi?id=13276
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Reviewed-by: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
| -rw-r--r-- | package/libcap/libcap.mk | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/package/libcap/libcap.mk b/package/libcap/libcap.mk index 2b80a3cb7d..7bb8f57671 100644 --- a/package/libcap/libcap.mk +++ b/package/libcap/libcap.mk @@ -19,6 +19,8 @@ LIBCAP_MAKE_FLAGS = \ CROSS_COMPILE="$(TARGET_CROSS)" \ BUILD_CC="$(HOSTCC)" \ BUILD_CFLAGS="$(HOST_CFLAGS)" \ + lib=lib \ + prefix=/usr \ SHARED=$(if $(BR2_STATIC_LIBS),,yes) \ PTHREADS=$(if $(BR2_TOOLCHAIN_HAS_THREADS),yes,) @@ -38,27 +40,31 @@ endef define LIBCAP_INSTALL_STAGING_CMDS $(foreach d,$(LIBCAP_MAKE_DIRS), \ $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/$(d) $(LIBCAP_MAKE_FLAGS) \ - DESTDIR=$(STAGING_DIR) prefix=/usr lib=lib install + DESTDIR=$(STAGING_DIR) install ) endef define LIBCAP_INSTALL_TARGET_CMDS $(foreach d,$(LIBCAP_MAKE_DIRS), \ $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/$(d) $(LIBCAP_MAKE_FLAGS) \ - DESTDIR=$(TARGET_DIR) prefix=/usr lib=lib install + DESTDIR=$(TARGET_DIR) install ) endef +HOST_LIBCAP_MAKE_FLAGS = \ + DYNAMIC=yes \ + GOLANG=no \ + lib=lib \ + prefix=$(HOST_DIR) \ + RAISE_SETFCAP=no + define HOST_LIBCAP_BUILD_CMDS - $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D)\ - DYNAMIC=yes \ - RAISE_SETFCAP=no GOLANG=no + $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ + $(HOST_LIBCAP_MAKE_FLAGS) endef define HOST_LIBCAP_INSTALL_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) prefix=$(HOST_DIR) \ - DYNAMIC=yes \ - RAISE_SETFCAP=no GOLANG=no lib=lib install + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_LIBCAP_MAKE_FLAGS) install endef $(eval $(generic-package)) |