aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2022-03-19 13:28:41 +0100
committerFelix Fietkau <nbd@nbd.name>2022-03-19 13:29:15 +0100
commit54aab4e7198b07c7323b5aad4cfedef3793ed1ee (patch)
treebdf93181f16f9775664c3db2b267126f3bf73ac4
parent00cbf6f6ab1d5c45a40c68167af897c9526542e8 (diff)
downloadupstream-54aab4e7198b07c7323b5aad4cfedef3793ed1ee.tar.gz
upstream-54aab4e7198b07c7323b5aad4cfedef3793ed1ee.tar.bz2
upstream-54aab4e7198b07c7323b5aad4cfedef3793ed1ee.zip
bpftools: fix library path on 64 bit systems
drop the use of LIB_SUFFIX Fixes: 00cbf6f6ab1d ("bpftools: update to standalone bpftools + libbpf, use the latest version") Signed-off-by: Felix Fietkau <nbd@nbd.name>
-rw-r--r--package/network/utils/bpftools/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/package/network/utils/bpftools/Makefile b/package/network/utils/bpftools/Makefile
index 406481d784..56422e7902 100644
--- a/package/network/utils/bpftools/Makefile
+++ b/package/network/utils/bpftools/Makefile
@@ -118,10 +118,10 @@ define Build/InstallDev/libbpf
$(INSTALL_DIR) $(1)/usr/include/bpf
$(CP) $(PKG_INSTALL_DIR)/usr/include/bpf/*.h $(1)/usr/include/bpf/
$(INSTALL_DIR) $(1)/usr/lib
- $(CP) $(PKG_INSTALL_DIR)/usr/lib$(LIB_SUFFIX)/libbpf.{a,so*} \
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libbpf.{a,so*} \
$(1)/usr/lib/
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
- $(CP) $(PKG_INSTALL_DIR)/usr/lib$(LIB_SUFFIX)/pkgconfig/libbpf.pc \
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libbpf.pc \
$(1)/usr/lib/pkgconfig/
$(SED) 's,/usr/include,$$$${prefix}/include,g' \
$(1)/usr/lib/pkgconfig/libbpf.pc
@@ -141,7 +141,7 @@ endef
define Package/libbpf/install
$(INSTALL_DIR) $(1)/usr/lib
- $(CP) $(PKG_INSTALL_DIR)/usr/lib$(LIB_SUFFIX)/libbpf.so.* $(1)/usr/lib/
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libbpf.so.* $(1)/usr/lib/
endef
$(eval $(call BuildPackage,libbpf))