| 1 |
commit: 70c5ad27056ba90e7ddefc8f99ab6906c0393561 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Aug 26 21:31:38 2020 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 26 21:31:38 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=70c5ad27 |
| 7 |
|
| 8 |
gkbuilds/open-iscsi: Use 'pkg-config --static' |
| 9 |
|
| 10 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 11 |
|
| 12 |
gkbuilds/open-iscsi.gkbuild | 1 + |
| 13 |
patches/open-iscsi/2.0.878/open-iscsi-2.0.878-Makefiles.patch | 9 --------- |
| 14 |
2 files changed, 1 insertion(+), 9 deletions(-) |
| 15 |
|
| 16 |
diff --git a/gkbuilds/open-iscsi.gkbuild b/gkbuilds/open-iscsi.gkbuild |
| 17 |
index d2686ca..250d0a2 100644 |
| 18 |
--- a/gkbuilds/open-iscsi.gkbuild |
| 19 |
+++ b/gkbuilds/open-iscsi.gkbuild |
| 20 |
@@ -4,6 +4,7 @@ |
| 21 |
src_compile() { |
| 22 |
append-cppflags -DNO_SYSTEMD |
| 23 |
export NO_SYSTEMD=1 |
| 24 |
+ export PKG_CONFIG="$(tc-getPKG_CONFIG) --static" |
| 25 |
|
| 26 |
gkmake -C utils/sysdeps V=1 |
| 27 |
gkmake -C utils/fwparam_ibft V=1 |
| 28 |
|
| 29 |
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 |
| 30 |
index 3c34bf2..b45ff6e 100644 |
| 31 |
--- a/patches/open-iscsi/2.0.878/open-iscsi-2.0.878-Makefiles.patch |
| 32 |
+++ b/patches/open-iscsi/2.0.878/open-iscsi-2.0.878-Makefiles.patch |
| 33 |
@@ -41,15 +41,6 @@ |
| 34 |
|
| 35 |
CFLAGS ?= -O2 -g |
| 36 |
WARNFLAGS ?= -Wall -Wstrict-prototypes |
| 37 |
-@@ -40,7 +40,7 @@ CFLAGS += $(WARNFLAGS) -I../include -I. -D_GNU_SOURCE \ |
| 38 |
- -I$(TOPDIR)/libopeniscsiusr |
| 39 |
- CFLAGS += $(shell $(PKG_CONFIG) --cflags libkmod) |
| 40 |
- ISCSI_LIB = -L$(TOPDIR)/libopeniscsiusr -lopeniscsiusr |
| 41 |
--LDFLAGS += $(shell $(PKG_CONFIG) --libs libkmod) |
| 42 |
-+LDFLAGS += $(shell $(PKG_CONFIG) --libs libkmod) -lz |
| 43 |
- ifeq ($(NO_SYSTEMD),) |
| 44 |
- LDFLAGS += $(shell $(PKG_CONFIG) --libs libsystemd) |
| 45 |
- endif |
| 46 |
@@ -76,9 +76,9 @@ iscsistart: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \ |
| 47 |
iscsistart.o statics.o |
| 48 |
$(CC) $(CFLAGS) $^ -o $@ -static -lrt $(LDFLAGS) $(ISCSI_LIB) |
Archives