Skip to content

Commit

Permalink
dev-lisp/sbcl: Drop pax_kernel support
Browse files Browse the repository at this point in the history
This is no longer a supported configuration:
https://archives.gentoo.org/gentoo-dev/message/0283ed6004111127e0e575cc912feff1

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Ulrich Müller <[email protected]>
  • Loading branch information
ulm committed Jun 22, 2021
1 parent fc3bcec commit 561bda2
Show file tree
Hide file tree
Showing 11 changed files with 20 additions and 123 deletions.
3 changes: 0 additions & 3 deletions dev-lisp/sbcl/metadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@
available for the x86 and amd64 platforms using an NPTL enabled
GLIBC. SBCL 0.8.17 and later support Unicode.
</longdescription>
<use>
<flag name="pax_kernel">Enable if the user plans to run the package under a pax enabled hardened kernel</flag>
</use>
<upstream>
<remote-id type="sourceforge">sbcl</remote-id>
</upstream>
Expand Down
14 changes: 2 additions & 12 deletions dev-lisp/sbcl/sbcl-1.3.11.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,11 @@ SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
LICENSE="MIT"
SLOT="0/${PV}"
KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
IUSE="debug doc source +threads +unicode pax_kernel zlib"
IUSE="debug doc source +threads +unicode zlib"

CDEPEND=">=dev-lisp/asdf-3.1:="
DEPEND="${CDEPEND}
doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )
pax_kernel? ( sys-apps/elfix )"
doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )"
RDEPEND="${CDEPEND}
!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )"

Expand Down Expand Up @@ -150,15 +149,6 @@ src_compile() {

strip-unsupported-flags ; filter-flags -fomit-frame-pointer

if use pax_kernel ; then
# To disable PaX on hardened systems
pax-mark -mr "${bindir}"/src/runtime/sbcl

# Hack to disable PaX on second GENESIS stage
sed -i -e '/^[ \t]*echo \/\/doing warm init - compilation phase$/a\ paxmark.sh -mr \.\/src\/runtime\/sbcl' \
"${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime"
fi

# clear the environment to get rid of non-ASCII strings, see bug 174702
# set HOME for paludis
env - HOME="${T}" PATH="${PATH}" \
Expand Down
14 changes: 2 additions & 12 deletions dev-lisp/sbcl/sbcl-1.4.9.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,11 @@ SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
LICENSE="MIT"
SLOT="0/${PV}"
KEYWORDS="amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
IUSE="debug doc source +threads +unicode pax_kernel zlib"
IUSE="debug doc source +threads +unicode zlib"

CDEPEND=">=dev-lisp/asdf-3.1:="
DEPEND="${CDEPEND}
doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )
pax_kernel? ( sys-apps/elfix )"
doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )"
RDEPEND="${CDEPEND}
!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )"

Expand Down Expand Up @@ -157,15 +156,6 @@ src_configure() {
src_compile() {
local bindir="${WORKDIR}"/sbcl-binary

if use pax_kernel ; then
# To disable PaX on hardened systems
pax-mark -mr "${bindir}"/src/runtime/sbcl

# Hack to disable PaX on second GENESIS stage
sed -i -e '/^[ \t]*echo \/\/doing warm init - compilation phase$/a\ paxmark.sh -mr \.\/src\/runtime\/sbcl' \
"${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime"
fi

# clear the environment to get rid of non-ASCII strings, see bug #174702
# set HOME for paludis
env - HOME="${T}" PATH="${PATH}" \
Expand Down
14 changes: 2 additions & 12 deletions dev-lisp/sbcl/sbcl-2.0.10.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,11 @@ SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
LICENSE="MIT"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
IUSE="debug doc source +threads +unicode pax_kernel zlib"
IUSE="debug doc source +threads +unicode zlib"

CDEPEND=">=dev-lisp/asdf-3.3:="
DEPEND="${CDEPEND}
doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )
pax_kernel? ( sys-apps/elfix )"
doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )"
RDEPEND="${CDEPEND}
!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )"

Expand Down Expand Up @@ -153,15 +152,6 @@ src_configure() {
src_compile() {
local bindir="${WORKDIR}"/sbcl-binary

if use pax_kernel ; then
# To disable PaX on hardened systems
pax-mark -mr "${bindir}"/src/runtime/sbcl

# Hack to disable PaX on second GENESIS stage
sed -i -e '/^[ \t]*echo \/\/doing warm init - compilation phase$/a\ paxmark.sh -mr \.\/src\/runtime\/sbcl' \
"${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime"
fi

# clear the environment to get rid of non-ASCII strings, see bug #174702
# set HOME for paludis
env - HOME="${T}" PATH="${PATH}" \
Expand Down
14 changes: 2 additions & 12 deletions dev-lisp/sbcl/sbcl-2.0.11.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,11 @@ SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
LICENSE="MIT"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
IUSE="debug doc source +threads +unicode pax_kernel zlib"
IUSE="debug doc source +threads +unicode zlib"

CDEPEND=">=dev-lisp/asdf-3.3:="
DEPEND="${CDEPEND}
doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )
pax_kernel? ( sys-apps/elfix )"
doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )"
RDEPEND="${CDEPEND}
!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )"

Expand Down Expand Up @@ -153,15 +152,6 @@ src_configure() {
src_compile() {
local bindir="${WORKDIR}"/sbcl-binary

if use pax_kernel ; then
# To disable PaX on hardened systems
pax-mark -mr "${bindir}"/src/runtime/sbcl

# Hack to disable PaX on second GENESIS stage
sed -i -e '/^[ \t]*echo \/\/doing warm init - compilation phase$/a\ paxmark.sh -mr \.\/src\/runtime\/sbcl' \
"${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime"
fi

# clear the environment to get rid of non-ASCII strings, see bug #174702
# set HOME for paludis
env - HOME="${T}" PATH="${PATH}" \
Expand Down
14 changes: 2 additions & 12 deletions dev-lisp/sbcl/sbcl-2.1.0.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,11 @@ SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
LICENSE="MIT"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
IUSE="debug doc source +threads +unicode pax_kernel zlib"
IUSE="debug doc source +threads +unicode zlib"

CDEPEND=">=dev-lisp/asdf-3.3:="
DEPEND="${CDEPEND}
doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )
pax_kernel? ( sys-apps/elfix )"
doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )"
RDEPEND="${CDEPEND}
!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )"

Expand Down Expand Up @@ -155,15 +154,6 @@ src_configure() {
src_compile() {
local bindir="${WORKDIR}"/sbcl-binary

if use pax_kernel ; then
# To disable PaX on hardened systems
pax-mark -mr "${bindir}"/src/runtime/sbcl

# Hack to disable PaX on second GENESIS stage
sed -i -e '/^[ \t]*echo \/\/doing warm init - compilation phase$/a\ paxmark.sh -mr \.\/src\/runtime\/sbcl' \
"${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime"
fi

# clear the environment to get rid of non-ASCII strings, see bug #174702
# set HOME for paludis
env - HOME="${T}" PATH="${PATH}" \
Expand Down
14 changes: 2 additions & 12 deletions dev-lisp/sbcl/sbcl-2.1.1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,11 @@ SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
LICENSE="MIT"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
IUSE="debug doc source +threads +unicode pax_kernel zlib"
IUSE="debug doc source +threads +unicode zlib"

CDEPEND=">=dev-lisp/asdf-3.3:="
DEPEND="${CDEPEND}
doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )
pax_kernel? ( sys-apps/elfix )"
doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )"
RDEPEND="${CDEPEND}
!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )"

Expand Down Expand Up @@ -155,15 +154,6 @@ src_configure() {
src_compile() {
local bindir="${WORKDIR}"/sbcl-binary

if use pax_kernel ; then
# To disable PaX on hardened systems
pax-mark -mr "${bindir}"/src/runtime/sbcl

# Hack to disable PaX on second GENESIS stage
sed -i -e '/^[ \t]*echo \/\/doing warm init - compilation phase$/a\ paxmark.sh -mr \.\/src\/runtime\/sbcl' \
"${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime"
fi

# clear the environment to get rid of non-ASCII strings, see bug #174702
# set HOME for paludis
env - HOME="${T}" PATH="${PATH}" \
Expand Down
14 changes: 2 additions & 12 deletions dev-lisp/sbcl/sbcl-2.1.2.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,11 @@ SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
LICENSE="MIT"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
IUSE="debug doc source +threads +unicode pax_kernel zlib"
IUSE="debug doc source +threads +unicode zlib"

CDEPEND=">=dev-lisp/asdf-3.3:="
DEPEND="${CDEPEND}
doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )
pax_kernel? ( sys-apps/elfix )"
doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )"
RDEPEND="${CDEPEND}
!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )"

Expand Down Expand Up @@ -155,15 +154,6 @@ src_configure() {
src_compile() {
local bindir="${WORKDIR}"/sbcl-binary

if use pax_kernel ; then
# To disable PaX on hardened systems
pax-mark -mr "${bindir}"/src/runtime/sbcl

# Hack to disable PaX on second GENESIS stage
sed -i -e '/^[ \t]*echo \/\/doing warm init - compilation phase$/a\ paxmark.sh -mr \.\/src\/runtime\/sbcl' \
"${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime"
fi

# clear the environment to get rid of non-ASCII strings, see bug #174702
# set HOME for paludis
env - HOME="${T}" PATH="${PATH}" \
Expand Down
14 changes: 2 additions & 12 deletions dev-lisp/sbcl/sbcl-2.1.3.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,11 @@ SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
LICENSE="MIT"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
IUSE="debug doc source +threads +unicode pax_kernel zlib"
IUSE="debug doc source +threads +unicode zlib"

CDEPEND=">=dev-lisp/asdf-3.3:="
DEPEND="${CDEPEND}
doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )
pax_kernel? ( sys-apps/elfix )"
doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )"
RDEPEND="${CDEPEND}
!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )"

Expand Down Expand Up @@ -155,15 +154,6 @@ src_configure() {
src_compile() {
local bindir="${WORKDIR}"/sbcl-binary

if use pax_kernel ; then
# To disable PaX on hardened systems
pax-mark -mr "${bindir}"/src/runtime/sbcl

# Hack to disable PaX on second GENESIS stage
sed -i -e '/^[ \t]*echo \/\/doing warm init - compilation phase$/a\ paxmark.sh -mr \.\/src\/runtime\/sbcl' \
"${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime"
fi

# clear the environment to get rid of non-ASCII strings, see bug #174702
# set HOME for paludis
env - HOME="${T}" PATH="${PATH}" \
Expand Down
14 changes: 2 additions & 12 deletions dev-lisp/sbcl/sbcl-2.1.4.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,11 @@ SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
LICENSE="MIT"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
IUSE="debug doc source +threads +unicode pax_kernel zlib"
IUSE="debug doc source +threads +unicode zlib"

CDEPEND=">=dev-lisp/asdf-3.3:="
DEPEND="${CDEPEND}
doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )
pax_kernel? ( sys-apps/elfix )"
doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )"
RDEPEND="${CDEPEND}
!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )"

Expand Down Expand Up @@ -155,15 +154,6 @@ src_configure() {
src_compile() {
local bindir="${WORKDIR}"/sbcl-binary

if use pax_kernel ; then
# To disable PaX on hardened systems
pax-mark -mr "${bindir}"/src/runtime/sbcl

# Hack to disable PaX on second GENESIS stage
sed -i -e '/^[ \t]*echo \/\/doing warm init - compilation phase$/a\ paxmark.sh -mr \.\/src\/runtime\/sbcl' \
"${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime"
fi

# clear the environment to get rid of non-ASCII strings, see bug #174702
# set HOME for paludis
env - HOME="${T}" PATH="${PATH}" \
Expand Down
14 changes: 2 additions & 12 deletions dev-lisp/sbcl/sbcl-2.1.5.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,11 @@ SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
LICENSE="MIT"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
IUSE="debug doc source +threads +unicode pax_kernel zlib"
IUSE="debug doc source +threads +unicode zlib"

CDEPEND=">=dev-lisp/asdf-3.3:="
DEPEND="${CDEPEND}
doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )
pax_kernel? ( sys-apps/elfix )"
doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )"
RDEPEND="${CDEPEND}
!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )"

Expand Down Expand Up @@ -155,15 +154,6 @@ src_configure() {
src_compile() {
local bindir="${WORKDIR}"/sbcl-binary

if use pax_kernel ; then
# To disable PaX on hardened systems
pax-mark -mr "${bindir}"/src/runtime/sbcl

# Hack to disable PaX on second GENESIS stage
sed -i -e '/^[ \t]*echo \/\/doing warm init - compilation phase$/a\ paxmark.sh -mr \.\/src\/runtime\/sbcl' \
"${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime"
fi

# clear the environment to get rid of non-ASCII strings, see bug #174702
# set HOME for paludis
env - HOME="${T}" PATH="${PATH}" \
Expand Down

0 comments on commit 561bda2

Please sign in to comment.