Attachment #402800 for bug #533918

View | Details | Raw Unified | Return to bug 533918 | Differences between
Collapse All | Expand All




From 8e77d013f7b7b34d7b2c6b7cd0d4d1b9d1197f04 Mon Sep 17 00:00:00 2001
From: Thomas D.
Date: Mon, 20 Apr 2015 13:57:25 +0200
Subject: [PATCH] tools/lguest: Makefile: append the CFLAGS to existing ones

Allow the user to pass custom CFLAGS.
---
 tools/lguest/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/lguest/Makefile b/tools/lguest/Makefile
index a107b5e..ee280f5 100644
--- a/tools/lguest/Makefile
+++ b/tools/lguest/Makefile
@@ -1,5 +1,5 @@
 # This creates the demonstration utility "lguest" which runs a Linux guest.
-CFLAGS:=-m32 -Wall -Wmissing-declarations -Wmissing-prototypes -O3 -U_FORTIFY_SOURCE -Iinclude
+CFLAGS+=-m32 -Wall -Wmissing-declarations -Wmissing-prototypes -U_FORTIFY_SOURCE -Iinclude
 
 all: lguest
 
-- 
2.3.5





# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $

EAPI=5

inherit autotools versionator eutils toolchain-funcs flag-o-matic

DESCRIPTION="Misc tools bundled with kernel sources"
HOMEPAGE="http://kernel.org/"

LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="static-libs tcpd"

MY_PV="${PV/_/-}"

	LINUX_VER=$(get_version_component_range 1-2).$(($(get_version_component_range 3)-1))
	PATCH_VERSION=$(get_version_component_range 1-3)
	LINUX_PATCH=patch-${PV//_/-}.xz
	SRC_URI="mirror://kernel/linux/kernel/v4.x/testing/${LINUX_PATCH}
		mirror://kernel/linux/kernel/v4.x/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
elif [ $(get_version_component_count) == 4 ]; then
	# stable-release series
	LINUX_VER=$(get_version_component_range 1-3)
	LINUX_PATCH=patch-${PV}.xz
	SRC_URI="mirror://kernel/linux/kernel/v4.x/${LINUX_PATCH}"
else
	LINUX_VER=${PV}
fi

LINUX_SOURCES=linux-${LINUX_VER}.tar.xz
SRC_URI="${SRC_URI} mirror://kernel/linux/kernel/v4.x/${LINUX_SOURCES}"

# pmtools also provides turbostat
# usbip available in seperate package now

	Documentation/laptops/freefall.c
	Documentation/networking/timestamping/timestamping.c
	Documentation/watchdog/src/watchdog-simple.c
	tools/lguest/lguest.c
	tools/vm/slabinfo.c
	usr/gen_init_cpio.c
)

# These have a broken make install, no DESTDIR
TARGET_MAKE_SIMPLE=(
	tools/firewire:nosy-dump
	tools/lguest:lguest
	tools/power/x86/turbostat:turbostat
	tools/power/x86/x86_energy_perf_policy:x86_energy_perf_policy
	Documentation/misc-devices/mei:mei-amt-version
)
# tools/perf - covered by dev-utils/perf
# tools/usb - testcases only
# tools/virtio - testcaes only
USBIP=tools/usb/usbip

	#for _pattern in {Documentation,scripts,tools,usr,include,lib,"arch/*/include",Makefile,Kbuild,Kconfig}; do
src_unpack() {
	unpack ${LINUX_SOURCES}


		epatch "${DISTDIR}"/${LINUX_PATCH}
	fi

	pushd ${USBIP} >/dev/null || die "Cannot chdir into '${USBIP}'"
	eautoreconf -i -f -v
	popd || die

	sed -i \
		-e '/^nosy-dump.*LDFLAGS/d' \
		-e '/^nosy-dump.*CFLAGS/d' \
		-e '/^nosy-dump.*CPPFLAGS/s,CPPFLAGS =,CPPFLAGS +=,g' \
		"${S}"/tools/firewire/Makefile

	epatch "${FILESDIR}"/${PN}-4.0-lguest-Makefile.patch
}

kernel_asm_arch() {

}

src_configure() {
	cd ${USBIP} || die "Cannot chdir into '${USBIP}'"
	econf \
		$(use_enable static-libs static) \
		$(use tcpd || echo --without-tcp-wrappers) \
		--with-usbids-dir=/usr/share/misc
}

src_compile() {

		einfo "Building $dir => $target"
		emake -C $dir ARCH=${karch} $target
	done

	emake -C ${USBIP}
}

src_install() {

		dosbin ${dir}/${target}
	done

	pushd ${USBIP} >/dev/null || die "Missing usbip/userspace"
	emake DESTDIR="${D%/}" install

	newdoc README README.usbip
	newdoc AUTHORS AUTHORS.usbip
	popd >/dev/null || die
	dodoc drivers/usb/usbip/usbip_protocol.txt

	newconfd "${FILESDIR}"/freefall.confd freefall
	newinitd "${FILESDIR}"/freefall.initd freefall
	prune_libtool_files

Return to bug 533918

Line 0 Link Here

(-)old/sys-apps/linux-misc-apps/files/linux-misc-apps-4.0-lguest-Makefile.patch (+24 lines)
	1	From 8e77d013f7b7b34d7b2c6b7cd0d4d1b9d1197f04 Mon Sep 17 00:00:00 2001
	2	From: Thomas D.
	3	Date: Mon, 20 Apr 2015 13:57:25 +0200
	4	Subject: [PATCH] tools/lguest: Makefile: append the CFLAGS to existing ones
	5
	6	Allow the user to pass custom CFLAGS.
	7	---
	8	tools/lguest/Makefile \| 2 +-
	9	1 file changed, 1 insertion(+), 1 deletion(-)
	10
	11	diff --git a/tools/lguest/Makefile b/tools/lguest/Makefile
	12	index a107b5e..ee280f5 100644
	13	--- a/tools/lguest/Makefile
	14	+++ b/tools/lguest/Makefile
	15	@@ -1,5 +1,5 @@
	16	# This creates the demonstration utility "lguest" which runs a Linux guest.
	17	-CFLAGS:=-m32 -Wall -Wmissing-declarations -Wmissing-prototypes -O3 -U_FORTIFY_SOURCE -Iinclude
	18	+CFLAGS+=-m32 -Wall -Wmissing-declarations -Wmissing-prototypes -U_FORTIFY_SOURCE -Iinclude
	19
	20	all: lguest
	21
	22	--
	23	2.3.5
	24

Lines 1-17 Link Here

(-)old/sys-apps/linux-misc-apps/linux-misc-apps-3.18.ebuild (-12 / +32 lines)
1	# Copyright 1999-2014 Gentoo Foundation	1	# Copyright 1999-2015 Gentoo Foundation
2	# Distributed under the terms of the GNU General Public License v2	2	# Distributed under the terms of the GNU General Public License v2
3	# $Header: /var/cvsroot/gentoo-x86/sys-apps/linux-misc-apps/linux-misc-apps-3.18.ebuild,v 1.1 2014/12/29 00:12:01 robbat2 Exp $	3	# $Header: $
4		4
5	EAPI=5	5	EAPI=5
6		6
7	inherit versionator eutils toolchain-funcs linux-info autotools flag-o-matic	7	inherit autotools versionator eutils toolchain-funcs flag-o-matic
8		8
9	DESCRIPTION="Misc tools bundled with kernel sources"	9	DESCRIPTION="Misc tools bundled with kernel sources"
10	HOMEPAGE="http://kernel.org/"	10	HOMEPAGE="http://kernel.org/"
11		11
12	LICENSE="GPL-2"	12	LICENSE="GPL-2"
13	SLOT="0"	13	SLOT="0"
14	KEYWORDS="~amd64 ~ppc ~x86"	14	KEYWORDS="~amd64 ~x86"
15	IUSE="static-libs tcpd"	15	IUSE="static-libs tcpd"
16		16
17	MY_PV="${PV/_/-}"	17	MY_PV="${PV/_/-}"
Lines 23-41 if [ ${PV/_rc} != ${PV} ]; then Link Here
23	LINUX_VER=$(get_version_component_range 1-2).$(($(get_version_component_range 3)-1))	23	LINUX_VER=$(get_version_component_range 1-2).$(($(get_version_component_range 3)-1))
24	PATCH_VERSION=$(get_version_component_range 1-3)	24	PATCH_VERSION=$(get_version_component_range 1-3)
25	LINUX_PATCH=patch-${PV//_/-}.xz	25	LINUX_PATCH=patch-${PV//_/-}.xz
26	SRC_URI="mirror://kernel/linux/kernel/v3.x/testing/${LINUX_PATCH}	26	SRC_URI="mirror://kernel/linux/kernel/v4.x/testing/${LINUX_PATCH}
27	mirror://kernel/linux/kernel/v3.x/testing/v${PATCH_VERSION}/${LINUX_PATCH}"	27	mirror://kernel/linux/kernel/v4.x/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
28	elif [ $(get_version_component_count) == 4 ]; then	28	elif [ $(get_version_component_count) == 4 ]; then
29	# stable-release series	29	# stable-release series
30	LINUX_VER=$(get_version_component_range 1-3)	30	LINUX_VER=$(get_version_component_range 1-3)
31	LINUX_PATCH=patch-${PV}.xz	31	LINUX_PATCH=patch-${PV}.xz
32	SRC_URI="mirror://kernel/linux/kernel/v3.x/${LINUX_PATCH}"	32	SRC_URI="mirror://kernel/linux/kernel/v4.x/${LINUX_PATCH}"
33	else	33	else
34	LINUX_VER=${PV}	34	LINUX_VER=${PV}
35	fi	35	fi
36		36
37	LINUX_SOURCES=linux-${LINUX_VER}.tar.xz	37	LINUX_SOURCES=linux-${LINUX_VER}.tar.xz
38	SRC_URI="${SRC_URI} mirror://kernel/linux/kernel/v3.x/${LINUX_SOURCES}"	38	SRC_URI="${SRC_URI} mirror://kernel/linux/kernel/v4.x/${LINUX_SOURCES}"
39		39
40	# pmtools also provides turbostat	40	# pmtools also provides turbostat
41	# usbip available in seperate package now	41	# usbip available in seperate package now
Lines 57-63 TARGETS_SIMPLE=( Link Here
57	Documentation/laptops/freefall.c	57	Documentation/laptops/freefall.c
58	Documentation/networking/timestamping/timestamping.c	58	Documentation/networking/timestamping/timestamping.c
59	Documentation/watchdog/src/watchdog-simple.c	59	Documentation/watchdog/src/watchdog-simple.c
60	tools/lguest/lguest.c
61	tools/vm/slabinfo.c	60	tools/vm/slabinfo.c
62	usr/gen_init_cpio.c	61	usr/gen_init_cpio.c
63	)	62	)
Lines 69-83 TARGETS_SIMPLE=( Link Here
69	# These have a broken make install, no DESTDIR	68	# These have a broken make install, no DESTDIR
70	TARGET_MAKE_SIMPLE=(	69	TARGET_MAKE_SIMPLE=(
71	tools/firewire:nosy-dump	70	tools/firewire:nosy-dump
72	tools/power/x86/turbostat:../../../../turbostat	71	tools/lguest:lguest
		72	tools/power/x86/turbostat:turbostat
73	tools/power/x86/x86_energy_perf_policy:x86_energy_perf_policy	73	tools/power/x86/x86_energy_perf_policy:x86_energy_perf_policy
74	Documentation/misc-devices/mei:mei-amt-version	74	Documentation/misc-devices/mei:mei-amt-version
75	)	75	)
76	# tools/perf - covered by dev-utils/perf	76	# tools/perf - covered by dev-utils/perf
77	# tools/usb - testcases only	77	# tools/usb - testcases only
78	# tools/virtio - testcaes only	78	# tools/virtio - testcaes only
		79	USBIP=tools/usb/usbip
79		80
80	#for _pattern in {Documentation,scripts,tools,usr,include,lib,"arch/*/include",Makefile,Kbuild,Kconfig}; do
81	src_unpack() {	81	src_unpack() {
82	unpack ${LINUX_SOURCES}	82	unpack ${LINUX_SOURCES}
83		83
Lines 95-105 src_prepare() { Link Here
95	epatch "${DISTDIR}"/${LINUX_PATCH}	95	epatch "${DISTDIR}"/${LINUX_PATCH}
96	fi	96	fi
97		97
		98	pushd ${USBIP} >/dev/null \|\| die "Cannot chdir into '${USBIP}'"
		99	eautoreconf -i -f -v
		100	popd \|\| die
		101
98	sed -i \	102	sed -i \
99	-e '/^nosy-dump.*LDFLAGS/d' \	103	-e '/^nosy-dump.*LDFLAGS/d' \
100	-e '/^nosy-dump.*CFLAGS/d' \	104	-e '/^nosy-dump.*CFLAGS/d' \
101	-e '/^nosy-dump.*CPPFLAGS/s,CPPFLAGS =,CPPFLAGS +=,g' \	105	-e '/^nosy-dump.*CPPFLAGS/s,CPPFLAGS =,CPPFLAGS +=,g' \
102	"${S}"/tools/firewire/Makefile	106	"${S}"/tools/firewire/Makefile
		107
		108	epatch "${FILESDIR}"/${PN}-4.0-lguest-Makefile.patch
103	}	109	}
104		110
105	kernel_asm_arch() {	111	kernel_asm_arch() {
Lines 115-121 kernel_asm_arch() { Link Here
115	}	121	}
116		122
117	src_configure() {	123	src_configure() {
118	:	124	cd ${USBIP} \|\| die "Cannot chdir into '${USBIP}'"
		125	econf \
		126	$(use_enable static-libs static) \
		127	$(use tcpd \|\| echo --without-tcp-wrappers) \
		128	--with-usbids-dir=/usr/share/misc
119	}	129	}
120		130
121	src_compile() {	131	src_compile() {
Lines 137-142 src_compile() { Link Here
137	einfo "Building $dir => $target"	147	einfo "Building $dir => $target"
138	emake -C $dir ARCH=${karch} $target	148	emake -C $dir ARCH=${karch} $target
139	done	149	done
		150
		151	emake -C ${USBIP}
140	}	152	}
141		153
142	src_install() {	154	src_install() {
Lines 153-158 src_install() { Link Here
153	dosbin ${dir}/${target}	165	dosbin ${dir}/${target}
154	done	166	done
155		167
		168	pushd ${USBIP} >/dev/null \|\| die "Missing usbip/userspace"
		169	emake DESTDIR="${D%/}" install
		170
		171	newdoc README README.usbip
		172	newdoc AUTHORS AUTHORS.usbip
		173	popd >/dev/null \|\| die
		174	dodoc drivers/usb/usbip/usbip_protocol.txt
		175
156	newconfd "${FILESDIR}"/freefall.confd freefall	176	newconfd "${FILESDIR}"/freefall.confd freefall
157	newinitd "${FILESDIR}"/freefall.initd freefall	177	newinitd "${FILESDIR}"/freefall.initd freefall
158	prune_libtool_files	178	prune_libtool_files