Skip to content

better handle nonstandard library install paths #92

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alan-maguire merged 2 commits into from
Aug 27, 2024
Merged

better handle nonstandard library install paths #92

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6e3faa
improve install for non-standard lib directories
alan-maguire Aug 27, 2024
d83550e
better support nonstandard install locations
alan-maguire Aug 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
improve install for non-standard lib directories 
If a distro (like CachyOS) does not have /usr/lib64, provide a
way (setting libdir=lib during make) to override the default
/usr/lib64 installation.  Pass this thru to the code to allow
us to find plugins.

Signed-off-by: Alan Maguire <[email protected]>
  • Loading branch information
@alan-maguire
alan-maguire committed Aug 27, 2024
commit d6e3faacef61be04ccb0737062d026f6ef012436
12 changes: 10 additions & 2 deletions include/bpftune/libbpftune.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,16 @@

#define BPFTUNE_RUN_DIR "/var/run/bpftune"
#define BPFTUNER_CGROUP_DIR BPFTUNE_RUN_DIR "/cgroupv2"
#define BPFTUNER_LIB_DIR "/usr/lib64/bpftune/"
#define BPFTUNER_LOCAL_LIB_DIR "/usr/local/lib64/bpftune/"
#ifndef BPFTUNER_PREFIX_DIR
#define BPFTUNER_PREFIX_DIR "/usr"
#endif
#ifndef LIB_DIR
#define LIB_DIR "lib64"
#endif
/* default /usr/lib64/bpftune */
#define BPFTUNER_LIB_DIR BPFTUNER_PREFIX_DIR LIB_DIR "/bpftune/"
/* default /usr/local/lib64/bpftune */
#define BPFTUNER_LOCAL_LIB_DIR BPFTUNER_PREFIX_DIR "local/" LIB_DIR "/bpftune/"
#define BPFTUNER_LIB_SUFFIX "_tuner.so"

#define BPFTUNE_PROC_SYS "/proc/sys/"
Expand Down
18 changes: 11 additions & 7 deletions src/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ INSTALL ?= install

DESTDIR ?= /
prefix ?= /usr
libdir ?= lib64
installprefix = $(DESTDIR)/$(prefix)

INSTALLPATH = $(installprefix)
Expand All @@ -57,11 +58,14 @@ VERSION_SCRIPT := libbpftune.map

CFLAGS = -fPIC -Wall -Wextra -march=native -g -I../include -std=c99

CFLAGS += -DBPFTUNE_VERSION='"$(BPFTUNE_VERSION)"' $(INCLUDES)
CFLAGS += -DBPFTUNE_VERSION='"$(BPFTUNE_VERSION)"' \
-DBPFTUNER_PREFIX_DIR='"$(prefix)"' \
-DLIB_DIR='"$(libdir)"' \
$(INCLUDES)

LDLIBS = -lbpf -ldl -lm -lrt -lcap -lnl-3 -lpthread -lnl-route-3

LDFLAGS += -L. -L/usr/local/lib64
LDFLAGS += -L. -L$(prefix)/$(libdir)

# Try to detect best kernel BTF source
KERNEL_REL := $(shell uname -r)
Expand Down Expand Up @@ -128,15 +132,15 @@ distclean: clean
install: $(OPATH)libbpftune.so $(OPATH)bpftune bpftune.service
$(INSTALL) -m 0755 -d $(INSTALLPATH)/sbin
$(INSTALL) $(OPATH)bpftune $(INSTALLPATH)/sbin/bpftune
$(INSTALL) -m 0755 -d $(INSTALLPATH)/lib64
$(INSTALL) $(OPATH)libbpftune.so* $(INSTALLPATH)/lib64
$(INSTALL) -m 0755 -d $(INSTALLPATH)/$(libdir)
$(INSTALL) $(OPATH)libbpftune.so* $(INSTALLPATH)/$(libdir)
$(INSTALL) -m 0755 -d $(installprefix)/lib/systemd/system
$(INSTALL) -m 644 bpftune.service $(installprefix)/lib/systemd/system
$(INSTALL) -m 0755 -d $(INSTALLPATH)/lib64/bpftune
$(INSTALL) $(TUNER_LIBS) $(INSTALLPATH)/lib64/bpftune
$(INSTALL) -m 0755 -d $(INSTALLPATH)/$(libdir)/bpftune
$(INSTALL) $(TUNER_LIBS) $(INSTALLPATH)/$(libdir)/bpftune
$(INSTALL) -m 0755 -d $(CONF)
$(INSTALL) -m 0755 -d $(CONFPATH)
echo $(prefix)/lib64 > $(CONFPATH)/libbpftune.conf
echo $(prefix)/$(libdir) > $(CONFPATH)/libbpftune.conf
if [ $(DESTDIR) = / ]; then ldconfig; fi

$(OPATH)bpftune: bpftune.c $(OPATH)bpftune.o $(OPATH)libbpftune.so
Expand Down