onkelbeh
/
GentooRepository
mirror of https://github.com/gentoo-mirror/gentoo.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

x11-base/xorg-server: Define XORG_CONFIGURE_OPTIONS in src_configure 

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: David Seifert <soap@gentoo.org>
Signed-off-by: Matt Turner <mattst88@gentoo.org>
This commit is contained in:
David Seifert 2021-05-02 01:55:05 +02:00 committed by Matt Turner
parent c55b7b46f6
commit c3ac246f05
No known key found for this signature in database
GPG Key ID: ED2ED19F85B3682C
2 changed files with 40 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
x11-base/xorg-server/xorg-server-1.20.11.ebuild
View File

@ -132,13 +132,15 @@ pkg_setup() {
ewarn "Performance may be unacceptable without it."
ewarn "Build with USE=-minimal to enable glamor."
fi
}
src_configure() {
# localstatedir is used for the log location; we need to override the default
# from ebuild.sh
# sysconfdir is used for the xorg.conf location; same applies
# NOTE: fop is used for doc generating; and I have no idea if Gentoo
# package it somewhere
XORG_CONFIGURE_OPTIONS=(
local XORG_CONFIGURE_OPTIONS=(
$(use_enable ipv6)
$(use_enable debug)
$(use_enable dmx)
@ -178,17 +180,28 @@ pkg_setup() {
if use systemd || use elogind; then
XORG_CONFIGURE_OPTIONS+=(
"--enable-systemd-logind"
"--disable-install-setuid"
"$(use_enable suid suid-wrapper)"
--enable-systemd-logind
--disable-install-setuid
$(use_enable suid suid-wrapper)
)
else
XORG_CONFIGURE_OPTIONS+=(
"--disable-systemd-logind"
"--disable-suid-wrapper"
"$(use_enable suid install-setuid)"
--disable-systemd-logind
--disable-suid-wrapper
$(use_enable suid install-setuid)
)
fi
xorg-3_src_configure
}
server_based_install() {
if ! use xorg; then
rm -f "${ED}"/usr/share/man/man1/Xserver.1x \
"${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
"${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
"${ED}"/usr/share/man/man1/Xserver.1x || die
fi
}
src_install() {
@ -214,12 +227,3 @@ pkg_postrm() {
rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
fi
}
server_based_install() {
if ! use xorg; then
rm "${ED}"/usr/share/man/man1/Xserver.1x \
"${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
"${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
"${ED}"/usr/share/man/man1/Xserver.1x
fi
}

36
x11-base/xorg-server/xorg-server-9999.ebuild
View File

@ -133,13 +133,15 @@ pkg_setup() {
ewarn "Performance may be unacceptable without it."
ewarn "Build with USE=-minimal to enable glamor."
fi
}
src_configure() {
# localstatedir is used for the log location; we need to override the default
# from ebuild.sh
# sysconfdir is used for the xorg.conf location; same applies
# NOTE: fop is used for doc generating; and I have no idea if Gentoo
# package it somewhere
XORG_CONFIGURE_OPTIONS=(
local XORG_CONFIGURE_OPTIONS=(
$(use_enable ipv6)
$(use_enable debug)
$(use_enable dmx)
@ -178,17 +180,28 @@ pkg_setup() {
if use systemd || use elogind; then
XORG_CONFIGURE_OPTIONS+=(
"--enable-systemd-logind"
"--disable-install-setuid"
"$(use_enable suid suid-wrapper)"
--enable-systemd-logind
--disable-install-setuid
$(use_enable suid suid-wrapper)
)
else
XORG_CONFIGURE_OPTIONS+=(
"--disable-systemd-logind"
"--disable-suid-wrapper"
"$(use_enable suid install-setuid)"
--disable-systemd-logind
--disable-suid-wrapper
$(use_enable suid install-setuid)
)
fi
xorg-3_src_configure
}
server_based_install() {
if ! use xorg; then
rm -f "${ED}"/usr/share/man/man1/Xserver.1x \
"${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
"${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
"${ED}"/usr/share/man/man1/Xserver.1x || die
fi
}
src_install() {
@ -214,12 +227,3 @@ pkg_postrm() {
rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
fi
}
server_based_install() {
if ! use xorg; then
rm "${ED}"/usr/share/man/man1/Xserver.1x \
"${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
"${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
"${ED}"/usr/share/man/man1/Xserver.1x
fi
}