diff options
Diffstat (limited to 'main/s390-tools/argz.patch')
| -rw-r--r-- | main/s390-tools/argz.patch | 50 |
1 files changed, 36 insertions, 14 deletions
diff --git a/main/s390-tools/argz.patch b/main/s390-tools/argz.patch index f7b3836f655..c2d13fcb68d 100644 --- a/main/s390-tools/argz.patch +++ b/main/s390-tools/argz.patch @@ -1,16 +1,16 @@ diff --git a/Makefile b/Makefile -index 6081acc..fe8dd2f 100644 +index 31c4065..95dce2d 100644 --- a/Makefile +++ b/Makefile -@@ -3,7 +3,7 @@ ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/ar - # Include common definitions - include common.mak - --LIB_DIRS = libvtoc libutil libzds libdasd libvmdump libccw libvmcp libekmfweb -+LIB_DIRS = libargz libvtoc libutil libzds libdasd libvmdump libccw libvmcp libekmfweb +@@ -8,7 +8,7 @@ include common.mak + # LIBS: Libraries that can have a dependency to base libraries + # TOOLS: Tools that can have a dependency to base libraries or libraries + # +-BASELIB_DIRS = libutil libseckey ++BASELIB_DIRS = libargz libutil libseckey + LIB_DIRS = libvtoc libzds libdasd libvmdump libccw libvmcp libekmfweb \ + libkmipclient libcpumf TOOL_DIRS = zipl zdump fdasd dasdfmt dasdview tunedasd \ - tape390 osasnmpd qetharp ip_watcher qethconf scripts zconf \ - vmconvert vmcp man mon_tools dasdinfo vmur ipl_tools \ diff --git a/common.mak b/common.mak index 0a5fd69..c6f429c 100644 --- a/common.mak @@ -153,14 +153,36 @@ index 9dcac07..2f87798 100644 #include "lib/util_base.h" #include "lib/util_libc.h" diff --git a/libutil/Makefile b/libutil/Makefile -index ca90f2a..3042f3d 100644 +index 508df5b..647bbbe 100644 --- a/libutil/Makefile +++ b/libutil/Makefile @@ -1,6 +1,6 @@ include ../common.mak --lib = libutil.a -+lib = libutil.a $(rootdir)/libargz/libargz.a +-lib := libutil.a ++lib := libutil.a $(rootdir)/libargz/libargz.a + + sources := $(filter-out %_example.c,$(wildcard *.c)) + objects := $(patsubst %.c,%.o,$(sources)) +diff --git a/zkey/kmip/Makefile b/zkey/kmip/Makefile +index 14a532e..597c851 100644 +--- a/zkey/kmip/Makefile ++++ b/zkey/kmip/Makefile +@@ -5,7 +5,7 @@ VERM = $(shell echo $(VERSION) | cut -d '.' -f 1) + + all: zkey-kmip.so + +-libs = $(rootdir)/libutil/libutil.a $(rootdir)/libseckey/libseckey.a ++libs = $(rootdir)/libutil/libutil.a $(rootdir)/libargz/libargz.a $(rootdir)/libseckey/libseckey.a + + zkey-kmip.o: zkey-kmip.c zkey-kmip.h ../kms-plugin.h ../plugin-utils.h \ + ../cca.h ../utils.h ../pkey.h ../properties.h \ +@@ -31,7 +31,7 @@ utils.o: ../utils.c ../utils.h ../pkey.h ../cca.h ../ep11.h ../kms-plugin.h + $(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) -fPIC -c $< -o $@ - examples = util_base_example \ - util_panic_example \ + zkey-kmip.so: ALL_CFLAGS += -fPIC +-zkey-kmip.so: LDLIBS = -L$(rootdir)/libkmipclient -lkmipclient -ldl -lcrypto ++zkey-kmip.so: LDLIBS = -L$(rootdir)/libkmipclient -lkmipclient -ldl -lcrypto $(LIBEXECINFO_LIBS) + zkey-kmip.so: ALL_LDFLAGS += -shared -Wl,--version-script=zkey-kmip.map \ + -Wl,-z,defs,-Bsymbolic -Wl,-soname,zkey-kmip.so.$(VERM) + zkey-kmip.so: zkey-kmip.o plugin-utils.o properties.o pkey.o cca.o ep11.o \ |