| 1 |
vapier 12/04/30 02:20:01 |
| 2 |
|
| 3 |
Added: s390-tools-1.16.0-build.patch |
| 4 |
Log: |
| 5 |
Version bump. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sys-apps/s390-tools/files/s390-tools-1.16.0-build.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/s390-tools/files/s390-tools-1.16.0-build.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/s390-tools/files/s390-tools-1.16.0-build.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: s390-tools-1.16.0-build.patch |
| 16 |
=================================================================== |
| 17 |
- fix errors in subdir makes |
| 18 |
- parallelize subdir runs |
| 19 |
- cleanup flag handling |
| 20 |
|
| 21 |
--- a/Makefile |
| 22 |
+++ b/Makefile |
| 23 |
@@ -9,19 +9,19 @@ |
| 24 |
vmconvert vmcp man mon_tools dasdinfo vmur cpuplugd ipl_tools \ |
| 25 |
ziomon iucvterm hyptop cmsfs-fuse |
| 26 |
|
| 27 |
-all: subdirs_make |
| 28 |
+SUB_DIRS_ALL = $(patsubst %,subdirs_all_%,$(SUB_DIRS)) |
| 29 |
+SUB_DIRS_CLEAN = $(patsubst %,subdirs_clean_%,$(SUB_DIRS)) |
| 30 |
+SUB_DIRS_INSTALL = $(patsubst %,subdirs_install_%,$(SUB_DIRS)) |
| 31 |
|
| 32 |
-subdirs_make: |
| 33 |
- set -e ; for dir in $(SUB_DIRS) ; do \ |
| 34 |
- cd $$dir ; $(MAKE) TOPDIR=$(TOPDIR) ARCH=$(ARCH); cd ..; \ |
| 35 |
- done |
| 36 |
+all: $(SUB_DIRS_ALL) |
| 37 |
|
| 38 |
-clean: |
| 39 |
- set -e ; for dir in $(SUB_DIRS) ; do \ |
| 40 |
- cd $$dir ; $(MAKE) TOPDIR=$(TOPDIR) ARCH=$(ARCH) clean; cd ..; \ |
| 41 |
- done |
| 42 |
+_subdir = $(patsubst subdirs_%,%,$@) |
| 43 |
+subdir = $(shell expr $(_subdir) : '[^_]*_\(.*\)') |
| 44 |
+subtarget = $(shell expr $(_subdir) : '\([^_]*\)_.*') |
| 45 |
+subdirs_%: |
| 46 |
+ $(MAKE) TOPDIR=$(TOPDIR) ARCH=$(ARCH) -C $(subdir) $(subtarget) |
| 47 |
+ |
| 48 |
+clean: $(SUB_DIRS_CLEAN) |
| 49 |
|
| 50 |
install: |
| 51 |
- set -e ; for dir in $(SUB_DIRS) ; do \ |
| 52 |
- cd $$dir ; $(MAKE) TOPDIR=$(TOPDIR) ARCH=$(ARCH) install; cd ..; \ |
| 53 |
- done |
| 54 |
+ $(MAKE) $(SUB_DIRS_INSTALL) |
| 55 |
--- a/common.mak |
| 56 |
+++ b/common.mak |
| 57 |
@@ -17,10 +17,10 @@ |
| 58 |
# Cross Compiling Support |
| 59 |
CROSS_COMPILE = |
| 60 |
AS = $(call echocmd," AS ",/$@)$(CROSS_COMPILE)as |
| 61 |
-LINK = $(call echocmd," LINK ",/$@)$(CROSS_COMPILE)gcc |
| 62 |
+LINK = $(call echocmd," LINK ",/$@)$(CROSS_COMPILE)gcc $(CFLAGS) $(LDFLAGS) |
| 63 |
LD = $(call echocmd," LD ",/$@)$(CROSS_COMPILE)ld |
| 64 |
CC = $(call echocmd," CC ",/$@)$(CROSS_COMPILE)gcc |
| 65 |
-LINKXX = $(call echocmd," LINKXX ",/$@)$(CROSS_COMPILE)g++ |
| 66 |
+LINKXX = $(call echocmd," LINKXX ",/$@)$(CROSS_COMPILE)g++ $(CXXFLAGS) $(LDFLAGS) |
| 67 |
CXX = $(call echocmd," CXX ",/$@)$(CROSS_COMPILE)g++ |
| 68 |
CPP = $(call echocmd," CPP ",/$@)$(CROSS_COMPILE)gcc -E |
| 69 |
AR = $(call echocmd," AR ",/$@)$(CROSS_COMPILE)ar |
| 70 |
@@ -41,14 +41,13 @@ |
| 71 |
ZFCPDUMP_RD = zfcpdump.rd |
| 72 |
export ZFCPDUMP_DIR ZFCPDUMP_IMAGE ZFCPDUMP_RD |
| 73 |
|
| 74 |
-CFLAGS = $(WARNFLAGS) -O3 -DS390_TOOLS_RELEASE=$(S390_TOOLS_RELEASE) \ |
| 75 |
- -DS390_TOOLS_LIBDIR=$(TOOLS_LIBDIR) \ |
| 76 |
- -DS390_TOOLS_SYSCONFDIR=$(SYSCONFDIR) \ |
| 77 |
- -g $(OPT_FLAGS) |
| 78 |
-CXXFLAGS = $(WARNFLAGS) -O3 -DS390_TOOLS_RELEASE=$(S390_TOOLS_RELEASE) \ |
| 79 |
- -DS390_TOOLS_LIBDIR=$(TOOLS_LIBDIR) \ |
| 80 |
- -DS390_TOOLS_SYSCONFDIR=$(SYSCONFDIR) \ |
| 81 |
- -g $(OPT_FLAGS) |
| 82 |
+CFLAGS += $(WARNFLAGS) $(OPT_FLAGS) |
| 83 |
+CXXFLAGS += $(WARNFLAGS) $(OPT_FLAGS) |
| 84 |
+CPPFLAGS += \ |
| 85 |
+ -DS390_TOOLS_RELEASE=$(S390_TOOLS_RELEASE) \ |
| 86 |
+ -DS390_TOOLS_LIBDIR=$(TOOLS_LIBDIR) \ |
| 87 |
+ -DS390_TOOLS_SYSCONFDIR=$(SYSCONFDIR) |
| 88 |
+export CPPFLAGS |
| 89 |
|
| 90 |
# make G=1 |
| 91 |
# Compile tools so that gcov can be used to collect code coverage data. |
| 92 |
@@ -76,7 +75,7 @@ |
| 93 |
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@ |
| 94 |
|
| 95 |
%: %.o |
| 96 |
- $(LINK) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@ |
| 97 |
+ $(LINK) $(CFLAGS) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@ |
| 98 |
|
| 99 |
all: |
| 100 |
|
| 101 |
--- a/zfcpdump/ramdisk/Makefile |
| 102 |
+++ b/zfcpdump/ramdisk/Makefile |
| 103 |
@@ -12,16 +12,14 @@ |
| 104 |
|
| 105 |
all: $(ZFCPDUMP_RD) |
| 106 |
|
| 107 |
-CFLAGS += -D_FILE_OFFSET_BITS=64 |
| 108 |
+CPPFLAGS += -D_FILE_OFFSET_BITS=64 -I../../include |
| 109 |
+LDFLAGS += -static |
| 110 |
+LDLIBS += -lz |
| 111 |
|
| 112 |
$(ZFCPDUMP_RD): zfcp_dumper |
| 113 |
/bin/sh ./create_rd.sh $(ARCH) |
| 114 |
|
| 115 |
-zfcp_dumper: zfcp_dumper.o |
| 116 |
- $(CC) -o zfcp_dumper -static zfcp_dumper.o -lz |
| 117 |
- |
| 118 |
zfcp_dumper.o: zfcp_dumper.c zfcp_dumper.h |
| 119 |
- $(CC) $(CFLAGS) -c -I../../include zfcp_dumper.c |
| 120 |
|
| 121 |
install: $(ZFCPDUMP_RD) |
| 122 |
/bin/sh ./create_rd.sh -i |
| 123 |
@@ -29,6 +27,3 @@ |
| 124 |
clean clobber: |
| 125 |
/bin/sh ./create_rd.sh -r |
| 126 |
rm -f *.o |
| 127 |
- |
| 128 |
-%.o: %.c |
| 129 |
- $(CC) $(CFLAGS) -c -o $@ $< |
| 130 |
--- a/zfcpdump_v2/Makefile |
| 131 |
+++ b/zfcpdump_v2/Makefile |
| 132 |
@@ -6,12 +6,13 @@ |
| 133 |
LINUX_DIR := linux-$(LINUX_VERSION) |
| 134 |
E2FSPROGS := e2fsprogs-1.41.3 |
| 135 |
|
| 136 |
-CFLAGS += -D_FILE_OFFSET_BITS=64 |
| 137 |
+CPPFLAGS += -D_FILE_OFFSET_BITS=64 -DGZIP_SUPPORT |
| 138 |
+LDFLAGS += -static |
| 139 |
+LDLIBS += -lz |
| 140 |
|
| 141 |
all: zfcpdump.image |
| 142 |
|
| 143 |
zfcpdump: zfcpdump.c zfcpdump.h |
| 144 |
- $(CC) $(CFLAGS) -D GZIP_SUPPORT -static -o $@ zfcpdump.c -lz |
| 145 |
|
| 146 |
e2fsck: |
| 147 |
tar xfzv $(E2FSPROGS).tar.gz |
| 148 |
--- a/zipl/boot/Makefile |
| 149 |
+++ b/zipl/boot/Makefile |
| 150 |
@@ -3,9 +3,8 @@ |
| 151 |
|
| 152 |
S390_TOOLS_VERSION_EBCDIC := $(shell echo -n $(S390_TOOLS_RELEASE) | dd conv=ebcdic 2> /dev/null | hexdump -v -e '/1 "0x%02x,"' | sed 's/.$$//') |
| 153 |
|
| 154 |
-CFLAGS += -I../include -D__ASSEMBLY__ \ |
| 155 |
+CPPFLAGS += -I../include -D__ASSEMBLY__ \ |
| 156 |
-DS390_TOOLS_VERSION_EBCDIC=$(S390_TOOLS_VERSION_EBCDIC) |
| 157 |
-LDFLAGS = -O2 |
| 158 |
FILES := fba0.bin fba2.bin eckd0.bin eckd1a.bin eckd1b.bin eckd2.bin \ |
| 159 |
eckd2dump.bin tapedump.bin stage3.bin tape0.bin fba2dump.bin \ |
| 160 |
eckd2mvdump.bin |
| 161 |
@@ -16,7 +15,7 @@ |
| 162 |
%: %.S |
| 163 |
|
| 164 |
%.o: %.S |
| 165 |
- $(CC) $(CFLAGS) -c -o $@ $< |
| 166 |
+ $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< |
| 167 |
|
| 168 |
%.exec: %.o |
| 169 |
@STAGE=$$( \ |
Archives