dlan        15/06/15 08:47:07

  Modified:             ChangeLog xen-4.5.0-r6.ebuild
  Added:                xen-4.2.5-r11.ebuild xen-4.5.0-r8.ebuild
                        xen-4.4.2-r4.ebuild
  Removed:              xen-4.5.0-r7.ebuild xen-4.2.5-r10.ebuild
                        xen-4.4.2-r3.ebuild
  Log:
  security bump, fix bug 550658, XSA-134,136
  
  (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 
0xAABEFD55)

Revision  Changes    Path
1.208                app-emulation/xen/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/ChangeLog?rev=1.208&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/ChangeLog?rev=1.208&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/ChangeLog?r1=1.207&r2=1.208

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -r1.207 -r1.208
--- ChangeLog   9 Jun 2015 07:22:43 -0000       1.207
+++ ChangeLog   15 Jun 2015 08:47:07 -0000      1.208
@@ -1,6 +1,15 @@
 # ChangeLog for app-emulation/xen
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.207 
2015/06/09 07:22:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.208 
2015/06/15 08:47:07 dlan Exp $
+
+*xen-4.5.0-r8 (15 Jun 2015)
+*xen-4.4.2-r4 (15 Jun 2015)
+*xen-4.2.5-r11 (15 Jun 2015)
+
+  15 Jun 2015; Yixun Lan <[email protected]> -xen-4.2.5-r10.ebuild,
+  +xen-4.2.5-r11.ebuild, -xen-4.4.2-r3.ebuild, +xen-4.4.2-r4.ebuild,
+  xen-4.5.0-r6.ebuild, -xen-4.5.0-r7.ebuild, +xen-4.5.0-r8.ebuild:
+  security bump, fix bug 550658, XSA-134,136
 
   09 Jun 2015; Agostino Sarubbo <[email protected]> xen-4.5.0-r6.ebuild:
   Stable for x86, wrt bug #551346



1.4                  app-emulation/xen/xen-4.5.0-r6.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/xen-4.5.0-r6.ebuild?rev=1.4&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/xen-4.5.0-r6.ebuild?rev=1.4&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/xen-4.5.0-r6.ebuild?r1=1.3&r2=1.4

Index: xen-4.5.0-r6.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.5.0-r6.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xen-4.5.0-r6.ebuild 9 Jun 2015 07:22:43 -0000       1.3
+++ xen-4.5.0-r6.ebuild 15 Jun 2015 08:47:07 -0000      1.4
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.5.0-r6.ebuild,v 1.3 
2015/06/09 07:22:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.5.0-r6.ebuild,v 1.4 
2015/06/15 08:47:07 dlan Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@
        EGIT_REPO_URI="git://xenbits.xen.org/${PN}.git"
        live_eclass="git-2"
 else
-       KEYWORDS="amd64 ~arm ~arm64 x86"
+       KEYWORDS="amd64 ~arm ~arm64 -x86"
        UPSTREAM_VER=4
        SECURITY_VER=1
        GENTOO_VER=



1.1                  app-emulation/xen/xen-4.2.5-r11.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/xen-4.2.5-r11.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/xen-4.2.5-r11.ebuild?rev=1.1&content-type=text/plain

Index: xen-4.2.5-r11.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.2.5-r11.ebuild,v 1.1 
2015/06/15 08:47:07 dlan Exp $

EAPI=5

PYTHON_COMPAT=( python2_7 )

if [[ $PV == *9999 ]]; then
        KEYWORDS=""
        REPO="xen-unstable.hg"
        EHG_REPO_URI="http://xenbits.xensource.com/${REPO}";
        S="${WORKDIR}/${REPO}"
        live_eclass="mercurial"
else
        KEYWORDS="~amd64 ~x86"
        UPSTREAM_VER=9
        SECURITY_VER=3
        GENTOO_VER=

        [[ -n ${UPSTREAM_VER} ]] && \
                
UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz";
        [[ -n ${SECURITY_VER} ]] && \
                
SECURITY_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz";
        [[ -n ${GENTOO_VER} ]] && \
                
GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz";
        
SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
                ${UPSTREAM_PATCHSET_URI}
                ${SECURITY_PATCHSET_URI}
                ${GENTOO_PATCHSET_URI}"
fi

inherit mount-boot flag-o-matic python-any-r1 toolchain-funcs eutils 
${live_eclass}

DESCRIPTION="The Xen virtual machine monitor"
HOMEPAGE="http://xen.org/";
LICENSE="GPL-2"
SLOT="0"
IUSE="custom-cflags debug efi flask pae xsm"

DEPEND="${PYTHON_DEPS}
        efi? ( >=sys-devel/binutils-2.22[multitarget] )
        !efi? ( >=sys-devel/binutils-2.22[-multitarget] )"
RDEPEND=""
PDEPEND="~app-emulation/xen-tools-${PV}"

RESTRICT="test"

# Approved by QA team in bug #144032
QA_WX_LOAD="boot/xen-syms-${PV}"

REQUIRED_USE="
        flask? ( xsm )
        "

pkg_setup() {
        python-any-r1_pkg_setup
        if [[ -z ${XEN_TARGET_ARCH} ]]; then
                if use x86 && use amd64; then
                        die "Confusion! Both x86 and amd64 are set in your use 
flags!"
                elif use x86; then
                        export XEN_TARGET_ARCH="x86_32"
                elif use amd64; then
                        export XEN_TARGET_ARCH="x86_64"
                else
                        die "Unsupported architecture!"
                fi
        fi

        if use flask ; then
                export "XSM_ENABLE=y"
                export "FLASK_ENABLE=y"
        elif use xsm ; then
                export "XSM_ENABLE=y"
        fi
}

src_prepare() {
        # Upstream's patchset
        if [[ -n ${UPSTREAM_VER} ]]; then
                EPATCH_SUFFIX="patch" \
                EPATCH_FORCE="yes" \
                EPATCH_OPTS="-p1" \
                        epatch "${WORKDIR}"/patches-upstream
        fi

        # Security patchset
        if [[ -n ${SECURITY_VER} ]]; then
                EPATCH_SUFFIX="patch" \
                EPATCH_FORCE="yes" \
                EPATCH_OPTS="-p1" \
                        epatch "${WORKDIR}/patches-security/${PV}"
        fi

        # Gentoo's patchset
        if [[ -n ${GENTOO_VER} ]]; then
                EPATCH_SUFFIX="patch" \
                EPATCH_FORCE="yes" \
                        epatch "${WORKDIR}"/patches-gentoo
        fi

        # Drop .config and fix gcc-4.6
        epatch  "${FILESDIR}"/${PN/-pvgrub/}-4-fix_dotconfig-gcc.patch

        if use efi; then
                epatch "${FILESDIR}"/${PN}-4.2-efi.patch
                export EFI_VENDOR="gentoo"
                export EFI_MOUNTPOINT="boot"
        fi

        # if the user *really* wants to use their own custom-cflags, let them
        if use custom-cflags; then
                einfo "User wants their own CFLAGS - removing defaults"
                # try and remove all the default custom-cflags
                find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk 
-exec sed \
                        -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
                        -e 
's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
                        -e 
's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
                        -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
                        -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
                        -i {} \; || die "failed to re-set custom-cflags"
        fi

        # not strictly necessary to fix this
        sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to 
re-set setup.py"

        epatch_user
}

src_configure() {
        use debug && myopt="${myopt} debug=y"
        use pae && myopt="${myopt} pae=y"

        if use custom-cflags; then
                filter-flags -fPIE -fstack-protector
                replace-flags -O3 -O2
        else
                unset CFLAGS
        fi
}

src_compile() {
        # Send raw LDFLAGS so that --as-needed works
        emake CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen 
${myopt}
}

src_install() {
        local myopt
        use debug && myopt="${myopt} debug=y"
        use pae && myopt="${myopt} pae=y"

        # The 'make install' doesn't 'mkdir -p' the subdirs
        if use efi; then
                mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
        fi

        emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
}

pkg_postinst() {
        elog "Official Xen Guide and the unoffical wiki page:"
        elog " https://wiki.gentoo.org/wiki/Xen";
        elog " http://en.gentoo-wiki.com/wiki/Xen/";

        use pae && ewarn "This is a PAE build of Xen. It will *only* boot PAE 
kernels!"
        use efi && einfo "The efi executable is installed in boot/efi/gentoo"
}



1.1                  app-emulation/xen/xen-4.5.0-r8.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/xen-4.5.0-r8.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/xen-4.5.0-r8.ebuild?rev=1.1&content-type=text/plain

Index: xen-4.5.0-r8.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.5.0-r8.ebuild,v 1.1 
2015/06/15 08:47:07 dlan Exp $

EAPI=5

PYTHON_COMPAT=( python2_7 )

MY_PV=${PV/_/-}
MY_P=${PN}-${PV/_/-}

if [[ $PV == *9999 ]]; then
        KEYWORDS=""
        EGIT_REPO_URI="git://xenbits.xen.org/${PN}.git"
        live_eclass="git-2"
else
        KEYWORDS="~arm ~arm64 ~amd64"
        UPSTREAM_VER=6
        SECURITY_VER=3
        GENTOO_VER=

        [[ -n ${UPSTREAM_VER} ]] && \
                
UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz";
        [[ -n ${SECURITY_VER} ]] && \
                
SECURITY_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz";
        [[ -n ${GENTOO_VER} ]] && \
                
GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz";
        
SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/${MY_P}.tar.gz
                ${UPSTREAM_PATCHSET_URI}
                ${SECURITY_PATCHSET_URI}
                ${GENTOO_PATCHSET_URI}"

fi

inherit mount-boot flag-o-matic python-any-r1 toolchain-funcs eutils 
${live_eclass}

DESCRIPTION="The Xen virtual machine monitor"
HOMEPAGE="http://xen.org/";
LICENSE="GPL-2"
SLOT="0"
IUSE="custom-cflags debug efi flask xsm"

DEPEND="${PYTHON_DEPS}
        efi? ( >=sys-devel/binutils-2.22[multitarget] )
        !efi? ( >=sys-devel/binutils-2.22[-multitarget] )"
RDEPEND=""
PDEPEND="~app-emulation/xen-tools-${PV}"

RESTRICT="test"

# Approved by QA team in bug #144032
QA_WX_LOAD="boot/xen-syms-${PV}"

REQUIRED_USE="flask? ( xsm )
        arm? ( debug )"

S="${WORKDIR}/${MY_P}"

pkg_setup() {
        python-any-r1_pkg_setup
        if [[ -z ${XEN_TARGET_ARCH} ]]; then
                if use x86 && use amd64; then
                        die "Confusion! Both x86 and amd64 are set in your use 
flags!"
                elif use x86; then
                        export XEN_TARGET_ARCH="x86_32"
                elif use amd64; then
                        export XEN_TARGET_ARCH="x86_64"
                elif use arm; then
                        export XEN_TARGET_ARCH="arm32"
                elif use arm64; then
                        export XEN_TARGET_ARCH="arm64"
                else
                        die "Unsupported architecture!"
                fi
        fi

        if use flask ; then
                export "XSM_ENABLE=y"
                export "FLASK_ENABLE=y"
        elif use xsm ; then
                export "XSM_ENABLE=y"
        fi
}

src_prepare() {
        # Upstream's patchset
        if [[ -n ${UPSTREAM_VER} ]]; then
                EPATCH_SUFFIX="patch" \
                EPATCH_FORCE="yes" \
                EPATCH_OPTS="-p1" \
                        epatch "${WORKDIR}"/patches-upstream
        fi

        # Security patchset
        if [[ -n ${SECURITY_VER} ]]; then
                EPATCH_SUFFIX="patch" \
                EPATCH_FORCE="yes" \
                EPATCH_OPTS="-p1" \
                        epatch "${WORKDIR}/patches-security/${PV}"
        fi

        # Gentoo's patchset
        if [[ -n ${GENTOO_VER} ]]; then
                EPATCH_SUFFIX="patch" \
                EPATCH_FORCE="yes" \
                        epatch "${WORKDIR}"/patches-gentoo
        fi

        # Drop .config
        sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't 
drop"

        if use efi; then
                epatch "${FILESDIR}"/${PN}-4.5-efi.patch
                export EFI_VENDOR="gentoo"
                export EFI_MOUNTPOINT="boot"
        fi

        # if the user *really* wants to use their own custom-cflags, let them
        if use custom-cflags; then
                einfo "User wants their own CFLAGS - removing defaults"
                # try and remove all the default custom-cflags
                find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk 
-exec sed \
                        -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
                        -e 
's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
                        -e 
's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
                        -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
                        -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
                        -i {} \; || die "failed to re-set custom-cflags"
        fi

        # remove -Werror for gcc-4.6's sake
        find "${S}" -name 'Makefile*' -o -name '*.mk' -o -name 'common.make' | \
                xargs sed -i 's/ *-Werror */ /'
        # not strictly necessary to fix this
        sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to 
re-set setup.py"

        epatch_user
}

src_configure() {
        use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"

        use debug && myopt="${myopt} debug=y"

        if use custom-cflags; then
                filter-flags -fPIE -fstack-protector
                replace-flags -O3 -O2
        else
                unset CFLAGS
        fi
}

src_compile() {
        # Send raw LDFLAGS so that --as-needed works
        emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C 
xen ${myopt}
}

src_install() {
        local myopt
        use debug && myopt="${myopt} debug=y"

        # The 'make install' doesn't 'mkdir -p' the subdirs
        if use efi; then
                mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
        fi

        emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
}

pkg_postinst() {
        elog "Official Xen Guide and the unoffical wiki page:"
        elog " https://wiki.gentoo.org/wiki/Xen";
        elog " http://en.gentoo-wiki.com/wiki/Xen/";

        use efi && einfo "The efi executable is installed in boot/efi/gentoo"
}



1.1                  app-emulation/xen/xen-4.4.2-r4.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/xen-4.4.2-r4.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/xen-4.4.2-r4.ebuild?rev=1.1&content-type=text/plain

Index: xen-4.4.2-r4.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.4.2-r4.ebuild,v 1.1 
2015/06/15 08:47:07 dlan Exp $

EAPI=5

PYTHON_COMPAT=( python2_7 )

MY_PV=${PV/_/-}
MY_P=${PN}-${PV/_/-}

if [[ $PV == *9999 ]]; then
        KEYWORDS=""
        EGIT_REPO_URI="git://xenbits.xen.org/${PN}.git"
        live_eclass="git-2"
else
        KEYWORDS="~amd64 ~arm -x86"
        UPSTREAM_VER=2
        SECURITY_VER=3
        GENTOO_VER=

        [[ -n ${UPSTREAM_VER} ]] && \
                
UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz";
        [[ -n ${SECURITY_VER} ]] && \
                
SECURITY_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz";
        [[ -n ${GENTOO_VER} ]] && \
                
GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz";
        
SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/${MY_P}.tar.gz
                ${UPSTREAM_PATCHSET_URI}
                ${SECURITY_PATCHSET_URI}
                ${GENTOO_PATCHSET_URI}"

fi

inherit mount-boot flag-o-matic python-any-r1 toolchain-funcs eutils 
${live_eclass}

DESCRIPTION="The Xen virtual machine monitor"
HOMEPAGE="http://xen.org/";
LICENSE="GPL-2"
SLOT="0"
IUSE="custom-cflags debug efi flask xsm"

DEPEND="${PYTHON_DEPS}
        efi? ( >=sys-devel/binutils-2.22[multitarget] )
        !efi? ( >=sys-devel/binutils-2.22[-multitarget] )"
RDEPEND=""
PDEPEND="~app-emulation/xen-tools-${PV}"

RESTRICT="test"

# Approved by QA team in bug #144032
QA_WX_LOAD="boot/xen-syms-${PV}"

REQUIRED_USE="flask? ( xsm )
        arm? ( debug )"

S="${WORKDIR}/${MY_P}"

pkg_setup() {
        python-any-r1_pkg_setup
        if [[ -z ${XEN_TARGET_ARCH} ]]; then
                if use x86 && use amd64; then
                        die "Confusion! Both x86 and amd64 are set in your use 
flags!"
                elif use x86; then
                        export XEN_TARGET_ARCH="x86_32"
                elif use amd64; then
                        export XEN_TARGET_ARCH="x86_64"
                elif use arm; then
                        export XEN_TARGET_ARCH="arm32"
                else
                        die "Unsupported architecture!"
                fi
        fi

        if use flask ; then
                export "XSM_ENABLE=y"
                export "FLASK_ENABLE=y"
        elif use xsm ; then
                export "XSM_ENABLE=y"
        fi
}

src_prepare() {
        # Upstream's patchset
        if [[ -n ${UPSTREAM_VER} ]]; then
                EPATCH_SUFFIX="patch" \
                EPATCH_FORCE="yes" \
                EPATCH_OPTS="-p1" \
                        epatch "${WORKDIR}"/patches-upstream
        fi

        # Security patchset
        if [[ -n ${SECURITY_VER} ]]; then
                EPATCH_SUFFIX="patch" \
                EPATCH_FORCE="yes" \
                EPATCH_OPTS="-p1" \
                        epatch "${WORKDIR}/patches-security/${PV}"
        fi

        # Gentoo's patchset
        if [[ -n ${GENTOO_VER} ]]; then
                EPATCH_SUFFIX="patch" \
                EPATCH_FORCE="yes" \
                        epatch "${WORKDIR}"/patches-gentoo
        fi

        # Drop .config
        sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't 
drop"

        if use efi; then
                epatch "${FILESDIR}"/${PN}-4.4-efi.patch
                export EFI_VENDOR="gentoo"
                export EFI_MOUNTPOINT="boot"
        fi

        # if the user *really* wants to use their own custom-cflags, let them
        if use custom-cflags; then
                einfo "User wants their own CFLAGS - removing defaults"
                # try and remove all the default custom-cflags
                find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk 
-exec sed \
                        -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
                        -e 
's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
                        -e 
's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
                        -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
                        -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
                        -i {} \; || die "failed to re-set custom-cflags"
        fi

        # remove -Werror for gcc-4.6's sake
        find "${S}" -name 'Makefile*' -o -name '*.mk' -o -name 'common.make' | \
                xargs sed -i 's/ *-Werror */ /'
        # not strictly necessary to fix this
        sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to 
re-set setup.py"

        epatch_user
}

src_configure() {
        use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"

        use debug && myopt="${myopt} debug=y"

        if use custom-cflags; then
                filter-flags -fPIE -fstack-protector
                replace-flags -O3 -O2
        else
                unset CFLAGS
        fi
}

src_compile() {
        # Send raw LDFLAGS so that --as-needed works
        emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C 
xen ${myopt}
}

src_install() {
        local myopt
        use debug && myopt="${myopt} debug=y"

        # The 'make install' doesn't 'mkdir -p' the subdirs
        if use efi; then
                mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
        fi

        emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
}

pkg_postinst() {
        elog "Official Xen Guide and the unoffical wiki page:"
        elog " https://wiki.gentoo.org/wiki/Xen";
        elog " http://en.gentoo-wiki.com/wiki/Xen/";

        use efi && einfo "The efi executable is installed in boot/efi/gentoo"
}




Reply via email to