aboutsummaryrefslogtreecommitdiffstats
path: root/main/s390-tools/argz.patch
diff options
context:
space:
mode:
Diffstat (limited to 'main/s390-tools/argz.patch')
-rw-r--r--main/s390-tools/argz.patch21
1 files changed, 11 insertions, 10 deletions
diff --git a/main/s390-tools/argz.patch b/main/s390-tools/argz.patch
index 8623866c4b..f7b3836f65 100644
--- a/main/s390-tools/argz.patch
+++ b/main/s390-tools/argz.patch
@@ -15,7 +15,7 @@ diff --git a/common.mak b/common.mak
index 0a5fd69..c6f429c 100644
--- a/common.mak
+++ b/common.mak
-@@ -315,6 +315,10 @@ endif
+@@ -329,6 +329,10 @@ endif
# check the library directory via "make -C" when the tools Makefile is
# processed.
@@ -103,9 +103,9 @@ index a44b14b..48c02fb 100644
-libs = $(rootdir)/libutil/libutil.a
+libs = $(rootdir)/libutil/libutil.a $(rootdir)/libargz/libargz.a
- detect-libcryptsetup.dep:
- echo "#include <libcryptsetup.h>" > detect-libcryptsetup.dep
-@@ -88,11 +88,11 @@
+ CFLAGS += -DKMS_PLUGIN_LOCATION=\"$(ZKEYKMSPLUGINDIR)\"
+
+@@ -90,11 +90,11 @@
ep11.h misc.h utils.h
kms.o: kms.c kms.h kms-plugin.h utils.h pkey.h
@@ -121,21 +121,22 @@ index a44b14b..48c02fb 100644
--- a/zkey/ekmfweb/Makefile
+++ b/zkey/ekmfweb/Makefile
-@@ -5,7 +5,7 @@
+@@ -5,7 +5,7 @@ VERM = $(shell echo $(VERSION) | cut -d
all: zkey-ekmfweb.so
-libs = $(rootdir)/libutil/libutil.a
+libs = $(rootdir)/libutil/libutil.a $(rootdir)/libargz/libargz.a
- export LIBRARY_PATH = $(rootdir)/libekmfweb:$LIBRARY_PATH
-
-@@ -29,7 +29,7 @@
+ zkey-ekmfweb.o: zkey-ekmfweb.c zkey-ekmfweb.h ../kms-plugin.h \
+ ../cca.h ../utils.h ../pkey.h ../properties.h \
+@@ -27,7 +27,8 @@ utils.o: ../utils.c ../utils.h ../pkey.h
$(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) -fPIC -c $< -o $@
zkey-ekmfweb.so: ALL_CFLAGS += -fPIC
--zkey-ekmfweb.so: LDLIBS = -lekmfweb -ldl -lcrypto
-+zkey-ekmfweb.so: LDLIBS = -lekmfweb -ldl -lcrypto $(LIBEXECINFO_LIBS)
+-zkey-ekmfweb.so: LDLIBS = -L$(rootdir)/libekmfweb -lekmfweb -ldl -lcrypto
++zkey-ekmfweb.so: LDLIBS = -L$(rootdir)/libekmfweb -lekmfweb -ldl -lcrypto \
++ $(LIBEXECINFO_LIBS)
zkey-ekmfweb.so: ALL_LDFLAGS += -shared -Wl,--version-script=zkey-ekmfweb.map \
-Wl,-z,defs,-Bsymbolic -Wl,-soname,zkey-ekmfweb.so.$(VERM)
zkey-ekmfweb.so: zkey-ekmfweb.o properties.o pkey.o cca.o ep11.o utils.o $(libs)