wyj/guru
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/guru.git synced 2025-04-20 00:08:58 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
guru/sys-libs/libnvidia-container/files/libnvidia-container-1.14.6-fix-makefile.patch
Huang Rui f67bf11860
sys-libs/libnvidia-container: bump to 1.14.6 
- Fix misses USE=static-libs and installs '.a' files
- Fix go: command not found, add go as BDEPEND
- Fix doc install
- Respect LDFLAGS and CFLAGS
- Don't strip files
- Fix overwrites CFLAGS/CXXFLAGS or adds uncommon ones

Closes: https://bugs.gentoo.org/783984
Closes: https://bugs.gentoo.org/831703
Closes: https://bugs.gentoo.org/831705
Closes: https://bugs.gentoo.org/831706
Closes: https://bugs.gentoo.org/831707
Closes: https://bugs.gentoo.org/831708
Closes: https://bugs.gentoo.org/907876
Signed-off-by: Huang Rui <vowstar@gmail.com>
2024-03-26 20:15:17 +08:00

194 lines
6.7 KiB
Diff
Raw Blame History

# https://gitlab.archlinux.org/archlinux/packaging/packages/libnvidia-container/-/blob/main/fix-makefile.patch
--- a/Makefile
+++ b/Makefile
@@ -18,8 +18,6 @@
##### Global variables #####
WITH_NVCGO ?= yes
-WITH_LIBELF ?= no
-WITH_TIRPC ?= no
WITH_SECCOMP ?= yes
##### Global definitions #####
@@ -27,9 +25,8 @@
-export prefix = /usr/local
+export prefix = /usr
export exec_prefix = $(prefix)
export bindir = $(exec_prefix)/bin
-export libdir = $(exec_prefix)/lib
+export libdir = $(exec_prefix)/lib64
export docdir = $(prefix)/share/doc
-export libdbgdir = $(prefix)/lib/debug$(libdir)
export includedir = $(prefix)/include
export pkgconfdir = $(libdir)/pkgconfig
@@ -155,17 +152,12 @@
LIB_CPPFLAGS += -DWITH_NVCGO
LIB_LDLIBS_SHARED += -lpthread
endif
-ifeq ($(WITH_LIBELF), yes)
+# Build with system libelf unconditionally
LIB_CPPFLAGS += -DWITH_LIBELF
LIB_LDLIBS_SHARED += -lelf
-else
-LIB_LDLIBS_STATIC += -l:libelf.a
-endif
-ifeq ($(WITH_TIRPC), yes)
-LIB_CPPFLAGS += -isystem $(DEPS_DIR)$(includedir)/tirpc -DWITH_TIRPC
-LIB_LDLIBS_STATIC += -l:libtirpc.a
-LIB_LDLIBS_SHARED += -lpthread
-endif
+# Build with system libtirpc unconditionally
+CPPFLAGS += -I/usr/include/tirpc
+LIB_LDLIBS_SHARED += -lpthread -ltirpc
ifeq ($(WITH_SECCOMP), yes)
LIB_CPPFLAGS += -DWITH_SECCOMP $(shell pkg-config --cflags libseccomp)
LIB_LDLIBS_SHARED += $(shell pkg-config --libs libseccomp)
@@ -219,22 +211,14 @@
-include $(DEPENDENCIES)
$(LIB_SHARED): $(LIB_OBJS)
- $(MKDIR) -p $(DEBUG_DIR)
$(CC) $(LIB_CFLAGS) $(LIB_CPPFLAGS) $(LIB_LDFLAGS) $(OUTPUT_OPTION) $^ $(LIB_SCRIPT) $(LIB_LDLIBS)
- $(OBJCPY) --only-keep-debug $@ $(LIB_SONAME)
- $(OBJCPY) --add-gnu-debuglink=$(LIB_SONAME) $@
- $(MV) $(LIB_SONAME) $(DEBUG_DIR)
- $(STRIP) --strip-unneeded -R .comment $@
$(LIB_STATIC_OBJ): $(LIB_OBJS)
# FIXME Handle user-defined LDFLAGS and LDLIBS
$(LD) -d -r --exclude-libs ALL -L$(DEPS_DIR)$(libdir) $(OUTPUT_OPTION) $^ $(LIB_LDLIBS_STATIC)
- $(OBJCPY) --localize-hidden $@
- $(STRIP) --strip-unneeded -R .comment $@
$(BIN_NAME): $(BIN_OBJS)
$(CC) $(BIN_CFLAGS) $(BIN_CPPFLAGS) $(BIN_LDFLAGS) $(OUTPUT_OPTION) $^ $(BIN_SCRIPT) $(BIN_LDLIBS)
- $(STRIP) --strip-unneeded -R .comment $@
##### Public rules #####
@@ -259,15 +243,9 @@
ifeq ($(WITH_NVCGO), yes)
$(MAKE) -f $(MAKE_DIR)/nvcgo.mk DESTDIR=$(DEPS_DIR) MAJOR=$(MAJOR) VERSION=$(VERSION) LIB_NAME=$(LIBGO_NAME) install
endif
-ifeq ($(WITH_LIBELF), no)
- $(MAKE) -f $(MAKE_DIR)/elftoolchain.mk DESTDIR=$(DEPS_DIR) install
-endif
-ifeq ($(WITH_TIRPC), yes)
- $(MAKE) -f $(MAKE_DIR)/libtirpc.mk DESTDIR=$(DEPS_DIR) install
-endif
install: all
- $(INSTALL) -d -m 755 $(addprefix $(DESTDIR),$(includedir) $(bindir) $(libdir) $(docdir) $(libdbgdir) $(pkgconfdir))
+ $(INSTALL) -d -m 755 $(addprefix $(DESTDIR),$(includedir) $(bindir) $(libdir) $(pkgconfdir))
# Install header files
$(INSTALL) -m 644 $(LIB_INCS) $(DESTDIR)$(includedir)
# Install library files
@@ -276,18 +254,18 @@
$(LN) -sf $(LIB_SONAME) $(DESTDIR)$(libdir)/$(LIB_SYMLINK)
ifeq ($(WITH_NVCGO), yes)
$(INSTALL) -m 755 $(DEPS_DIR)$(libdir)/$(LIBGO_SHARED) $(DESTDIR)$(libdir)
+ # FIXME: for some reason ldconfig stopped creating this symlink after applying Arch Linux LDFLAGS
+ $(LN) -sf $(LIBGO_SHARED) $(DESTDIR)$(libdir)/$(LIBGO_SONAME)
$(LN) -sf $(LIBGO_SONAME) $(DESTDIR)$(libdir)/$(LIBGO_SYMLINK)
endif
$(LDCONFIG) -n $(DESTDIR)$(libdir)
- # Install debugging symbols
- $(INSTALL) -m 644 $(DEBUG_DIR)/$(LIB_SONAME) $(DESTDIR)$(libdbgdir)
# Install configuration files
$(MAKE_DIR)/$(LIB_PKGCFG).in "$(strip $(VERSION))" "$(strip $(LIB_LDLIBS_SHARED))" > $(DESTDIR)$(pkgconfdir)/$(LIB_PKGCFG)
# Install binary files
$(INSTALL) -m 755 $(BIN_NAME) $(DESTDIR)$(bindir)
# Install documentation files
- $(INSTALL) -d -m 755 $(DESTDIR)$(docdir)/$(LIB_NAME)-$(VERSION)
- $(INSTALL) -m 644 $(DOC_FILES) $(DESTDIR)$(docdir)/$(LIB_NAME)-$(VERSION)
+ # $(INSTALL) -d -m 755 $(DESTDIR)$(docdir)/$(LIB_NAME)-$(VERSION)
+ # $(INSTALL) -m 644 $(DOC_FILES) $(DESTDIR)$(docdir)/$(LIB_NAME)-$(VERSION)
uninstall:
# Uninstall header files
@@ -297,14 +275,12 @@
ifeq ($(WITH_NVCGO), yes)
$(RM) $(addprefix $(DESTDIR)$(libdir)/,$(LIBGO_SHARED) $(LIBGO_SONAME) $(LIBGO_SYMLINK))
endif
- # Uninstall debugging symbols
- $(RM) $(DESTDIR)$(libdbgdir)/$(LIB_SONAME)
# Uninstall configuration files
$(RM) $(DESTDIR)$(pkgconfdir)/$(LIB_PKGCFG)
# Uninstall binary files
$(RM) $(DESTDIR)$(bindir)/$(BIN_NAME)
# Uninstall documentation files
- $(RM) -r $(DESTDIR)$(docdir)/$(LIB_NAME)-$(VERSION)
+ # $(RM) -r $(DESTDIR)$(docdir)/$(LIB_NAME)-$(VERSION)
dist: DESTDIR:=$(DIST_DIR)/$(LIB_NAME)_$(VERSION)$(addprefix -,$(TAG))
dist: install
@@ -317,12 +293,6 @@
ifeq ($(WITH_NVCGO), yes)
-$(MAKE) -f $(MAKE_DIR)/nvcgo.mk clean
endif
-ifeq ($(WITH_LIBELF), no)
- -$(MAKE) -f $(MAKE_DIR)/elftoolchain.mk clean
-endif
-ifeq ($(WITH_TIRPC), yes)
- -$(MAKE) -f $(MAKE_DIR)/libtirpc.mk clean
-endif
mostlyclean:
$(RM) $(LIB_OBJS) $(LIB_STATIC_OBJ) $(BIN_OBJS) $(DEPENDENCIES)
--- a/mk/nvcgo.mk 2024-02-27 13:34:22.000000000 +0100
+++ b/mk/nvcgo.mk 2024-03-21 12:57:18.094692606 +0100
@@ -17,7 +17,7 @@
##### Source definitions #####
PREFIX := nvcgo
-SRCS_DIR := $(DEPS_DIR)/src/$(PREFIX)
+SRCS_DIR := $(CURDIR)/src/$(PREFIX)
VERSION := $(VERSION)
##### Public rules #####
@@ -25,9 +25,6 @@
.PHONY: all install clean
build:
- $(RM) -rf $(SRCS_DIR)
- $(CP) -R $(CURDIR)/src/$(PREFIX) $(SRCS_DIR)
- $(MAKE) -C $(SRCS_DIR) VERSION=$(VERSION) clean
$(MAKE) -C $(SRCS_DIR) VERSION=$(VERSION) build
install: build
--- a/mk/nvidia-modprobe.mk
+++ b/mk/nvidia-modprobe.mk
@@ -25,7 +25,7 @@
ARFLAGS := -rU
CPPFLAGS := -D_FORTIFY_SOURCE=2 -DNV_LINUX
-CFLAGS := -O2 -g -fdata-sections -ffunction-sections -fstack-protector -fno-strict-aliasing -fPIC
+CFLAGS := -O2 -g -fdata-sections -ffunction-sections -fstack-protector -fno-strict-aliasing -fPIC $(CFLAGS)
##### Private rules #####
--- a/src/nvcgo/Makefile
+++ b/src/nvcgo/Makefile
@@ -31,15 +31,15 @@
HDR_NAME := $(LIB_NAME).h
CTYPES_H := ctypes.h
-CGO_CFLAGS := -std=gnu11 -O2
-CGO_LDFLAGS := -Wl,--gc-sections -Wl,-s -Wl,-soname,$(LIB_SONAME)
+CGO_CFLAGS := -std=gnu11 -O2 $(CGO_CFLAGS)
+CGO_LDFLAGS := -Wl,--gc-sections -Wl,-soname,$(LIB_SONAME) $(CGO_LDFLAGS)
build: $(OBJ_NAME)
$(OBJ_NAME): $(wildcard $(CURDIR)/*.go) $(wildcard */*.go)
export CGO_CFLAGS="$(CGO_CFLAGS)"; \
- export CGO_LDFLAGS="$(CGO_LDFLAGS)"; \
+ export CGO_LDFLAGS="-Wl,--gc-sections -Wl,-soname,$(LIB_SONAME) $(CGO_LDFLAGS)"; \
- $(GO) build -o $(@) -ldflags "-s -w" -buildmode=c-shared .
+ $(GO) build -o $(@) -ldflags "$(GO_LDFLAGS)" -buildmode=c-shared .
install: $(OBJ_NAME)
$(INSTALL) -d -m 755 $(addprefix $(DESTDIR),$(libdir) $(includedir)/$(PKG_NAME))
Reference in New Issue View Git Blame Copy Permalink