diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2020-08-26 23:31:38 +0200 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2020-08-26 23:31:38 +0200 |
| commit | 70c5ad27056ba90e7ddefc8f99ab6906c0393561 (patch) | |
| tree | e90b0da6e0fb473ce2cdfd9b9ef80d684e676737 | |
| parent | defaults/modules_load: Add hv_sock to Hyper-V modules list (diff) | |
| download | genkernel-70c5ad27056ba90e7ddefc8f99ab6906c0393561.tar.gz genkernel-70c5ad27056ba90e7ddefc8f99ab6906c0393561.tar.bz2 genkernel-70c5ad27056ba90e7ddefc8f99ab6906c0393561.zip | |
gkbuilds/open-iscsi: Use 'pkg-config --static'
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
| -rw-r--r-- | gkbuilds/open-iscsi.gkbuild | 1 | ||||
| -rw-r--r-- | patches/open-iscsi/2.0.878/open-iscsi-2.0.878-Makefiles.patch | 9 |
2 files changed, 1 insertions, 9 deletions
diff --git a/gkbuilds/open-iscsi.gkbuild b/gkbuilds/open-iscsi.gkbuild index d2686cad..250d0a2c 100644 --- a/gkbuilds/open-iscsi.gkbuild +++ b/gkbuilds/open-iscsi.gkbuild @@ -4,6 +4,7 @@ src_compile() { append-cppflags -DNO_SYSTEMD export NO_SYSTEMD=1 + export PKG_CONFIG="$(tc-getPKG_CONFIG) --static" gkmake -C utils/sysdeps V=1 gkmake -C utils/fwparam_ibft V=1 diff --git a/patches/open-iscsi/2.0.878/open-iscsi-2.0.878-Makefiles.patch b/patches/open-iscsi/2.0.878/open-iscsi-2.0.878-Makefiles.patch index 3c34bf26..b45ff6e8 100644 --- a/patches/open-iscsi/2.0.878/open-iscsi-2.0.878-Makefiles.patch +++ b/patches/open-iscsi/2.0.878/open-iscsi-2.0.878-Makefiles.patch @@ -41,15 +41,6 @@ CFLAGS ?= -O2 -g WARNFLAGS ?= -Wall -Wstrict-prototypes -@@ -40,7 +40,7 @@ CFLAGS += $(WARNFLAGS) -I../include -I. -D_GNU_SOURCE \ - -I$(TOPDIR)/libopeniscsiusr - CFLAGS += $(shell $(PKG_CONFIG) --cflags libkmod) - ISCSI_LIB = -L$(TOPDIR)/libopeniscsiusr -lopeniscsiusr --LDFLAGS += $(shell $(PKG_CONFIG) --libs libkmod) -+LDFLAGS += $(shell $(PKG_CONFIG) --libs libkmod) -lz - ifeq ($(NO_SYSTEMD),) - LDFLAGS += $(shell $(PKG_CONFIG) --libs libsystemd) - endif @@ -76,9 +76,9 @@ iscsistart: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \ iscsistart.o statics.o $(CC) $(CFLAGS) $^ -o $@ -static -lrt $(LDFLAGS) $(ISCSI_LIB) |