Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 619178 | Differences between
and this patch

Collapse All | Expand All

(-)a/eclass/meson.eclass (-12 / +11 lines)
Lines 49-63 DEPEND=">=dev-util/meson-0.39.1 Link Here
49 
	>=dev-util/ninja-1.7.2"
 49 
	>=dev-util/ninja-1.7.2"
50 
# @ECLASS-VARIABLE: BUILD_DIR
 50 
# @ECLASS-VARIABLE: BUILD_DIR
51 
# @DEFAULT_UNSET
52 
# @DESCRIPTION:
 51 
# @DESCRIPTION:
53 
# Build directory, location where all generated files should be placed.
 52 
# Build directory, location where all generated files should be placed.
54 
# If this isn't set, it defaults to ${WORKDIR}/${P}-build.
 53 
# If this isn't set, it defaults to ${WORKDIR}/${P}-build.
55 
# @ECLASS-VARIABLE: EMESON_SOURCE
 54 
# @ECLASS-VARIABLE: EMESON_SOURCE
56 
# @DEFAULT_UNSET
57 
# @DESCRIPTION:
 55 
# @DESCRIPTION:
58 
# The location of the source files for the project;this is the source
 56 
# The location of the source files for the project; this is the source
59 
# directory to pass to meson.
 57 
# directory to pass to meson.
60 
# If this isn't set, it defaults to ${S}
 58 
# If this isn't set, it defaults to ${S}
Lines 67-83 DEPEND=">=dev-util/meson-0.39.1 Link Here
67 
# Optional meson arguments as Bash array; this should be defined before
 65 
# Optional meson arguments as Bash array; this should be defined before
68 
# calling meson_src_configure.
 66 
# calling meson_src_configure.
69 
# create a cross file for meson
 67 
# Create a cross file for meson
70 
# fixme: This function should write a cross file as described at the
 68 
# fixme: This function should write a cross file as described at the
71 
# following url.
 69 
# following url.
72 
#	http://mesonbuild.com/Cross-compilation.html
 70 
# http://mesonbuild.com/Cross-compilation.html
73 
# _meson_create_cross_file() {
 71 
# _meson_create_cross_file() {
74 
#	touch "${T}"/meson.crossfile
 72 
#	touch "${T}"/meson.crossfile
75 
# }
 73 
# }
76 
# @FUNCTION: meson_src_configure
 74 
# @FUNCTION: meson_src_configure
77 
# @DESCRIPTION:
 75 
# @DESCRIPTION:
78 
# this is the meson_src_configure function
 76 
# This is the meson_src_configure function
79 
meson_src_configure() {
 77 
meson_src_configure() {
80 
	debug-print-function ${FUNCNAME} "$@"
 78 
	debug-print-function ${FUNCNAME} "$@"
Lines 86-92 meson_src_configure() { Link Here
86 
		--buildtype plain
 84 
		--buildtype plain
87 
		--libdir "$(get_libdir)"
 85 
		--libdir "$(get_libdir)"
88 
		--localstatedir "${EPREFIX}/var/lib"
 86 
		--localstatedir "${EPREFIX}/var/lib"
89 
		--prefix "${EPREFIX}"/usr
 87 
		--prefix "${EPREFIX}/usr"
90 
		--sysconfdir "${EPREFIX}/etc"
 88 
		--sysconfdir "${EPREFIX}/etc"
91 
		)
 89 
		)
Lines 114-138 meson_src_configure() { Link Here
114 
meson_src_compile() {
 112 
meson_src_compile() {
115 
	debug-print-function ${FUNCNAME} "$@"
 113 
	debug-print-function ${FUNCNAME} "$@"
116 
	eninja -v -C "${BUILD_DIR}"
 114 
	eninja -C "${BUILD_DIR}"
117 
}
 115 
}
118 
# @FUNCTION: meson_src_test
 116 
# @FUNCTION: meson_src_test
119 
# @DESCRIPTION:
 117 
# @DESCRIPTION:
120 
# this is the meson_src_test function.
 118 
# This is the meson_src_test function.
121 
meson_src_test() {
 119 
meson_src_test() {
122 
	debug-print-function ${FUNCNAME} "$@"
 120 
	debug-print-function ${FUNCNAME} "$@"
123 
	eninja -v -C "${BUILD_DIR}" test
 121 
	eninja -C "${BUILD_DIR}" test
124 
}
 122 
}
125 
# @FUNCTION: meson_src_install
 123 
# @FUNCTION: meson_src_install
126 
# @DESCRIPTION:
 124 
# @DESCRIPTION:
127 
# this is the meson_src_install function.
 125 
# This is the meson_src_install function.
128 
meson_src_install() {
 126 
meson_src_install() {
129 
	debug-print-function ${FUNCNAME} "$@"
 127 
	debug-print-function ${FUNCNAME} "$@"
130 
	DESTDIR="${D}" eninja -v -C "${BUILD_DIR}" install
 128 
	DESTDIR="${D}" eninja -C "${BUILD_DIR}" install
129 
	einstalldocs
131 
}
 130 
}
132 
fi
 131 
fi

Return to bug 619178