bpftools: fix library path on 64 bit systems
authorFelix Fietkau <nbd@nbd.name>
Sat, 19 Mar 2022 12:28:41 +0000 (13:28 +0100)
committerFelix Fietkau <nbd@nbd.name>
Sat, 19 Mar 2022 12:29:15 +0000 (13:29 +0100)
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>
package/network/utils/bpftools/Makefile

index 406481d784b774cfd137e1f6888e9d6afa6d42f4..56422e79026638995cdfda9b41968f70247e7c96 100644 (file)
@@ -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))