+++ /dev/null
- - fix errors in subdir makes
- - parallelize subdir runs
- - cleanup flag handling
-
---- a/Makefile
-+++ b/Makefile
-@@ -9,19 +9,19 @@
- vmconvert vmcp man mon_tools dasdinfo vmur cpuplugd ipl_tools \
- ziomon iucvterm hyptop cmsfs-fuse qethqoat
-
--all: subdirs_make
-+SUB_DIRS_ALL = $(patsubst %,subdirs_all_%,$(SUB_DIRS))
-+SUB_DIRS_CLEAN = $(patsubst %,subdirs_clean_%,$(SUB_DIRS))
-+SUB_DIRS_INSTALL = $(patsubst %,subdirs_install_%,$(SUB_DIRS))
-
--subdirs_make:
-- set -e ; for dir in $(SUB_DIRS) ; do \
-- cd $$dir ; $(MAKE) TOPDIR=$(TOPDIR) ARCH=$(ARCH); cd ..; \
-- done
-+all: $(SUB_DIRS_ALL)
-
--clean:
-- set -e ; for dir in $(SUB_DIRS) ; do \
-- cd $$dir ; $(MAKE) TOPDIR=$(TOPDIR) ARCH=$(ARCH) clean; cd ..; \
-- done
-+_subdir = $(patsubst subdirs_%,%,$@)
-+subdir = $(shell expr $(_subdir) : '[^_]*_\(.*\)')
-+subtarget = $(shell expr $(_subdir) : '\([^_]*\)_.*')
-+subdirs_%:
-+ $(MAKE) TOPDIR=$(TOPDIR) ARCH=$(ARCH) -C $(subdir) $(subtarget)
-+
-+clean: $(SUB_DIRS_CLEAN)
-
- install:
-- set -e ; for dir in $(SUB_DIRS) ; do \
-- cd $$dir ; $(MAKE) TOPDIR=$(TOPDIR) ARCH=$(ARCH) install; cd ..; \
-- done
-+ $(MAKE) $(SUB_DIRS_INSTALL)
---- a/common.mak
-+++ b/common.mak
-@@ -17,10 +17,10 @@
- # Cross Compiling Support
- CROSS_COMPILE =
- AS = $(call echocmd," AS ",/$@)$(CROSS_COMPILE)as
--LINK = $(call echocmd," LINK ",/$@)$(CROSS_COMPILE)gcc
-+LINK = $(call echocmd," LINK ",/$@)$(CROSS_COMPILE)gcc $(CFLAGS) $(LDFLAGS)
- LD = $(call echocmd," LD ",/$@)$(CROSS_COMPILE)ld
- CC = $(call echocmd," CC ",/$@)$(CROSS_COMPILE)gcc
--LINKXX = $(call echocmd," LINKXX ",/$@)$(CROSS_COMPILE)g++
-+LINKXX = $(call echocmd," LINKXX ",/$@)$(CROSS_COMPILE)g++ $(CXXFLAGS) $(LDFLAGS)
- CXX = $(call echocmd," CXX ",/$@)$(CROSS_COMPILE)g++
- CPP = $(call echocmd," CPP ",/$@)$(CROSS_COMPILE)gcc -E
- AR = $(call echocmd," AR ",/$@)$(CROSS_COMPILE)ar
-@@ -41,14 +41,13 @@
- ZFCPDUMP_RD = zfcpdump.rd
- export ZFCPDUMP_DIR ZFCPDUMP_IMAGE ZFCPDUMP_RD
-
--CFLAGS = $(WARNFLAGS) -O3 -DS390_TOOLS_RELEASE=$(S390_TOOLS_RELEASE) \
-- -DS390_TOOLS_LIBDIR=$(TOOLS_LIBDIR) \
-- -DS390_TOOLS_SYSCONFDIR=$(SYSCONFDIR) \
-- -g $(OPT_FLAGS)
--CXXFLAGS = $(WARNFLAGS) -O3 -DS390_TOOLS_RELEASE=$(S390_TOOLS_RELEASE) \
-- -DS390_TOOLS_LIBDIR=$(TOOLS_LIBDIR) \
-- -DS390_TOOLS_SYSCONFDIR=$(SYSCONFDIR) \
-- -g $(OPT_FLAGS)
-+CFLAGS += $(WARNFLAGS) $(OPT_FLAGS)
-+CXXFLAGS += $(WARNFLAGS) $(OPT_FLAGS)
-+CPPFLAGS += \
-+ -DS390_TOOLS_RELEASE=$(S390_TOOLS_RELEASE) \
-+ -DS390_TOOLS_LIBDIR=$(TOOLS_LIBDIR) \
-+ -DS390_TOOLS_SYSCONFDIR=$(SYSCONFDIR)
-+export CPPFLAGS
-
- # make G=1
- # Compile tools so that gcov can be used to collect code coverage data.
-@@ -76,7 +75,7 @@
- $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
-
- %: %.o
-- $(LINK) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@
-+ $(LINK) $(CFLAGS) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@
-
- all:
-
---- a/zfcpdump/ramdisk/Makefile
-+++ b/zfcpdump/ramdisk/Makefile
-@@ -12,16 +12,14 @@
-
- all: $(ZFCPDUMP_RD)
-
--CFLAGS += -D_FILE_OFFSET_BITS=64
-+CPPFLAGS += -D_FILE_OFFSET_BITS=64 -I../../include
-+LDFLAGS += -static
-+LDLIBS += -lz
-
- $(ZFCPDUMP_RD): zfcp_dumper
- /bin/sh ./create_rd.sh $(ARCH)
-
--zfcp_dumper: zfcp_dumper.o
-- $(CC) -o zfcp_dumper -static zfcp_dumper.o -lz
--
- zfcp_dumper.o: zfcp_dumper.c zfcp_dumper.h
-- $(CC) $(CFLAGS) -c -I../../include zfcp_dumper.c
-
- install: $(ZFCPDUMP_RD)
- /bin/sh ./create_rd.sh -i
-@@ -29,6 +27,3 @@
- clean clobber:
- /bin/sh ./create_rd.sh -r
- rm -f *.o
--
--%.o: %.c
-- $(CC) $(CFLAGS) -c -o $@ $<
---- a/zfcpdump_v2/Makefile
-+++ b/zfcpdump_v2/Makefile
-@@ -6,12 +6,13 @@
- LINUX_DIR := linux-$(LINUX_VERSION)
- E2FSPROGS := e2fsprogs-1.41.3
-
--CFLAGS += -D_FILE_OFFSET_BITS=64
-+CPPFLAGS += -D_FILE_OFFSET_BITS=64 -DGZIP_SUPPORT
-+LDFLAGS += -static
-+LDLIBS += -lz
-
- all: zfcpdump.image
-
- zfcpdump: zfcpdump.c zfcpdump.h
-- $(CC) $(CFLAGS) -D GZIP_SUPPORT -static -o $@ zfcpdump.c -lz
-
- e2fsck:
- tar xfzv $(E2FSPROGS).tar.gz
---- a/zipl/boot/Makefile
-+++ b/zipl/boot/Makefile
-@@ -3,9 +3,8 @@
-
- S390_TOOLS_VERSION_EBCDIC := $(shell echo -n $(S390_TOOLS_RELEASE) | dd conv=ebcdic 2> /dev/null | hexdump -v -e '/1 "0x%02x,"' | sed 's/.$$//')
-
--CFLAGS += -I../include -D__ASSEMBLY__ \
-+CPPFLAGS += -I../include -D__ASSEMBLY__ \
- -DS390_TOOLS_VERSION_EBCDIC=$(S390_TOOLS_VERSION_EBCDIC)
--LDFLAGS = -O2
- FILES := fba0.bin fba1b.bin fba2.bin \
- eckd0_ldl.bin eckd0_cdl.bin \
- eckd1.bin eckd1b.bin eckd2.bin \
-@@ -16,7 +15,7 @@
- %: %.S
-
- %.o: %.S
-- $(CC) $(CFLAGS) -c -o $@ $<
-+ $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
-
- %.exec: %.o
- @STAGE=$$( \
+++ /dev/null
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils udev
-
-# look at zfcpdump_v2/README
-E2FSPROGS_P=e2fsprogs-1.41.3
-LINUX_P=linux-2.6.27
-
-DESCRIPTION="User space utilities for the zSeries (s390) Linux kernel and device drivers"
-HOMEPAGE="https://www.ibm.com/developerworks/linux/linux390/s390-tools.html"
-SRC_URI="https://download.boulder.ibm.com/ibmdl/pub/software/dw/linux390/ht_src/${P}.tar.bz2
- zfcpdump? (
- mirror://sourceforge/e2fsprogs/${E2FSPROGS_P}.tar.gz
- mirror://kernel/linux/kernel/v2.6/${LINUX_P}.tar.bz2
- )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* s390"
-IUSE="fuse ncurses snmp zfcpdump"
-
-RDEPEND="sys-libs/zlib
- fuse? ( sys-fs/fuse )
- ncurses? ( sys-libs/ncurses:0= )
- snmp? ( net-analyzer/net-snmp )"
-DEPEND="${RDEPEND}
- dev-util/indent
- app-admin/genromfs"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.23.1-build.patch
-
- use snmp || sed -i -e 's:osasnmpd::' Makefile
- use fuse || { sed -i -e 's:cmsfs-fuse::' Makefile; export WITHOUT_FUSE=1; }
- use ncurses || sed -i -e 's:hyptop::' Makefile
-
- if use zfcpdump ; then
- local x
- for x in ${E2FSPROGS_P}.tar.gz ${LINUX_P}.tar.bz2 ; do
- ln -s "${DISTDIR}"/${x} zfcpdump_v2/${x} || die "ln ${x}"
- done
- sed -i -e '/^ZFCPDUMP_DIR/s:local/::' common.mak
- sed -i -e '/^SUB_DIRS/s:=:=zfcpdump_v2 :' Makefile
- fi
-
- export MAKEOPTS+=" V=1"
-}
-
-src_install() {
- emake install INSTROOT="${D}" USRBINDIR="${D}/sbin"
- dodoc README
- udev_dorules etc/udev/rules.d/*.rules
-}
+++ /dev/null
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit toolchain-funcs udev
-
-DESCRIPTION="User space utilities for the zSeries (s390) Linux kernel and device drivers"
-HOMEPAGE="https://www.ibm.com/developerworks/linux/linux390/s390-tools.html"
-SRC_URI="https://download.boulder.ibm.com/ibmdl/pub/software/dw/linux390/ht_src/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* s390"
-IUSE="fuse ncurses pfm snmp zlib"
-
-RDEPEND="fuse? ( sys-fs/fuse )
- ncurses? ( sys-libs/ncurses:0= )
- pfm? ( app-misc/pfm )
- snmp? ( net-analyzer/net-snmp )
- zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
- dev-util/indent
- app-admin/genromfs"
-
-src_configure() {
- export MAKEOPTS+=" V=1"
- export HAVE_DRACUT=0
- export HAVE_FUSE=$(usex fuse 1 0)
- export HAVE_NCURSES=$(usex ncurses 1 0)
- export HAVE_SNMP=$(usex snmp 1 0)
- export HAVE_PFM=$(usex pfm 1 0)
- export HAVE_ZLIB=$(usex zlib 1 0)
- tc-export AR BUILD_CC CC CXX LD NM OBJCOPY
-}
-
-src_compile() {
- emake \
- AR="${AR}" \
- HOSTCC="${BUILD_CC}" \
- CC="${CC}" LINK="${CC}" \
- CXX="${CXX}" LINKXX="${CXX}" \
- LD="${LD}" \
- NM="${NM}" \
- OBJCOPY="${OBJCOPY}"
-}
-
-src_install() {
- default
- udev_dorules etc/udev/rules.d/*.rules
-}
projects / gentoo.git / commitdiff