| 1 |
vapier 08/12/24 19:48:53 |
| 2 |
|
| 3 |
Added: s390-tools-1.8.0-build.patch |
| 4 |
Log: |
| 5 |
Version bump. |
| 6 |
(Portage version: 2.2_rc17/cvs/Linux 2.6.27.8 x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 sys-apps/s390-tools/files/s390-tools-1.8.0-build.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/s390-tools/files/s390-tools-1.8.0-build.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/s390-tools/files/s390-tools-1.8.0-build.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: s390-tools-1.8.0-build.patch |
| 15 |
=================================================================== |
| 16 |
- fix errors in subdir makes |
| 17 |
- parallelize subdir runs |
| 18 |
- cleanup flag handling |
| 19 |
|
| 20 |
--- Makefile |
| 21 |
+++ Makefile |
| 22 |
@@ -9,17 +9,19 @@ ifeq ($(strip $(SYSFS)),true) |
| 23 |
SUB_DIRS+=libu2s |
| 24 |
endif |
| 25 |
|
| 26 |
-all: subdirs_make |
| 27 |
+SUB_DIRS_ALL = $(patsubst %,subdirs_all_%,$(SUB_DIRS)) |
| 28 |
+SUB_DIRS_CLEAN = $(patsubst %,subdirs_clean_%,$(SUB_DIRS)) |
| 29 |
+SUB_DIRS_INSTALL = $(patsubst %,subdirs_install_%,$(SUB_DIRS)) |
| 30 |
|
| 31 |
-subdirs_make: |
| 32 |
- set -e ; for dir in $(SUB_DIRS) ; do \ |
| 33 |
- ( cd $$dir ; $(MAKE) TOPDIR=$(TOPDIR) ARCH=$(ARCH); cd .. ); \ |
| 34 |
- done |
| 35 |
+all: $(SUB_DIRS_ALL) |
| 36 |
|
| 37 |
-clean: |
| 38 |
- set -e ; for dir in $(SUB_DIRS) ; do \ |
| 39 |
- ( cd $$dir ; $(MAKE) TOPDIR=$(TOPDIR) ARCH=$(ARCH) clean; cd .. ); \ |
| 40 |
- done |
| 41 |
+_subdir = $(patsubst subdirs_%,%,$@) |
| 42 |
+subdir = $(shell expr $(_subdir) : '[^_]*_\(.*\)') |
| 43 |
+subtarget = $(shell expr $(_subdir) : '\([^_]*\)_.*') |
| 44 |
+subdirs_%: |
| 45 |
+ $(MAKE) TOPDIR=$(TOPDIR) ARCH=$(ARCH) -C $(subdir) $(subtarget) |
| 46 |
+ |
| 47 |
+clean: $(SUB_DIRS_CLEAN) |
| 48 |
|
| 49 |
install: all |
| 50 |
for dir in $(INSTDIRS); do \ |
| 51 |
@@ -28,6 +30,4 @@ install: all |
| 52 |
for i in 1 2 3 4 5 6 7 8; do \ |
| 53 |
test -d $(MANDIR)/man$$i || $(INSTALL) -g $(GROUP) -o $(OWNER) -d $(MANDIR)/man$$i; \ |
| 54 |
done |
| 55 |
- set -e ; for dir in $(SUB_DIRS) ; do \ |
| 56 |
- ( cd $$dir ; $(MAKE) TOPDIR=$(TOPDIR) ARCH=$(ARCH) install; cd .. ); \ |
| 57 |
- done |
| 58 |
+ $(MAKE) $(SUB_DIRS_INSTALL) |
| 59 |
--- common.mak |
| 60 |
+++ common.mak |
| 61 |
@@ -22,7 +22,9 @@ STRIP = $(CROSS_COMPILE)strip |
| 62 |
OBJCOPY = $(CROSS_COMPILE)objcopy |
| 63 |
OBJDUMP = $(CROSS_COMPILE)objdump |
| 64 |
INSTALL = install # FIXME: We need s390-install (strip) |
| 65 |
-CFLAGS = $(OPT_FLAGS) -Wall -O3 -DS390_TOOLS_RELEASE=$(S390_TOOLS_RELEASE) |
| 66 |
+CFLAGS += $(OPT_FLAGS) -Wall |
| 67 |
+CXXFLAGS += $(OPT_FLAGS) -Wall |
| 68 |
+CPPFLAGS += -DS390_TOOLS_RELEASE=$(S390_TOOLS_RELEASE) |
| 69 |
export AS LD CC CPP AR NM STRIP OBJCOPY OBJDUMP INSTALL CFLAGS |
| 70 |
|
| 71 |
# Support alternate install root |
| 72 |
--- cpuplugd/Makefile |
| 73 |
+++ cpuplugd/Makefile |
| 74 |
@@ -7,18 +7,18 @@ |
| 75 |
|
| 76 |
include ../common.mak |
| 77 |
|
| 78 |
-CFLAGS += -I../include |
| 79 |
+CPPFLAGS += -I../include |
| 80 |
|
| 81 |
all: cpuplugd |
| 82 |
|
| 83 |
cpuplugd: daemon.c cpu.c info.c terms.c config.c main.c getopt.c mem.c vmstat.c cpuplugd.h |
| 84 |
- $(CC) $(CFLAGS) daemon.c cpu.c info.c terms.c config.c main.c getopt.c mem.c vmstat.c -o $@ -lpthread |
| 85 |
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $^ -lpthread |
| 86 |
|
| 87 |
clean: |
| 88 |
rm -f cpuplugd |
| 89 |
|
| 90 |
install: all |
| 91 |
- $(INSTALL) -s -g $(GROUP) -o $(OWNER) -m 755 cpuplugd $(USRSBINDIR) |
| 92 |
+ $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 cpuplugd $(USRSBINDIR) |
| 93 |
$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 man/cpuplugd.8 $(MANDIR)/man8 |
| 94 |
$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 man/cpuplugd.conf.5 $(MANDIR)/man5 |
| 95 |
|
| 96 |
--- dasdfmt/Makefile |
| 97 |
+++ dasdfmt/Makefile |
| 98 |
@@ -1,17 +1,16 @@ |
| 99 |
# Include common definitions |
| 100 |
include ../common.mak |
| 101 |
|
| 102 |
-CFLAGS += -I../include |
| 103 |
+CPPFLAGS += -I../include |
| 104 |
|
| 105 |
all: dasdfmt |
| 106 |
|
| 107 |
-dasdfmt: ../libvtoc/vtoc.o dasdfmt.c dasdfmt.h ../include/zt_common.h |
| 108 |
- $(CC) $(CFLAGS) -c dasdfmt.c -o dasdfmt.o |
| 109 |
- $(CC) dasdfmt.o ../libvtoc/vtoc.o -o dasdfmt |
| 110 |
+dasdfmt: ../libvtoc/vtoc.o dasdfmt.o |
| 111 |
+dasdfmt.o: dasdfmt.h ../include/zt_common.h |
| 112 |
|
| 113 |
install: all |
| 114 |
$(INSTALL) -d -m 755 $(BINDIR) $(MANDIR)/man8 |
| 115 |
- $(INSTALL) -s -g $(GROUP) -o $(OWNER) -m 755 dasdfmt $(BINDIR) |
| 116 |
+ $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 dasdfmt $(BINDIR) |
| 117 |
$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 dasdfmt.8 $(MANDIR)/man8 |
| 118 |
|
| 119 |
clean: |
| 120 |
--- dasdinfo/Makefile |
| 121 |
+++ dasdinfo/Makefile |
| 122 |
@@ -1,23 +1,20 @@ |
| 123 |
# Include common definitions |
| 124 |
include ../common.mak |
| 125 |
|
| 126 |
-CFLAGS += -I../include |
| 127 |
+CPPFLAGS += -I../include |
| 128 |
LIB_OBJECTS = |
| 129 |
-LIBS = |
| 130 |
ifeq ($(strip $(SYSFS)),true) |
| 131 |
LIB_OBJECTS+=../libu2s/u2s.o |
| 132 |
- CFLAGS+=-DSYSFS |
| 133 |
+ CPPFLAGS+=-DSYSFS |
| 134 |
endif |
| 135 |
|
| 136 |
all: dasdinfo |
| 137 |
|
| 138 |
-dasdinfo: $(LIB_OBJECTS) dasdinfo.c |
| 139 |
- $(CC) $(CFLAGS) -c dasdinfo.c -o dasdinfo.o |
| 140 |
- $(CC) dasdinfo.o $(LIB_OBJECTS) -o dasdinfo $(LIBS) |
| 141 |
+dasdinfo: $(LIB_OBJECTS) dasdinfo.o |
| 142 |
|
| 143 |
install: all |
| 144 |
$(INSTALL) -d -m 755 $(BINDIR) $(MANDIR)/man8 |
| 145 |
- $(INSTALL) -s -g $(GROUP) -o $(OWNER) -m 755 dasdinfo $(BINDIR) |
| 146 |
+ $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 dasdinfo $(BINDIR) |
| 147 |
$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 dasdinfo.8 $(MANDIR)/man8 |
| 148 |
|
| 149 |
clean: |
| 150 |
--- dasdview/Makefile |
| 151 |
+++ dasdview/Makefile |
| 152 |
@@ -1,23 +1,21 @@ |
| 153 |
# Include common definitions |
| 154 |
include ../common.mak |
| 155 |
|
| 156 |
-CFLAGS += -I../include |
| 157 |
+CPPFLAGS += -I../include |
| 158 |
LIB_OBJECTS = ../libvtoc/vtoc.o |
| 159 |
-LIBS = |
| 160 |
ifeq ($(strip $(SYSFS)),true) |
| 161 |
LIB_OBJECTS+=../libu2s/u2s.o |
| 162 |
- CFLAGS+=-DSYSFS |
| 163 |
+ CPPFLAGS+=-DSYSFS |
| 164 |
endif |
| 165 |
|
| 166 |
all: dasdview |
| 167 |
|
| 168 |
-dasdview: $(LIB_OBJECTS) dasdview.c dasdview.h |
| 169 |
- $(CC) $(CFLAGS) -c dasdview.c -o dasdview.o |
| 170 |
- $(CC) dasdview.o $(LIB_OBJECTS) -o dasdview $(LIBS) |
| 171 |
+dasdview.o: dasdview.h |
| 172 |
+dasdview: $(LIB_OBJECTS) dasdview.o |
| 173 |
|
| 174 |
install: all |
| 175 |
$(INSTALL) -d -m 755 $(BINDIR) $(MANDIR)/man8 |
| 176 |
- $(INSTALL) -s -g $(GROUP) -o $(OWNER) -m 755 dasdview $(BINDIR) |
| 177 |
+ $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 dasdview $(BINDIR) |
| 178 |
$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 dasdview.8 $(MANDIR)/man8 |
| 179 |
|
| 180 |
clean: |
| 181 |
--- fdasd/Makefile |
| 182 |
+++ fdasd/Makefile |
| 183 |
@@ -1,17 +1,16 @@ |
| 184 |
# Include common definitions |
| 185 |
include ../common.mak |
| 186 |
|
| 187 |
-CFLAGS += -I../include |
| 188 |
+CPPFLAGS += -I../include |
| 189 |
|
| 190 |
all: fdasd |
| 191 |
|
| 192 |
-fdasd: ../libvtoc/vtoc.o fdasd.c fdasd.h |
| 193 |
- $(CC) $(CFLAGS) -c fdasd.c -o fdasd.o |
| 194 |
- $(CC) fdasd.o ../libvtoc/vtoc.o -o fdasd |
| 195 |
+fdasd: ../libvtoc/vtoc.o fdasd.o fdasd.h |
| 196 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ fdasd.o ../libvtoc/vtoc.o |
| 197 |
|
| 198 |
install: all |
| 199 |
$(INSTALL) -d -m 755 $(BINDIR) $(MANDIR)/man8 |
| 200 |
- $(INSTALL) -s -g $(GROUP) -o $(OWNER) -m 755 fdasd $(BINDIR) |
| 201 |
+ $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 fdasd $(BINDIR) |
| 202 |
$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 fdasd.8 $(MANDIR)/man8 |
| 203 |
|
| 204 |
clean: |
| 205 |
--- ip_watcher/Makefile |
| 206 |
+++ ip_watcher/Makefile |
| 207 |
@@ -13,7 +13,7 @@ install: ip_watcher.pl xcec-bridge start_hsnc.sh |
| 208 |
chown $(OWNER).$(GROUP) $(USRSBINDIR)/start_hsnc.sh; \ |
| 209 |
chmod 755 $(USRSBINDIR)/start_hsnc.sh; \ |
| 210 |
$(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 ip_watcher.pl $(USRSBINDIR) |
| 211 |
- $(INSTALL) -s -g $(GROUP) -o $(OWNER) -m 755 xcec-bridge $(USRSBINDIR) |
| 212 |
+ $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 xcec-bridge $(USRSBINDIR) |
| 213 |
|
| 214 |
xcec-bridge: xcec-bridge.c |
| 215 |
$(CC) $(CFLAGS) -o xcec-bridge xcec-bridge.c |
| 216 |
--- ipl_tools/Makefile |
| 217 |
+++ ipl_tools/Makefile |
| 218 |
@@ -7,12 +7,12 @@ |
| 219 |
|
| 220 |
include ../common.mak |
| 221 |
|
| 222 |
-CFLAGS += -I../include |
| 223 |
+CPPFLAGS += -I../include |
| 224 |
|
| 225 |
all: chreipl |
| 226 |
|
| 227 |
chreipl: chreipl.h main.c getopt.c ccw.c fcp.c system.c sa.c ipl.c |
| 228 |
- $(CC) $(CFLAGS) main.c getopt.c ccw.c fcp.c system.c sa.c ipl.c -o $@ |
| 229 |
+ $(CC) $(CFLAGS) $(CPPFLAGS) main.c getopt.c ccw.c fcp.c system.c sa.c ipl.c -o $@ |
| 230 |
ln -sf chreipl lsreipl |
| 231 |
ln -sf chreipl chshut |
| 232 |
ln -sf chreipl lsshut |
| 233 |
@@ -24,7 +24,7 @@ clean: |
| 234 |
rm -rf lsshut |
| 235 |
|
| 236 |
install: all |
| 237 |
- $(INSTALL) -s -g $(GROUP) -o $(OWNER) -m 755 chreipl $(USRSBINDIR) |
| 238 |
+ $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 chreipl $(USRSBINDIR) |
| 239 |
ln -f -s chreipl $(USRSBINDIR)/lsreipl |
| 240 |
ln -f -s chreipl $(USRSBINDIR)/chshut |
| 241 |
ln -f -s chreipl $(USRSBINDIR)/lsshut |
| 242 |
--- libu2s/Makefile |
| 243 |
+++ libu2s/Makefile |
| 244 |
@@ -1,12 +1,11 @@ |
| 245 |
# Include common definitions |
| 246 |
include ../common.mak |
| 247 |
|
| 248 |
-CFLAGS += -I../include |
| 249 |
+CPPFLAGS += -I../include |
| 250 |
|
| 251 |
all: u2s.o |
| 252 |
|
| 253 |
u2s.o: u2s.c ../include/u2s.h |
| 254 |
- $(CC) $(CFLAGS) -c u2s.c -o u2s.o |
| 255 |
|
| 256 |
install: |
| 257 |
|
| 258 |
--- libvtoc/Makefile |
| 259 |
+++ libvtoc/Makefile |
| 260 |
@@ -1,12 +1,11 @@ |
| 261 |
# Include common definitions |
| 262 |
include ../common.mak |
| 263 |
|
| 264 |
-CFLAGS += -I../include |
| 265 |
+CPPFLAGS += -I../include |
| 266 |
|
| 267 |
all: vtoc.o |
| 268 |
|
| 269 |
vtoc.o: vtoc.c ../include/vtoc.h |
| 270 |
- $(CC) $(CFLAGS) -c vtoc.c -o vtoc.o |
| 271 |
|
| 272 |
install: |
| 273 |
|
| 274 |
--- mon_tools/Makefile |
| 275 |
+++ mon_tools/Makefile |
| 276 |
@@ -1,20 +1,16 @@ |
| 277 |
# Include common definitions |
| 278 |
include ../common.mak |
| 279 |
|
| 280 |
-CFLAGS += -I../include |
| 281 |
+CPPFLAGS += -I../include |
| 282 |
|
| 283 |
all: mon_fsstatd mon_procd |
| 284 |
|
| 285 |
-mon_fsstatd: mon_fsstatd.c mon_fsstatd.h |
| 286 |
- $(CC) $(CFLAGS) -o mon_fsstatd mon_fsstatd.c |
| 287 |
- |
| 288 |
-mon_procd: mon_procd.c mon_procd.h |
| 289 |
- $(CC) $(CFLAGS) -o mon_procd mon_procd.c |
| 290 |
+mon_fsstatd.c mon_procd.c: mon_fsstatd.h |
| 291 |
|
| 292 |
install: all |
| 293 |
- $(INSTALL) -s -g $(GROUP) -o $(OWNER) -m 755 mon_fsstatd $(USRSBINDIR) |
| 294 |
+ $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 mon_fsstatd $(USRSBINDIR) |
| 295 |
$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 mon_fsstatd.8 $(MANDIR)/man8 |
| 296 |
- $(INSTALL) -s -g $(GROUP) -o $(OWNER) -m 755 mon_procd $(USRSBINDIR) |
| 297 |
+ $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 mon_procd $(USRSBINDIR) |
| 298 |
$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 mon_procd.8 $(MANDIR)/man8 |
| 299 |
|
| 300 |
clean: |
| 301 |
--- osasnmpd/Makefile |
| 302 |
+++ osasnmpd/Makefile |
| 303 |
@@ -5,14 +5,14 @@ include ../common.mak |
| 304 |
DIRS = osasnmpd-2.4 osasnmpd-2.6 |
| 305 |
|
| 306 |
all: |
| 307 |
- for i in $(DIRS); do make -C $$i; done |
| 308 |
+ set -e; for i in $(DIRS); do make -C $$i; done |
| 309 |
|
| 310 |
clean: |
| 311 |
- for i in $(DIRS); do make clean -C $$i; done |
| 312 |
+ set -e; for i in $(DIRS); do make clean -C $$i; done |
| 313 |
|
| 314 |
install: all |
| 315 |
$(INSTALL) -d -m 755 $(USRSBINDIR) $(MANDIR)/man8 |
| 316 |
- for i in $(DIRS); do make install -C $$i; done |
| 317 |
+ set -e; for i in $(DIRS); do make install -C $$i; done |
| 318 |
$(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 osasnmpd $(USRSBINDIR) |
| 319 |
$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 osasnmpd.8 $(MANDIR)/man8 |
| 320 |
|
| 321 |
--- osasnmpd/Makefile.rules |
| 322 |
+++ osasnmpd/Makefile.rules |
| 323 |
@@ -1,12 +1,12 @@ |
| 324 |
#Genarl rules |
| 325 |
|
| 326 |
ifeq ($(strip $(shell which net-snmp-config 2>/dev/null)),) |
| 327 |
-LIBS = -lucdagent -lucdmibs -lsnmp -lrpmdb -lrpm -lpopt -lrpmio -lwrap -lnsl -ldl -lcrypto |
| 328 |
+LDLIBS = -lucdagent -lucdmibs -lsnmp -lrpmdb -lrpm -lpopt -lrpmio -lwrap -lnsl -ldl -lcrypto |
| 329 |
else |
| 330 |
-LIBS = `net-snmp-config --agent-libs` |
| 331 |
+LDLIBS = `net-snmp-config --agent-libs` |
| 332 |
CFLAGS += `net-snmp-config --cflags` |
| 333 |
-CFLAGS += -DNETSNMP5 |
| 334 |
+CPPFLAGS += -DNETSNMP5 |
| 335 |
endif |
| 336 |
-CFLAGS += -I../../include |
| 337 |
+CPPFLAGS += -I../../include |
| 338 |
|
| 339 |
OBJS = ibmOSAMib.o ibmOSAMibUtil.o osasnmpd.o |
| 340 |
--- osasnmpd/osasnmpd-2.4/Makefile |
| 341 |
+++ osasnmpd/osasnmpd-2.4/Makefile |
| 342 |
@@ -5,10 +5,10 @@ include ../Makefile.rules |
| 343 |
all: osasnmpd-2.4 |
| 344 |
|
| 345 |
osasnmpd-2.4: $(OBJS) |
| 346 |
- $(CC) -o osasnmpd-2.4 $(OBJS) $(LIBS) |
| 347 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS) |
| 348 |
|
| 349 |
install: osasnmpd-2.4 |
| 350 |
- $(INSTALL) -s -g $(GROUP) -o $(OWNER) -m 755 osasnmpd-2.4 $(USRSBINDIR) |
| 351 |
+ $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 osasnmpd-2.4 $(USRSBINDIR) |
| 352 |
|
| 353 |
clean: |
| 354 |
rm -f $(OBJS) osasnmpd-2.4 core |
| 355 |
--- osasnmpd/osasnmpd-2.6/Makefile |
| 356 |
+++ osasnmpd/osasnmpd-2.6/Makefile |
| 357 |
@@ -5,10 +5,10 @@ include ../Makefile.rules |
| 358 |
all: osasnmpd-2.6 |
| 359 |
|
| 360 |
osasnmpd-2.6: $(OBJS) |
| 361 |
- $(CC) $(CFLAGS) -o osasnmpd-2.6 $(OBJS) $(LIBS) |
| 362 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS) |
| 363 |
|
| 364 |
install: osasnmpd-2.6 |
| 365 |
- $(INSTALL) -s -g $(GROUP) -o $(OWNER) -m 755 osasnmpd-2.6 $(USRSBINDIR) |
| 366 |
+ $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 osasnmpd-2.6 $(USRSBINDIR) |
| 367 |
|
| 368 |
clean: |
| 369 |
rm -f $(OBJS) osasnmpd-2.6 core |
| 370 |
--- qetharp/Makefile |
| 371 |
+++ qetharp/Makefile |
| 372 |
@@ -1,24 +1,18 @@ |
| 373 |
# Common definitions |
| 374 |
include ../common.mak |
| 375 |
|
| 376 |
-CFLAGS += -I../include |
| 377 |
+CPPFLAGS += -I../include |
| 378 |
|
| 379 |
-all: qetharp-2.4 qetharp-2.6 |
| 380 |
- |
| 381 |
-qetharp-2.4: qetharp24.c |
| 382 |
- $(CC) $(CFLAGS) -o qetharp-2.4 qetharp24.c |
| 383 |
- |
| 384 |
-qetharp-2.6: qetharp26.c |
| 385 |
- $(CC) $(CFLAGS) -o qetharp-2.6 qetharp26.c |
| 386 |
+all: qetharp24 qetharp26 |
| 387 |
|
| 388 |
install: all |
| 389 |
$(INSTALL) -d -m 755 $(MANDIR)/man8 $(BINDIR) |
| 390 |
$(INSTALL) -m 755 qetharp $(BINDIR) |
| 391 |
- $(INSTALL) -s -m 755 qetharp-2.4 $(BINDIR) |
| 392 |
- $(INSTALL) -s -m 755 qetharp-2.6 $(BINDIR) |
| 393 |
+ $(INSTALL) -m 755 qetharp24 $(BINDIR)/qetharp-2.4 |
| 394 |
+ $(INSTALL) -m 755 qetharp26 $(BINDIR)/qetharp-2.6 |
| 395 |
$(INSTALL) -m 644 qetharp.8 $(MANDIR)/man8 |
| 396 |
|
| 397 |
clean: |
| 398 |
- rm -f qetharp-2.4 qetharp-2.6 *.o *~ core |
| 399 |
+ rm -f qetharp24 qetharp26 *.o *~ core |
| 400 |
|
| 401 |
.PHONY: all install clean |
| 402 |
--- tape390/Makefile |
| 403 |
+++ tape390/Makefile |
| 404 |
@@ -1,22 +1,20 @@ |
| 405 |
# Common definitions |
| 406 |
include ../common.mak |
| 407 |
|
| 408 |
-CFLAGS += -D_FILE_OFFSET_BITS=64 -I../include -L. |
| 409 |
+CPPFLAGS += -D_FILE_OFFSET_BITS=64 -I../include -L. |
| 410 |
|
| 411 |
all: tape390_display tape390_crypt |
| 412 |
|
| 413 |
-tape390_display: tape390_display.c tape390_common.c tape390_common.h |
| 414 |
- $(CC) $(CFLAGS) -o $@ tape390_display.c tape390_common.c |
| 415 |
+tape390_display: tape390_display.o tape390_common.o tape390_common.h |
| 416 |
|
| 417 |
-tape390_crypt: tape390_crypt.c tape390_common.c tape390_common.h |
| 418 |
- $(CC) $(CFLAGS) -o $@ tape390_crypt.c tape390_common.c |
| 419 |
+tape390_crypt: tape390_crypt.o tape390_common.o tape390_common.h |
| 420 |
|
| 421 |
install: all |
| 422 |
$(INSTALL) -d -m 755 $(BINDIR) $(MANDIR)/man8 |
| 423 |
- $(INSTALL) -s -g $(GROUP) -o $(OWNER) -m 755 tape390_display $(BINDIR) |
| 424 |
+ $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 tape390_display $(BINDIR) |
| 425 |
$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 tape390_display.8 \ |
| 426 |
$(MANDIR)/man8 |
| 427 |
- $(INSTALL) -s -g $(GROUP) -o $(OWNER) -m 755 tape390_crypt $(BINDIR) |
| 428 |
+ $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 tape390_crypt $(BINDIR) |
| 429 |
$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 tape390_crypt.8 \ |
| 430 |
$(MANDIR)/man8 |
| 431 |
|
| 432 |
--- tunedasd/src/Makefile |
| 433 |
+++ tunedasd/src/Makefile |
| 434 |
@@ -8,14 +8,12 @@ includes = $(wildcard ../include/*.h) |
| 435 |
all: tunedasd |
| 436 |
|
| 437 |
tunedasd: $(objects) |
| 438 |
- $(CC) $(objects) -o tunedasd |
| 439 |
|
| 440 |
-%.o: %.c $(includes) Makefile |
| 441 |
- $(CC) $(CFLAGS) -c -o $@ $< |
| 442 |
+%.c: $(includes) Makefile |
| 443 |
|
| 444 |
install: all |
| 445 |
$(INSTALL) -d -m 755 $(BINDIR) |
| 446 |
- $(INSTALL) -s -g $(GROUP) -o $(OWNER) -m 755 tunedasd $(BINDIR) |
| 447 |
+ $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 tunedasd $(BINDIR) |
| 448 |
|
| 449 |
clean: |
| 450 |
rm -f *.o tunedasd |
| 451 |
--- vmconvert/Makefile |
| 452 |
+++ vmconvert/Makefile |
| 453 |
@@ -1,7 +1,7 @@ |
| 454 |
# Common definitions |
| 455 |
include ../common.mak |
| 456 |
|
| 457 |
-CXXFLAGS = $(CFLAGS) -D_FILE_OFFSET_BITS=64 -I../include |
| 458 |
+CPPFLAGS += -D_FILE_OFFSET_BITS=64 -I../include |
| 459 |
OBJS = main.o lkcd_dump.o vm_dump.o register_content.o dump.o |
| 460 |
|
| 461 |
all: vmconvert |
| 462 |
@@ -12,11 +12,11 @@ dump.o: dump.cpp dump.h |
| 463 |
register_content.o: register_content.cpp register_content.h |
| 464 |
|
| 465 |
vmconvert: $(OBJS) |
| 466 |
- $(CXX) $(CXXFLAGS) -o vmconvert $(OBJS) -lz |
| 467 |
+ $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $^ -lz |
| 468 |
|
| 469 |
install: all |
| 470 |
$(INSTALL) -d -m 755 $(USRBINDIR) $(MANDIR)/man8 |
| 471 |
- $(INSTALL) -s -g $(GROUP) -o $(OWNER) -m 755 vmconvert $(USRBINDIR) |
| 472 |
+ $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 vmconvert $(USRBINDIR) |
| 473 |
$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 vmconvert.8 $(MANDIR)/man8 |
| 474 |
|
| 475 |
clean: |
| 476 |
--- vmcp/Makefile |
| 477 |
+++ vmcp/Makefile |
| 478 |
@@ -1,17 +1,16 @@ |
| 479 |
# Include common definitions |
| 480 |
include ../common.mak |
| 481 |
|
| 482 |
-CFLAGS += -I../include |
| 483 |
-LIBS = |
| 484 |
+CPPFLAGS += -I../include |
| 485 |
|
| 486 |
all: vmcp |
| 487 |
|
| 488 |
-vmcp: vmcp.c vmcp.h ../include/zt_common.h |
| 489 |
- $(CC) $(CFLAGS) vmcp.c -o vmcp |
| 490 |
+vmcp: vmcp.o |
| 491 |
+vmcp.o: vmcp.h ../include/zt_common.h |
| 492 |
|
| 493 |
install: all |
| 494 |
$(INSTALL) -d -m 755 $(BINDIR) $(MANDIR)/man8 |
| 495 |
- $(INSTALL) -s -g $(GROUP) -o $(OWNER) -m 755 vmcp $(BINDIR) |
| 496 |
+ $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 vmcp $(BINDIR) |
| 497 |
$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 vmcp.8 $(MANDIR)/man8 |
| 498 |
|
| 499 |
clean: |
| 500 |
--- vmur/Makefile |
| 501 |
+++ vmur/Makefile |
| 502 |
@@ -1,16 +1,17 @@ |
| 503 |
# Common definitions |
| 504 |
include ../common.mak |
| 505 |
|
| 506 |
-CFLAGS += -D_FILE_OFFSET_BITS=64 -I../include -L. |
| 507 |
+CPPFLAGS += -D_FILE_OFFSET_BITS=64 -I../include |
| 508 |
+LDFLAGS += -L. |
| 509 |
|
| 510 |
all: vmur |
| 511 |
|
| 512 |
-vmur: vmur.c vmur.h |
| 513 |
- $(CC) $(CFLAGS) -o $@ vmur.c |
| 514 |
+vmur: vmur.o |
| 515 |
+vmur.o: vmur.h |
| 516 |
|
| 517 |
install: all |
| 518 |
$(INSTALL) -d -m 755 $(BINDIR) $(MANDIR)/man8 |
| 519 |
- $(INSTALL) -s -g $(GROUP) -o $(OWNER) -m 755 vmur $(BINDIR) |
| 520 |
+ $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 vmur $(BINDIR) |
| 521 |
$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 vmur.8 \ |
| 522 |
$(MANDIR)/man8 |
| 523 |
|
| 524 |
--- zdump/Makefile |
| 525 |
+++ zdump/Makefile |
| 526 |
@@ -1,17 +1,13 @@ |
| 527 |
# Common definitions |
| 528 |
include ../common.mak |
| 529 |
|
| 530 |
-CFLAGS += -D_FILE_OFFSET_BITS=64 -I../include |
| 531 |
-SRCS = zgetdump.c |
| 532 |
+CPPFLAGS += -D_FILE_OFFSET_BITS=64 -I../include |
| 533 |
|
| 534 |
all: zgetdump |
| 535 |
|
| 536 |
-zgetdump: zgetdump.c |
| 537 |
- $(CC) $(CFLAGS) -o zgetdump $(SRCS) |
| 538 |
- |
| 539 |
install: all |
| 540 |
$(INSTALL) -d -m 755 $(MANDIR)/man8 $(BINDIR) |
| 541 |
- $(INSTALL) -s -m 755 zgetdump $(BINDIR) |
| 542 |
+ $(INSTALL) -m 755 zgetdump $(BINDIR) |
| 543 |
$(INSTALL) -m 644 zgetdump.8 $(MANDIR)/man8 |
| 544 |
|
| 545 |
clean: |
| 546 |
--- zfcpdump/ramdisk/Makefile |
| 547 |
+++ zfcpdump/ramdisk/Makefile |
| 548 |
@@ -12,16 +12,14 @@ ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/ar |
| 549 |
|
| 550 |
all: $(ZFCPDUMP_RD) |
| 551 |
|
| 552 |
-CFLAGS += -D_FILE_OFFSET_BITS=64 |
| 553 |
+CPPFLAGS += -D_FILE_OFFSET_BITS=64 -I../../include |
| 554 |
+LDFLAGS += -static |
| 555 |
+LDLIBS += -lz |
| 556 |
|
| 557 |
$(ZFCPDUMP_RD): zfcp_dumper |
| 558 |
/bin/sh ./create_rd.sh $(ARCH) |
| 559 |
|
| 560 |
-zfcp_dumper: zfcp_dumper.o |
| 561 |
- $(CC) -o zfcp_dumper -static zfcp_dumper.o -lz |
| 562 |
- |
| 563 |
zfcp_dumper.o: zfcp_dumper.c zfcp_dumper.h |
| 564 |
- $(CC) $(CFLAGS) -c -I../../include zfcp_dumper.c |
| 565 |
|
| 566 |
install: $(ZFCPDUMP_RD) |
| 567 |
/bin/sh ./create_rd.sh -i |
| 568 |
--- zfcpdump_v2/Makefile |
| 569 |
+++ zfcpdump_v2/Makefile |
| 570 |
@@ -6,12 +6,13 @@ LINUX_VERSION := 2.6.27 |
| 571 |
LINUX_DIR := linux-$(LINUX_VERSION) |
| 572 |
E2FSPROGS := e2fsprogs-1.41.3 |
| 573 |
|
| 574 |
-CFLAGS += -D_FILE_OFFSET_BITS=64 |
| 575 |
+CPPFLAGS += -D_FILE_OFFSET_BITS=64 -DGZIP_SUPPORT |
| 576 |
+LDFLAGS += -static |
| 577 |
+LDLIBS += -lz |
| 578 |
|
| 579 |
all: zfcpdump.image |
| 580 |
|
| 581 |
zfcpdump: zfcpdump.c zfcpdump.h |
| 582 |
- $(CC) $(CFLAGS) -D GZIP_SUPPORT -static -o $@ zfcpdump.c -lz |
| 583 |
|
| 584 |
e2fsck: |
| 585 |
tar xfzv $(E2FSPROGS).tar.gz |
| 586 |
--- ziomon/Makefile |
| 587 |
+++ ziomon/Makefile |
| 588 |
@@ -2,21 +2,20 @@ |
| 589 |
include ../common.mak |
| 590 |
|
| 591 |
#CFLAGS+=-Wall -Wundef -Wstrict-prototypes -Wno-trigraphs -g -I../include |
| 592 |
-CFLAGS+=-Wall -Wundef -Wstrict-prototypes -Wno-trigraphs -DNDEBUG -O3 -I../include |
| 593 |
+CFLAGS+=-Wall -Wundef -Wstrict-prototypes -Wno-trigraphs |
| 594 |
+CPPFLAGS+=-DNDEBUG -I../include |
| 595 |
|
| 596 |
all: ziomon_util ziomon_mgr ziomon_zfcpdd |
| 597 |
|
| 598 |
-ziomon_mgr: ziomon_dacc.o ziomon_util.o ziomon_mgr.c ziomon_tools.o ziomon_zfcpdd.o ziomon_msg_tools.o |
| 599 |
- $(CC) -DWITH_MAIN $(CFLAGS) ziomon_mgr.c ziomon_dacc.o ziomon_tools.o ziomon_util.o ziomon_zfcpdd.o ziomon_msg_tools.o -o $@ |
| 600 |
+ziomon_mgr: ziomon_mgr.c ziomon_dacc.o ziomon_tools.o ziomon_util.o ziomon_zfcpdd.o ziomon_msg_tools.o |
| 601 |
+ $(CC) $(CFLAGS) -DWITH_MAIN $(CPPFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS) |
| 602 |
|
| 603 |
ziomon_util: ziomon_util.c ziomon_util.h ziomon_tools.o |
| 604 |
- $(CC) -DWITH_MAIN $(CFLAGS) ziomon_tools.o $< -o $@ |
| 605 |
+ $(CC) $(CFLAGS) -DWITH_MAIN $(CPPFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS) |
| 606 |
|
| 607 |
ziomon_zfcpdd: ziomon_zfcpdd.c ziomon_zfcpdd.h ziomon_tools.o |
| 608 |
- $(CC) -DWITH_MAIN $(CFLAGS) ziomon_tools.o -lrt $< -o $@ |
| 609 |
- |
| 610 |
-%.o: %.c |
| 611 |
- $(CC) $(CFLAGS) -c $< |
| 612 |
+ $(CC) $(CFLAGS) -DWITH_MAIN $(CPPFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS) |
| 613 |
+ziomon_zfcpdd: LDLIBS += -lrt |
| 614 |
|
| 615 |
install: all |
| 616 |
cat ziomon | sed -e 's/%S390_TOOLS_VERSION%/$(S390_TOOLS_RELEASE)/' > $(BINDIR)/ziomon; |
| 617 |
--- zipl/boot/Makefile |
| 618 |
+++ zipl/boot/Makefile |
| 619 |
@@ -1,9 +1,8 @@ |
| 620 |
# Common definitions |
| 621 |
include ../../common.mak |
| 622 |
|
| 623 |
-CFLAGS += -I../include -D__ASSEMBLY__ -DVERSION=$(VERSION) \ |
| 624 |
+CPPFLAGS += -I../include -D__ASSEMBLY__ -DVERSION=$(VERSION) \ |
| 625 |
-DRELEASE=$(RELEASE) -DPATCHLEVEL=$(PATCHLEVEL) |
| 626 |
-LDFLAGS = -O2 |
| 627 |
HEADERS = fba0.h fba2.h eckd0.h eckd1a.h eckd1b.h eckd2.h eckd2dump.h \ |
| 628 |
tapedump.h stage3.h tape0.h fba2dump.h eckd2mvdump.h |
| 629 |
|
| 630 |
@@ -14,7 +13,7 @@ all: data.c tape0.bin |
| 631 |
|
| 632 |
%.o: %.S |
| 633 |
echo "$(CC) $(CFLAGS) -c -o $@ $<"; \ |
| 634 |
- $(CC) $(CFLAGS) -c -o $@ $< |
| 635 |
+ $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< |
| 636 |
|
| 637 |
%.exec: %.o |
| 638 |
@STAGE=$$( \ |
| 639 |
@@ -33,7 +32,7 @@ all: data.c tape0.bin |
| 640 |
3) SFLAGS="-nostdlib -Wl,-Ttext,0xA000";; \ |
| 641 |
esac; \ |
| 642 |
echo "$(CC) $(LDFLAGS) -o $@ $$SFLAGS $<"; \ |
| 643 |
- $(CC) $(LDFLAGS) -o $@ $$SFLAGS $< |
| 644 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $$SFLAGS $< |
| 645 |
|
| 646 |
%.bin: %.exec |
| 647 |
$(OBJCOPY) -O binary --only-section .text $< $@ |
| 648 |
--- zipl/src/Makefile |
| 649 |
+++ zipl/src/Makefile |
| 650 |
@@ -1,7 +1,7 @@ |
| 651 |
# Common definitions |
| 652 |
include ../../common.mak |
| 653 |
|
| 654 |
-CFLAGS += -I../include -I../boot -I../../include \ |
| 655 |
+CPPFLAGS += -I../include -I../boot -I../../include \ |
| 656 |
-DZFCPDUMP_DIR=$(ZFCPDUMP_DIR) \ |
| 657 |
-DZFCPDUMP_IMAGE=$(ZFCPDUMP_IMAGE) -DZFCPDUMP_RD=$(ZFCPDUMP_RD) \ |
| 658 |
-D_FILE_OFFSET_BITS=64 |
| 659 |
@@ -12,15 +12,14 @@ includes = $(wildcard ../include/*.h) |
| 660 |
all: zipl |
| 661 |
|
| 662 |
zipl: ../boot/data.c $(objects) |
| 663 |
- $(CC) $(objects) -o zipl |
| 664 |
+ $(CC) $(CFLAGS) $(LDFLAGS) $(objects) -o $@ |
| 665 |
|
| 666 |
-%.o: %.c $(includes) Makefile |
| 667 |
- $(CC) $(CFLAGS) -c -o $@ $< |
| 668 |
+%.c: $(includes) Makefile |
| 669 |
|
| 670 |
install: all |
| 671 |
@echo $(INSTALL) |
| 672 |
$(INSTALL) -d -m 755 $(BINDIR) |
| 673 |
- $(INSTALL) -s -c zipl $(BINDIR) |
| 674 |
+ $(INSTALL) -c zipl $(BINDIR) |
| 675 |
|
| 676 |
clean: |
| 677 |
rm -f *.o zipl |
Archives