mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-21 14:31:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

systemd: sync with upstream live ebuild, enable gold linker

Browse Source 
Minor sync with upstream, adds a use flag we don't enable.

Updated our toolchain just in time, the -fuse-ld= option is now
supported and as of 218 systemd doesn't link with bfd any more so now is
a good time to re-enable the configure test to enable it. For reference
the guilty commit at fault is probably:

5f86c1f4c4

Or specifically:

```c
/* GCC maps this magically to the beginning and end of the BUS_ERROR_MAP section */
extern const sd_bus_error_map __start_BUS_ERROR_MAP[];
extern const sd_bus_error_map __stop_BUS_ERROR_MAP[];
```

... to which I say haha wtf... WELL WHAT ABOUT WHEN IT DOESN'T? :-P
This commit is contained in:
Michael Marineau 2014-12-18 21:27:38 -08:00
parent 5985e7511a
commit c1901970bc
1 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild vendored
View File

@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation # Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.147 2014/11/18 19:15:03 mgorny Exp $ # $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.149 2014/12/14 15:58:27 floppym Exp $
EAPI=5 EAPI=5
@ -36,7 +36,7 @@ SLOT="0/2"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="acl apparmor audit cryptsetup curl doc elfutils gcrypt gudev http IUSE="acl apparmor audit cryptsetup curl doc elfutils gcrypt gudev http
idn introspection kdbus +kmod lz4 lzma pam policykit python qrcode +seccomp idn introspection kdbus +kmod lz4 lzma pam policykit python qrcode +seccomp
selinux ssl terminal nls test vanilla" selinux ssl terminal nls test vanilla xkb"
MINKV="3.8" MINKV="3.8"
@ -64,9 +64,10 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.25:0=
qrcode? ( media-gfx/qrencode:0= ) qrcode? ( media-gfx/qrencode:0= )
seccomp? ( sys-libs/libseccomp:0= ) seccomp? ( sys-libs/libseccomp:0= )
selinux? ( sys-libs/libselinux:0= ) selinux? ( sys-libs/libselinux:0= )
terminal? ( dev-libs/libevdev:0= terminal? ( >=dev-libs/libevdev-1.2:0=
>=x11-libs/libxkbcommon-0.4:0= >=x11-libs/libxkbcommon-0.5:0=
x11-libs/libdrm:0= ) >=x11-libs/libdrm-2.4:0= )
xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
@ -114,23 +115,6 @@ SRC_URI=
KEYWORDS= KEYWORDS=
fi fi
src_prepare() {
if [[ ${PV} == *9999 ]]; then
if use doc; then
gtkdocize --docdir docs/ || die
else
echo 'EXTRA_DIST =' > docs/gtk-doc.make
fi
fi
# patches not upstream
epatch "${FILESDIR}"/0001-hack-testing-Wl-fuse-ld-gold-does-not-work-correctly.patch
# Bug 463376
sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
autotools-utils_src_prepare
}
pkg_pretend() { pkg_pretend() {
local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS ~DEVTMPFS ~DMIID local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS ~DEVTMPFS ~DMIID
~EPOLL ~FANOTIFY ~FHANDLE ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~EPOLL ~FANOTIFY ~FHANDLE ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS
@ -172,6 +156,20 @@ pkg_setup() {
use python && python-single-r1_pkg_setup use python && python-single-r1_pkg_setup
} }
src_prepare() {
if [[ ${PV} == *9999 ]]; then
if use doc; then
gtkdocize --docdir docs/ || die
else
echo 'EXTRA_DIST =' > docs/gtk-doc.make
fi
fi
# Bug 463376
sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
autotools-utils_src_prepare
}
src_configure() { src_configure() {
# Keep using the one where the rules were installed. # Keep using the one where the rules were installed.
MY_UDEVDIR=$(get_udevdir) MY_UDEVDIR=$(get_udevdir)
@ -244,6 +242,7 @@ multilib_src_configure() {
$(multilib_native_use_enable terminal) $(multilib_native_use_enable terminal)
$(multilib_native_use_enable test tests) $(multilib_native_use_enable test tests)
$(multilib_native_use_enable test dbus) $(multilib_native_use_enable test dbus)
$(multilib_native_use_enable xkb xkbcommon)
# Disable optional binaries for non-native abis # Disable optional binaries for non-native abis
$(multilib_native_enable backlight) $(multilib_native_enable backlight)