2022-11-01 10:04:06 +00:00
|
|
|
diff --git a/src/Makefile b/src/Makefile
|
|
|
|
|
index 81ea6b8..7ab5f13 100644
|
|
|
|
|
--- a/src/Makefile
|
|
|
|
|
+++ b/src/Makefile
|
|
|
|
|
@@ -67,15 +67,12 @@ INSTALL = install
|
|
|
|
|
DESTDIR ?=
|
|
|
|
|
|
2023-02-25 00:39:48 +00:00
|
|
|
HOSTARCH = $(firstword $(subst -, ,$(shell $(CC) -dumpmachine)))
|
|
|
|
|
-ifeq ($(filter-out %64 %64be %64eb %64le %64el s390x, $(HOSTARCH)),)
|
2022-11-01 10:04:06 +00:00
|
|
|
- LIBSUBDIR := lib64
|
|
|
|
|
-else
|
|
|
|
|
- LIBSUBDIR := lib
|
|
|
|
|
-endif
|
|
|
|
|
+LIBSUBDIR := lib
|
|
|
|
|
|
|
|
|
|
# By default let the pc file itself use ${prefix} in includedir/libdir so that
|
|
|
|
|
# the prefix can be overridden at runtime (eg: --define-prefix)
|
|
|
|
|
ifndef LIBDIR
|
|
|
|
|
+ PREFIX_PC := /usr
|
|
|
|
|
LIBDIR_PC := $$\{prefix\}/$(LIBSUBDIR)
|
|
|
|
|
else
|
|
|
|
|
LIBDIR_PC := $(LIBDIR)
|
|
|
|
|
@@ -106,7 +103,7 @@ $(OBJDIR)/libbpf.so.$(LIBBPF_VERSION): $(SHARED_OBJS)
|
|
|
|
|
$^ $(ALL_LDFLAGS) -o $@
|
|
|
|
|
|
|
|
|
|
$(OBJDIR)/libbpf.pc: force
|
|
|
|
|
- $(Q)sed -e "s|@PREFIX@|$(PREFIX)|" \
|
|
|
|
|
+ $(Q)sed -e "s|@PREFIX@|$(PREFIX_PC)|" \
|
|
|
|
|
-e "s|@LIBDIR@|$(LIBDIR_PC)|" \
|
|
|
|
|
-e "s|@VERSION@|$(LIBBPF_VERSION)|" \
|
|
|
|
|
< libbpf.pc.template > $@
|
|
|
|
|
diff --git a/src/libbpf.pc.template b/src/libbpf.pc.template
|
|
|
|
|
index b45ed53..fe6ddde 100644
|
|
|
|
|
--- a/src/libbpf.pc.template
|
|
|
|
|
+++ b/src/libbpf.pc.template
|
|
|
|
|
@@ -7,6 +7,6 @@ includedir=${prefix}/include
|
|
|
|
|
Name: libbpf
|
|
|
|
|
Description: BPF library
|
|
|
|
|
Version: @VERSION@
|
|
|
|
|
-Libs: -L${libdir} -lbpf
|
|
|
|
|
+Libs: -L${libdir} -lbpf -lz
|
|
|
|
|
Requires.private: libelf zlib
|
|
|
|
|
Cflags: -I${includedir}
|
