Skip to contentSkip to conversation

package/libcap: fix libcap.pc

PATCH New Fabrice Fontaine 2 participants 3 messages Dec 1, 2020 – Dec 12, 2020

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 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

---
Changes v2 -> v3 (after review of Peter Seiderer):
- Merge with initial patch that was not committed yet

Changes v1 -> v2:
- Also fix host libcap

 package/libcap/libcap.mk | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)
package/libcap/libcap.mk +14 -8
index 2b80a3cb7d..7bb8f57671 100644
@@ -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))
Signature · 1 line
2.29.2
#1 lore raw

PATCH v3 1/1 package/libcap: fix libcap.pc

Quoted 15 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fabrice" == Fabrice Fontaine <[email protected]> writes:

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

Quoted 8 lines

---
Changes v2 -> v3 (after review of Peter Seiderer):
- Merge with initial patch that was not committed yet

Changes v1 -> v2:
- Also fix host libcap

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#2 lore raw

PATCH v3 1/1 package/libcap: fix libcap.pc

In reply to Fabrice Fontaine
Quoted 15 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fabrice" == Fabrice Fontaine <[email protected]> writes:

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

Quoted 8 lines

---
Changes v2 -> v3 (after review of Peter Seiderer):
- Merge with initial patch that was not committed yet

Changes v1 -> v2:
- Also fix host libcap

Committed to 2020.02.x and 2020.08.x (after some fixups), thanks.

Signature · 1 line
Bye, Peter Korsgaard