* [gentoo-commits] gentoo-x86 commit in dev-lang/ghc: ghc-7.8.3.ebuild ChangeLog
@ 2014-07-10 19:31 Sergei Trofimovich (slyfox)
0 siblings, 0 replies; 8+ messages in thread
From: Sergei Trofimovich (slyfox) @ 2014-07-10 19:31 UTC (permalink / raw
To: gentoo-commits
slyfox 14/07/10 19:31:42
Modified: ChangeLog
Added: ghc-7.8.3.ebuild
Log:
Version bump.
(Portage version: 2.2.10_p15/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)
Revision Changes Path
1.258 dev-lang/ghc/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.258&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.258&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?r1=1.257&r2=1.258
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -r1.257 -r1.258
--- ChangeLog 5 Jul 2014 15:40:40 -0000 1.257
+++ ChangeLog 10 Jul 2014 19:31:41 -0000 1.258
@@ -1,6 +1,13 @@
# ChangeLog for dev-lang/ghc
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.257 2014/07/05 15:40:40 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.258 2014/07/10 19:31:41 slyfox Exp $
+
+*ghc-7.8.3 (10 Jul 2014)
+
+ 10 Jul 2014; Sergei Trofimovich <slyfox@gentoo.org>
+ +files/ghc-7.8.1_rc1-libbfd.patch, +files/ghc-7.8.2-cgen-constify.patch,
+ +files/ghc-7.8.2-ia64-no-shared.patch, +ghc-7.8.3.ebuild:
+ Version bump.
05 Jul 2014; Sergei Trofimovich <slyfox@gentoo.org> ghc-7.6.3-r1.ebuild:
pax-mark ghc-stage2 before it's used first time. Fixes bootstrap failure on
1.1 dev-lang/ghc/ghc-7.8.3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild?rev=1.1&content-type=text/plain
Index: ghc-7.8.3.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild,v 1.1 2014/07/10 19:31:41 slyfox Exp $
EAPI=5
# to make make a crosscompiler use crossdev and symlink ghc tree into
# cross overlay. result would look like 'cross-sparc-unknown-linux-gnu/ghc'
#
# 'CTARGET' definition and 'is_crosscompile' are taken from 'toolchain.eclass'
export CTARGET=${CTARGET:-${CHOST}}
if [[ ${CTARGET} = ${CHOST} ]] ; then
if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
export CTARGET=${CATEGORY/cross-}
fi
fi
inherit autotools bash-completion-r1 eutils flag-o-matic ghc-package
inherit multilib pax-utils toolchain-funcs versionator
DESCRIPTION="The Glasgow Haskell Compiler"
HOMEPAGE="http://www.haskell.org/ghc/"
# we don't have any binaries yet
arch_binaries=""
# sorted!
#arch_binaries="$arch_binaries alpha? ( http://code.haskell.org/~slyfox/ghc-alpha/ghc-bin-${PV}-alpha.tbz2 )"
#arch_binaries="$arch_binaries arm? ( http://code.haskell.org/~slyfox/ghc-arm/ghc-bin-${PV}-arm.tbz2 )"
#arch_binaries="$arch_binaries amd64? ( http://code.haskell.org/~slyfox/ghc-amd64/ghc-bin-${PV}-amd64.tbz2 )"
#arch_binaries="$arch_binaries ia64? ( http://code.haskell.org/~slyfox/ghc-ia64/ghc-bin-${PV}-ia64-fixed-fiw.tbz2 )"
#arch_binaries="$arch_binaries ppc? ( http://code.haskell.org/~slyfox/ghc-ppc/ghc-bin-${PV}-ppc.tbz2 )"
#arch_binaries="$arch_binaries ppc64? ( http://code.haskell.org/~slyfox/ghc-ppc64/ghc-bin-${PV}-ppc64.tbz2 )"
#arch_binaries="$arch_binaries sparc? ( http://code.haskell.org/~slyfox/ghc-sparc/ghc-bin-${PV}-sparc.tbz2 )"
#arch_binaries="$arch_binaries x86? ( http://code.haskell.org/~slyfox/ghc-x86/ghc-bin-${PV}-x86.tbz2 )"
# various ports:
#arch_binaries="$arch_binaries x86-fbsd? ( http://code.haskell.org/~slyfox/ghc-x86-fbsd/ghc-bin-${PV}-x86-fbsd.tbz2 )"
# 0 - yet
yet_binary() {
case "${ARCH}" in
#alpha) return 0 ;;
#arm)
# ewarn "ARM binary is built on armv5tel-eabi toolchain. Use with caution."
# return 0
#;;
#amd64) return 0 ;;
#ia64) return 0 ;;
#ppc) return 0 ;;
#ppc64) return 0 ;;
#sparc) return 0 ;;
#x86) return 0 ;;
*) return 1 ;;
esac
}
GHC_PV=${PV}
#GHC_PV=7.8.0.20140228 # uncomment only for -rc ebuilds
GHC_P=${PN}-${GHC_PV} # using ${P} is almost never correct
SRC_URI="!binary? ( http://www.haskell.org/ghc/dist/${PV/_rc/-rc}/${GHC_P}-src.tar.xz )"
S="${WORKDIR}"/${GHC_P}
[[ -n $arch_binaries ]] && SRC_URI+=" !ghcbootstrap? ( $arch_binaries )"
LICENSE="BSD"
SLOT="0/${PV}"
#KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
KEYWORDS=""
IUSE="doc ghcbootstrap ghcmakebinary +gmp"
IUSE+=" binary"
IUSE+=" elibc_glibc" # system stuff
RDEPEND="
>=dev-lang/perl-5.6.1
>=dev-libs/gmp-5:=
sys-libs/ncurses:=[unicode]
!ghcmakebinary? ( virtual/libffi:= )
!kernel_Darwin? ( >=sys-devel/gcc-2.95.3 )
kernel_linux? ( >=sys-devel/binutils-2.17 )
kernel_SunOS? ( >=sys-devel/binutils-2.17 )
"
# force dependency on >=gmp-5, even if >=gmp-4.1 would be enough. this is due to
# that we want the binaries to use the latest versioun available, and not to be
# built against gmp-4
# similar for glibc. we have bootstrapped binaries against glibc-2.17
DEPEND="${RDEPEND}
ghcbootstrap? ( >=dev-haskell/alex-2.3
>=dev-haskell/happy-1.18
doc? ( app-text/docbook-xml-dtd:4.2
app-text/docbook-xml-dtd:4.5
app-text/docbook-xsl-stylesheets
>=dev-libs/libxslt-1.1.2 ) )
!ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) )"
PDEPEND="!ghcbootstrap? ( =app-admin/haskell-updater-1.2* )"
REQUIRED_USE="?? ( ghcbootstrap binary )"
# ia64 fails to return from STG GMP primitives (stage2 always SIGSEGVs)
REQUIRED_USE+=" ia64? ( !gmp )"
# yeah, top-level 'use' sucks. I'd like to have it in 'src_install()'
use binary && QA_PREBUILT="*"
# haskell libraries built with cabal in configure mode, #515354
QA_CONFIGURE_OPTIONS+=" --with-compiler --with-gcc"
is_crosscompile() {
[[ ${CHOST} != ${CTARGET} ]]
}
append-ghc-cflags() {
local persistent compile assemble link
local flag ghcflag
for flag in $*; do
case ${flag} in
persistent) persistent="yes";;
compile) compile="yes";;
assemble) assemble="yes";;
link) link="yes";;
*)
[[ ${compile} ]] && ghcflag="-optc${flag}" CFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" &&
[[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}"
[[ ${assemble} ]] && ghcflag="-opta${flag}" CFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" &&
[[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}"
[[ ${link} ]] && ghcflag="-optl${flag}" LDFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" &&
[[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}"
;;
esac
done
}
ghc_setup_cflags() {
if is_crosscompile; then
export CFLAGS=${GHC_CFLAGS-"-O2 -pipe"}
export LDFLAGS=${GHC_LDFLAGS-"-Wl,-O1"}
einfo "Crosscompiling mode:"
einfo " CHOST: ${CHOST}"
einfo " CTARGET: ${CTARGET}"
einfo " CFLAGS: ${CFLAGS}"
einfo " LDFLAGS: ${LDFLAGS}"
return
fi
# We need to be very careful with the CFLAGS we ask ghc to pass through to
# gcc. There are plenty of flags which will make gcc produce output that
# breaks ghc in various ways. The main ones we want to pass through are
# -mcpu / -march flags. These are important for arches like alpha & sparc.
# We also use these CFLAGS for building the C parts of ghc, ie the rts.
strip-flags
strip-unsupported-flags
# Cmm can't parse line numbers #482086
replace-flags -ggdb[3-9] -ggdb2
GHC_FLAGS=""
GHC_PERSISTENT_FLAGS=""
for flag in ${CFLAGS}; do
case ${flag} in
# Ignore extra optimisation (ghc passes -O to gcc anyway)
# -O2 and above break on too many systems
-O*) ;;
# Arch and ABI flags are what we're really after
-m*) append-ghc-cflags compile assemble ${flag};;
# Sometimes it's handy to see backtrace of RTS
# to get an idea what happens there
-g*) append-ghc-cflags compile ${flag};;
# Ignore all other flags, including all -f* flags
esac
done
for flag in ${LDFLAGS}; do
append-ghc-cflags link ${flag}
done
# hardened-gcc needs to be disabled, because the mangler doesn't accept
# its output.
gcc-specs-pie && append-ghc-cflags persistent compile link -nopie
gcc-specs-ssp && append-ghc-cflags persistent compile -fno-stack-protector
# prevent from failind building unregisterised ghc:
# http://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg171602.html
use ppc64 && append-ghc-cflags persistent compile -mminimal-toc
# fix the similar issue as ppc64 TOC on ia64. ia64 has limited size of small data
# currently ghc fails to build haddock
# http://osdir.com/ml/gnu.binutils.bugs/2004-10/msg00050.html
use ia64 && append-ghc-cflags persistent compile -G0 -Os
}
# substitutes string $1 to $2 in files $3 $4 ...
relocate_path() {
local from=$1
local to=$2
shift 2
local file=
for file in "$@"
do
sed -i -e "s|$from|$to|g" \
"$file" || die "path relocation failed for '$file'"
done
}
# changes hardcoded ghc paths and updates package index
# $1 - new absolute root path
relocate_ghc() {
local to=$1
# libdir for prebuilt binary and for current system may mismatch
# It does for prefix installation for example: bug #476998
local bin_ghc_prefix=${WORKDIR}/usr
local bin_libpath=$(echo "${bin_ghc_prefix}"/lib*)
local bin_libdir=${bin_libpath#${bin_ghc_prefix}/}
# backup original script to use it later after relocation
local gp_back="${T}/ghc-pkg-${GHC_PV}-orig"
cp "${WORKDIR}/usr/bin/ghc-pkg-${GHC_PV}" "$gp_back" || die "unable to backup ghc-pkg wrapper"
if [[ ${bin_libdir} != $(get_libdir) ]]; then
einfo "Relocating '${bin_libdir}' to '$(get_libdir)' (bug #476998)"
# moving the dir itself is not strictly needed
# but then USE=binary would result in installing
# in '${bin_libdir}'
mv "${bin_ghc_prefix}/${bin_libdir}" "${bin_ghc_prefix}/$(get_libdir)" || die
relocate_path "/usr/${bin_libdir}" "/usr/$(get_libdir)" \
"${WORKDIR}/usr/bin/ghc-${GHC_PV}" \
"${WORKDIR}/usr/bin/ghci-${GHC_PV}" \
"${WORKDIR}/usr/bin/ghc-pkg-${GHC_PV}" \
"${WORKDIR}/usr/bin/hsc2hs" \
"${WORKDIR}/usr/bin/runghc-${GHC_PV}" \
"$gp_back" \
"${WORKDIR}/usr/$(get_libdir)/${GHC_P}/package.conf.d/"*
fi
# Relocate from /usr to ${EPREFIX}/usr
relocate_path "/usr" "${to}/usr" \
"${WORKDIR}/usr/bin/ghc-${GHC_PV}" \
"${WORKDIR}/usr/bin/ghci-${GHC_PV}" \
"${WORKDIR}/usr/bin/ghc-pkg-${GHC_PV}" \
"${WORKDIR}/usr/bin/hsc2hs" \
"${WORKDIR}/usr/bin/runghc-${GHC_PV}" \
"${WORKDIR}/usr/$(get_libdir)/${GHC_P}/package.conf.d/"*
# this one we will use to regenerate cache
# so it should point to current tree location
relocate_path "/usr" "${WORKDIR}/usr" "$gp_back"
if use prefix; then
# and insert LD_LIBRARY_PATH entry to EPREFIX dir tree
# TODO: add the same for darwin's CHOST and it's DYLD_
local new_ldpath='LD_LIBRARY_PATH="'${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir)'${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}"\nexport LD_LIBRARY_PATH'
sed -i -e '2i'"$new_ldpath" \
"${WORKDIR}/usr/bin/ghc-${GHC_PV}" \
"${WORKDIR}/usr/bin/ghci-${GHC_PV}" \
"${WORKDIR}/usr/bin/ghc-pkg-${GHC_PV}" \
"${WORKDIR}/usr/bin/hsc2hs" \
"${WORKDIR}/usr/bin/runghc-${GHC_PV}" \
"$gp_back" \
"${WORKDIR}/usr/bin/hsc2hs" \
|| die "Adding LD_LIBRARY_PATH for wrappers failed"
fi
# regenerate the binary package cache
"$gp_back" recache || die "failed to update cache after relocation"
rm "$gp_back"
}
pkg_setup() {
if use ghcbootstrap; then
ewarn "You requested ghc bootstrapping, this is usually only used"
ewarn "by Gentoo developers to make binary .tbz2 packages."
[[ -z $(type -P ghc) ]] && \
die "Could not find a ghc to bootstrap with."
else
if ! yet_binary; then
eerror "Please try emerging with USE=ghcbootstrap and report build"
eerror "sucess or failure to the haskell team (haskell@gentoo.org)"
die "No binary available for '${ARCH}' arch yet, USE=ghcbootstrap"
fi
fi
}
src_unpack() {
# Create the ${S} dir if we're using the binary version
use binary && mkdir "${S}"
# the Solaris and Darwin binaries from ghc (maeder) need to be
# unpacked separately, so prevent them from being unpacked
local ONLYA=${A}
case ${CHOST} in
*-darwin* | *-solaris*) ONLYA=${GHC_P}-src.tar.bz2 ;;
esac
unpack ${ONLYA}
if [[ -d "${S}"/libraries/dph ]]; then
# Sometimes dph libs get accidentally shipped with ghc
# but they are not installed unless user requests it.
# We never install them.
elog "Removing 'libraries/dph'"
rm -rf "${S}"/libraries/dph
fi
}
src_prepare() {
ghc_setup_cflags
if ! use ghcbootstrap && [[ ${CHOST} != *-darwin* && ${CHOST} != *-solaris* ]]; then
# Modify the wrapper script from the binary tarball to use GHC_PERSISTENT_FLAGS.
# See bug #313635.
sed -i -e "s|\"\$topdir\"|\"\$topdir\" ${GHC_PERSISTENT_FLAGS}|" \
"${WORKDIR}/usr/bin/ghc-${GHC_PV}"
# allow hardened users use vanilla binary to bootstrap ghc
# ghci uses mmap with rwx protection at it implements dynamic
# linking on it's own (bug #299709)
pax-mark -m "${WORKDIR}/usr/$(get_libdir)/${GHC_P}/bin/ghc"
fi
if use binary; then
if use prefix; then
relocate_ghc "${EPREFIX}"
fi
# Move unpacked files to the expected place
mv "${WORKDIR}/usr" "${S}"
else
if ! use ghcbootstrap; then
case ${CHOST} in
*-darwin* | *-solaris*)
# UPDATE ME for ghc-7
mkdir "${WORKDIR}"/ghc-bin-installer || die
pushd "${WORKDIR}"/ghc-bin-installer > /dev/null || die
use sparc-solaris && unpack ghc-6.10.4-sparc-sun-solaris2.tar.bz2
use x86-solaris && unpack ghc-7.0.3-i386-unknown-solaris2.tar.bz2
use x86-macos && unpack ghc-7.4.1-i386-apple-darwin.tar.bz2
use x64-macos && unpack ghc-7.4.1-x86_64-apple-darwin.tar.bz2
popd > /dev/null
pushd "${WORKDIR}"/ghc-bin-installer/ghc-[67].?*.? > /dev/null || die
# fix the binaries so they run, on Solaris we need an
# LD_LIBRARY_PATH which has our prefix libdirs, on
# Darwin we need to replace the frameworks with our libs
# from the prefix fix before installation, because some
# of the tools are actually used during configure/make
if [[ ${CHOST} == *-solaris* ]] ; then
export LD_LIBRARY_PATH="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir):${LD_LIBRARY_PATH}"
elif [[ ${CHOST} == *-darwin* ]] ; then
local readline_framework=GNUreadline.framework/GNUreadline
local gmp_framework=/opt/local/lib/libgmp.10.dylib
local ncurses_file=/opt/local/lib/libncurses.5.dylib
for binary in $(scanmacho -BRE MH_EXECUTE -F '%F' .) ; do
install_name_tool -change \
${readline_framework} \
"${EPREFIX}"/lib/libreadline.dylib \
${binary} || die
install_name_tool -change \
${gmp_framework} \
"${EPREFIX}"/usr/lib/libgmp.dylib \
${binary} || die
install_name_tool -change \
${ncurses_file} \
"${EPREFIX}"/usr/lib/libncurses.dylib \
${binary} || die
done
# we don't do frameworks!
sed -i \
-e 's/\(frameworks = \)\["GMP"\]/\1[]/g' \
-e 's/\(extraLibraries = \)\["m"\]/\1["m","gmp"]/g' \
rts/package.conf.in || die
fi
# it is autoconf, but we really don't want to give it too
# much arguments, in fact we do the make in-place anyway
./configure --prefix="${WORKDIR}"/usr || die
make install || die
popd > /dev/null
;;
*)
relocate_ghc "${WORKDIR}"
;;
esac
fi
sed -i -e "s|\"\$topdir\"|\"\$topdir\" ${GHC_PERSISTENT_FLAGS}|" \
"${S}/ghc/ghc.wrapper"
cd "${S}" # otherwise epatch will break
epatch "${FILESDIR}/ghc-7.0.4-CHOST-prefix.patch"
epatch "${FILESDIR}"/${PN}-7.8.1_rc1-libbfd.patch
epatch "${FILESDIR}"/${PN}-7.8.2-ia64-no-shared.patch
epatch "${FILESDIR}"/${PN}-7.8.2-cgen-constify.patch
if use prefix; then
# Make configure find docbook-xsl-stylesheets from Prefix
sed -e '/^FP_DIR_DOCBOOK_XSL/s:\[.*\]:['"${EPREFIX}"'/usr/share/sgml/docbook/xsl-stylesheets/]:' \
-i utils/haddock/doc/configure.ac || die
fi
# as we have changed the build system
eautoreconf
fi
}
src_configure() {
if ! use binary; then
# initialize build.mk
echo '# Gentoo changes' > mk/build.mk
# Put docs into the right place, ie /usr/share/doc/ghc-${GHC_PV}
echo "docdir = ${EPREFIX}/usr/share/doc/${P}" >> mk/build.mk
echo "htmldir = ${EPREFIX}/usr/share/doc/${P}" >> mk/build.mk
# We also need to use the GHC_FLAGS flags when building ghc itself
echo "SRC_HC_OPTS+=${GHC_FLAGS}" >> mk/build.mk
echo "SRC_CC_OPTS+=${CFLAGS}" >> mk/build.mk
echo "SRC_LD_OPTS+=${LDFLAGS}" >> mk/build.mk
# We can't depend on haddock except when bootstrapping when we
# must build docs and include them into the binary .tbz2 package
# app-text/dblatex is not in portage, can not build PDF or PS
if use ghcbootstrap && use doc; then
echo "BUILD_DOCBOOK_PDF = NO" >> mk/build.mk
echo "BUILD_DOCBOOK_PS = NO" >> mk/build.mk
echo "BUILD_DOCBOOK_HTML = YES" >> mk/build.mk
echo "HADDOCK_DOCS = YES" >> mk/build.mk
else
echo "BUILD_DOCBOOK_PDF = NO" >> mk/build.mk
echo "BUILD_DOCBOOK_PS = NO" >> mk/build.mk
echo "BUILD_DOCBOOK_HTML = NO" >> mk/build.mk
echo "HADDOCK_DOCS = NO" >> mk/build.mk
fi
# allows overriding build flavours for libraries:
# v - vanilla (static libs)
# p - profiled
# dyn - shared libraries
# example: GHC_LIBRARY_WAYS="v dyn"
if [[ -n ${GHC_LIBRARY_WAYS} ]]; then
echo "GhcLibWays=${GHC_LIBRARY_WAYS}" >> mk/build.mk
fi
# Get ghc from the unpacked binary .tbz2
# except when bootstrapping we just pick ghc up off the path
if ! use ghcbootstrap; then
export PATH="${WORKDIR}/usr/bin:${PATH}"
fi
if use gmp; then
echo "INTEGER_LIBRARY=integer-gmp" >> mk/build.mk
else
echo "INTEGER_LIBRARY=integer-simple" >> mk/build.mk
fi
# don't strip anything. Very useful when stage2 SIGSEGVs on you
echo "STRIP_CMD = :" >> mk/build.mk
local econf_args=()
# GHC embeds 'gcc' it was built by and uses it later.
# Don't allow things like ccache or versioned binary slip.
# We use stable thing across gcc upgrades.
is_crosscompile || econf_args+=(--with-gcc=${CHOST}-gcc)
if ! use ghcmakebinary; then
econf_args+=(--with-system-libffi)
econf_args+=(--with-ffi-includes=$(pkg-config libffi --cflags-only-I | sed -e 's@^-I@@'))
fi
econf ${econf_args[@]} --enable-bootstrap-with-devel-snapshot
if [[ ${PV} == *9999* ]]; then
GHC_PV="$(grep 'S\[\"PACKAGE_VERSION\"\]' config.status | sed -e 's@^.*=\"\(.*\)\"@\1@')"
GHC_P=${PN}-${GHC_PV}
fi
GHC_TPF="$(grep 'S\[\"TargetPlatformFull\"\]' config.status | sed -e 's@^.*=\"\(.*\)\"@\1@')"
fi # ! use binary
}
src_compile() {
if ! use binary; then
# 1. build compiler binary(+wrapper) first
emake inplace/bin/ghc-stage2
# 2. pax-mark (bug #516430)
pax-mark -m inplace/lib/bin/ghc-stage2
# 3. and then all the rest
emake all
fi # ! use binary
}
src_install() {
if use binary; then
use prefix && mkdir -p "${ED}"
mv "${S}/usr" "${ED}"
# Remove the docs if not requested
if ! use doc; then
rm -rf "${ED}/usr/share/doc/${P}/*/" \
"${ED}/usr/share/doc/${P}/*.html" \
|| die "could not remove docs (P vs PF revision mismatch?)"
fi
else
# We only build docs if we were bootstrapping, otherwise
# we copy them out of the unpacked binary .tbz2
if use doc && ! use ghcbootstrap; then
mkdir -p "${ED}/usr/share/doc"
mv "${WORKDIR}/usr/share/doc/${P}" "${ED}/usr/share/doc" \
|| die "failed to copy docs"
else
dodoc "${S}/distrib/README" "${S}/ANNOUNCE" "${S}/LICENSE" "${S}/VERSION"
fi
emake -j1 install DESTDIR="${D}"
# remove link, but leave 'haddock-${GHC_P}'
rm -f "${ED}"/usr/bin/haddock
# ghci uses mmap with rwx protection at it implements dynamic
# linking on it's own (bug #299709)
# so mark resulting binary
pax-mark -m "${ED}/usr/$(get_libdir)/${GHC_P}/ghc"
if [[ ! -f "${S}/VERSION" ]]; then
echo "${GHC_PV}" > "${S}/VERSION" \
|| die "Could not create file ${S}/VERSION"
fi
dobashcomp "${FILESDIR}/ghc-bash-completion"
fi
# path to the package.cache
local package_confdir="${ED}/usr/$(get_libdir)/${GHC_P}/package.conf.d"
PKGCACHE="${package_confdir}"/package.cache
# copy the package.conf.d, including timestamp, save it so we can help
# users that have a broken package.conf.d
cp -pR "${package_confdir}"{,.initial} || die "failed to backup intial package.conf.d"
# copy the package.conf, including timestamp, save it so we later can put it
# back before uninstalling, or when upgrading.
cp -p "${PKGCACHE}"{,.shipped} \
|| die "failed to copy package.conf.d/package.cache"
}
pkg_preinst() {
# have we got an earlier version of ghc installed?
if has_version "<${CATEGORY}/${PF}"; then
haskell_updater_warn="1"
fi
}
pkg_postinst() {
ghc-reregister
# path to the package.cache
PKGCACHE="${EROOT}/usr/$(get_libdir)/${GHC_P}/package.conf.d/package.cache"
# give the cache a new timestamp, it must be as recent as
# the package.conf.d directory.
touch "${PKGCACHE}"
if [[ "${haskell_updater_warn}" == "1" ]]; then
ewarn
ewarn "\e[1;31m************************************************************************\e[0m"
ewarn
ewarn "You have just upgraded from an older version of GHC."
ewarn "You may have to run"
ewarn " 'haskell-updater --upgrade'"
ewarn "to rebuild all ghc-based Haskell libraries."
ewarn
ewarn "\e[1;31m************************************************************************\e[0m"
ewarn
fi
}
pkg_prerm() {
# Be very careful here... Call order when upgrading is (according to PMS):
# * src_install for new package
# * pkg_preinst for new package
# * pkg_postinst for new package
# * pkg_prerm for the package being replaced
# * pkg_postrm for the package being replaced
# so you'll actually be touching the new packages files, not the one you
# uninstall, due to that or installation directory ${GHC_P} will be the same for
# both packages.
# Call order for reinstalling is (according to PMS):
# * src_install
# * pkg_preinst
# * pkg_prerm for the package being replaced
# * pkg_postrm for the package being replaced
# * pkg_postinst
# Overwrite the modified package.cache with a copy of the
# original one, so that it will be removed during uninstall.
PKGCACHE="${EROOT}/usr/$(get_libdir)/${GHC_P}/package.conf.d/package.cache"
rm -rf "${PKGCACHE}"
cp -p "${PKGCACHE}"{.shipped,}
}
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-lang/ghc: ghc-7.8.3.ebuild ChangeLog
@ 2014-07-12 6:18 Sergei Trofimovich (slyfox)
0 siblings, 0 replies; 8+ messages in thread
From: Sergei Trofimovich (slyfox) @ 2014-07-12 6:18 UTC (permalink / raw
To: gentoo-commits
slyfox 14/07/12 06:18:49
Modified: ghc-7.8.3.ebuild ChangeLog
Log:
Added amd64 and x86 binaries.
(Portage version: 2.2.10_p15/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)
Revision Changes Path
1.2 dev-lang/ghc/ghc-7.8.3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild?r1=1.1&r2=1.2
Index: ghc-7.8.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ghc-7.8.3.ebuild 10 Jul 2014 19:31:41 -0000 1.1
+++ ghc-7.8.3.ebuild 12 Jul 2014 06:18:49 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild,v 1.1 2014/07/10 19:31:41 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild,v 1.2 2014/07/12 06:18:49 slyfox Exp $
EAPI=5
@@ -27,12 +27,12 @@
# sorted!
#arch_binaries="$arch_binaries alpha? ( http://code.haskell.org/~slyfox/ghc-alpha/ghc-bin-${PV}-alpha.tbz2 )"
#arch_binaries="$arch_binaries arm? ( http://code.haskell.org/~slyfox/ghc-arm/ghc-bin-${PV}-arm.tbz2 )"
-#arch_binaries="$arch_binaries amd64? ( http://code.haskell.org/~slyfox/ghc-amd64/ghc-bin-${PV}-amd64.tbz2 )"
+arch_binaries="$arch_binaries amd64? ( http://code.haskell.org/~slyfox/ghc-amd64/ghc-bin-${PV}-amd64.tbz2 )"
#arch_binaries="$arch_binaries ia64? ( http://code.haskell.org/~slyfox/ghc-ia64/ghc-bin-${PV}-ia64-fixed-fiw.tbz2 )"
#arch_binaries="$arch_binaries ppc? ( http://code.haskell.org/~slyfox/ghc-ppc/ghc-bin-${PV}-ppc.tbz2 )"
#arch_binaries="$arch_binaries ppc64? ( http://code.haskell.org/~slyfox/ghc-ppc64/ghc-bin-${PV}-ppc64.tbz2 )"
#arch_binaries="$arch_binaries sparc? ( http://code.haskell.org/~slyfox/ghc-sparc/ghc-bin-${PV}-sparc.tbz2 )"
-#arch_binaries="$arch_binaries x86? ( http://code.haskell.org/~slyfox/ghc-x86/ghc-bin-${PV}-x86.tbz2 )"
+arch_binaries="$arch_binaries x86? ( http://code.haskell.org/~slyfox/ghc-x86/ghc-bin-${PV}-x86.tbz2 )"
# various ports:
#arch_binaries="$arch_binaries x86-fbsd? ( http://code.haskell.org/~slyfox/ghc-x86-fbsd/ghc-bin-${PV}-x86-fbsd.tbz2 )"
@@ -45,12 +45,12 @@
# ewarn "ARM binary is built on armv5tel-eabi toolchain. Use with caution."
# return 0
#;;
- #amd64) return 0 ;;
+ amd64) return 0 ;;
#ia64) return 0 ;;
#ppc) return 0 ;;
#ppc64) return 0 ;;
#sparc) return 0 ;;
- #x86) return 0 ;;
+ x86) return 0 ;;
*) return 1 ;;
esac
}
1.259 dev-lang/ghc/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.259&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.259&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?r1=1.258&r2=1.259
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -r1.258 -r1.259
--- ChangeLog 10 Jul 2014 19:31:41 -0000 1.258
+++ ChangeLog 12 Jul 2014 06:18:49 -0000 1.259
@@ -1,6 +1,9 @@
# ChangeLog for dev-lang/ghc
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.258 2014/07/10 19:31:41 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.259 2014/07/12 06:18:49 slyfox Exp $
+
+ 12 Jul 2014; Sergei Trofimovich <slyfox@gentoo.org> ghc-7.8.3.ebuild:
+ Added amd64 and x86 binaries.
*ghc-7.8.3 (10 Jul 2014)
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-lang/ghc: ghc-7.8.3.ebuild ChangeLog
@ 2014-07-30 11:47 Sergei Trofimovich (slyfox)
0 siblings, 0 replies; 8+ messages in thread
From: Sergei Trofimovich (slyfox) @ 2014-07-30 11:47 UTC (permalink / raw
To: gentoo-commits
slyfox 14/07/30 11:47:32
Modified: ghc-7.8.3.ebuild ChangeLog
Log:
Fix underlinking of ghc-prim. Workarounds ghc-stage2 ld.so SIGSEGV on hardened (reported by aranea).
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)
Revision Changes Path
1.3 dev-lang/ghc/ghc-7.8.3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild?r1=1.2&r2=1.3
Index: ghc-7.8.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ghc-7.8.3.ebuild 12 Jul 2014 06:18:49 -0000 1.2
+++ ghc-7.8.3.ebuild 30 Jul 2014 11:47:32 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild,v 1.2 2014/07/12 06:18:49 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild,v 1.3 2014/07/30 11:47:32 slyfox Exp $
EAPI=5
@@ -399,6 +399,7 @@
epatch "${FILESDIR}"/${PN}-7.8.2-ia64-no-shared.patch
epatch "${FILESDIR}"/${PN}-7.8.2-cgen-constify.patch
+ epatch "${FILESDIR}"/${PN}-7.8.3-prim-lm.patch
if use prefix; then
# Make configure find docbook-xsl-stylesheets from Prefix
1.260 dev-lang/ghc/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.260&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.260&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?r1=1.259&r2=1.260
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v
retrieving revision 1.259
retrieving revision 1.260
diff -u -r1.259 -r1.260
--- ChangeLog 12 Jul 2014 06:18:49 -0000 1.259
+++ ChangeLog 30 Jul 2014 11:47:32 -0000 1.260
@@ -1,6 +1,11 @@
# ChangeLog for dev-lang/ghc
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.259 2014/07/12 06:18:49 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.260 2014/07/30 11:47:32 slyfox Exp $
+
+ 30 Jul 2014; Sergei Trofimovich <slyfox@gentoo.org>
+ +files/ghc-7.8.3-prim-lm.patch, ghc-7.8.3.ebuild:
+ Fix underlinking of ghc-prim. Workarounds ghc-stage2 ld.so SIGSEGV on hardened
+ (reported by aranea).
12 Jul 2014; Sergei Trofimovich <slyfox@gentoo.org> ghc-7.8.3.ebuild:
Added amd64 and x86 binaries.
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-lang/ghc: ghc-7.8.3.ebuild ChangeLog
@ 2014-07-30 13:20 Sergei Trofimovich (slyfox)
0 siblings, 0 replies; 8+ messages in thread
From: Sergei Trofimovich (slyfox) @ 2014-07-30 13:20 UTC (permalink / raw
To: gentoo-commits
slyfox 14/07/30 13:20:17
Modified: ghc-7.8.3.ebuild ChangeLog
Log:
Fix pax-marking command for final ghc binary.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)
Revision Changes Path
1.4 dev-lang/ghc/ghc-7.8.3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild?r1=1.3&r2=1.4
Index: ghc-7.8.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ghc-7.8.3.ebuild 30 Jul 2014 11:47:32 -0000 1.3
+++ ghc-7.8.3.ebuild 30 Jul 2014 13:20:16 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild,v 1.3 2014/07/30 11:47:32 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild,v 1.4 2014/07/30 13:20:16 slyfox Exp $
EAPI=5
@@ -528,7 +528,7 @@
# ghci uses mmap with rwx protection at it implements dynamic
# linking on it's own (bug #299709)
# so mark resulting binary
- pax-mark -m "${ED}/usr/$(get_libdir)/${GHC_P}/ghc"
+ pax-mark -m "${ED}/usr/$(get_libdir)/${GHC_P}/bin/ghc"
if [[ ! -f "${S}/VERSION" ]]; then
echo "${GHC_PV}" > "${S}/VERSION" \
1.261 dev-lang/ghc/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.261&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.261&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?r1=1.260&r2=1.261
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v
retrieving revision 1.260
retrieving revision 1.261
diff -u -r1.260 -r1.261
--- ChangeLog 30 Jul 2014 11:47:32 -0000 1.260
+++ ChangeLog 30 Jul 2014 13:20:16 -0000 1.261
@@ -1,6 +1,9 @@
# ChangeLog for dev-lang/ghc
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.260 2014/07/30 11:47:32 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.261 2014/07/30 13:20:16 slyfox Exp $
+
+ 30 Jul 2014; Sergei Trofimovich <slyfox@gentoo.org> ghc-7.8.3.ebuild:
+ Fix pax-marking command for final ghc binary.
30 Jul 2014; Sergei Trofimovich <slyfox@gentoo.org>
+files/ghc-7.8.3-prim-lm.patch, ghc-7.8.3.ebuild:
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-lang/ghc: ghc-7.8.3.ebuild ChangeLog
@ 2014-08-11 10:18 Sergei Trofimovich (slyfox)
0 siblings, 0 replies; 8+ messages in thread
From: Sergei Trofimovich (slyfox) @ 2014-08-11 10:18 UTC (permalink / raw
To: gentoo-commits
slyfox 14/08/11 10:18:57
Modified: ghc-7.8.3.ebuild ChangeLog
Log:
Keyword amd64/x86 where we have bianries.
(Portage version: 2.2.11_p9/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)
Revision Changes Path
1.7 dev-lang/ghc/ghc-7.8.3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild?r1=1.6&r2=1.7
Index: ghc-7.8.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ghc-7.8.3.ebuild 1 Aug 2014 20:33:54 -0000 1.6
+++ ghc-7.8.3.ebuild 11 Aug 2014 10:18:57 -0000 1.7
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild,v 1.6 2014/08/01 20:33:54 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild,v 1.7 2014/08/11 10:18:57 slyfox Exp $
EAPI=5
@@ -65,8 +65,7 @@
[[ -n $arch_binaries ]] && SRC_URI+=" !ghcbootstrap? ( $arch_binaries )"
LICENSE="BSD"
SLOT="0/${PV}"
-#KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="doc ghcbootstrap ghcmakebinary +gmp"
IUSE+=" binary"
IUSE+=" elibc_glibc" # system stuff
1.264 dev-lang/ghc/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.264&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.264&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?r1=1.263&r2=1.264
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -r1.263 -r1.264
--- ChangeLog 1 Aug 2014 20:33:54 -0000 1.263
+++ ChangeLog 11 Aug 2014 10:18:57 -0000 1.264
@@ -1,6 +1,9 @@
# ChangeLog for dev-lang/ghc
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.263 2014/08/01 20:33:54 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.264 2014/08/11 10:18:57 slyfox Exp $
+
+ 11 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> ghc-7.8.3.ebuild:
+ Keyword amd64/x86 where we have bianries.
01 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org>
+files/ghc-7.6.3-preserve-inplace-xattr.patch, ghc-7.6.3-r1.ebuild,
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-lang/ghc: ghc-7.8.3.ebuild ChangeLog
@ 2014-08-23 13:46 Sergei Trofimovich (slyfox)
0 siblings, 0 replies; 8+ messages in thread
From: Sergei Trofimovich (slyfox) @ 2014-08-23 13:46 UTC (permalink / raw
To: gentoo-commits
slyfox 14/08/23 13:46:43
Modified: ghc-7.8.3.ebuild ChangeLog
Log:
Fix integer-gmp crashes and miscomputations in UNREG builds.
(Portage version: 2.2.11_p14/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)
Revision Changes Path
1.8 dev-lang/ghc/ghc-7.8.3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild?r1=1.7&r2=1.8
Index: ghc-7.8.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ghc-7.8.3.ebuild 11 Aug 2014 10:18:57 -0000 1.7
+++ ghc-7.8.3.ebuild 23 Aug 2014 13:46:43 -0000 1.8
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild,v 1.7 2014/08/11 10:18:57 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild,v 1.8 2014/08/23 13:46:43 slyfox Exp $
EAPI=5
@@ -401,6 +401,7 @@
epatch "${FILESDIR}"/${PN}-7.8.3-prim-lm.patch
# bug 518734
epatch "${FILESDIR}"/${PN}-7.6.3-preserve-inplace-xattr.patch
+ epatch "${FILESDIR}"/${PN}-7.8.3-unreg-lit.patch
if use prefix; then
# Make configure find docbook-xsl-stylesheets from Prefix
1.265 dev-lang/ghc/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.265&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.265&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?r1=1.264&r2=1.265
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -r1.264 -r1.265
--- ChangeLog 11 Aug 2014 10:18:57 -0000 1.264
+++ ChangeLog 23 Aug 2014 13:46:43 -0000 1.265
@@ -1,6 +1,10 @@
# ChangeLog for dev-lang/ghc
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.264 2014/08/11 10:18:57 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.265 2014/08/23 13:46:43 slyfox Exp $
+
+ 23 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org>
+ +files/ghc-7.8.3-unreg-lit.patch, ghc-7.8.3.ebuild:
+ Fix integer-gmp crashes and miscomputations in UNREG builds.
11 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> ghc-7.8.3.ebuild:
Keyword amd64/x86 where we have bianries.
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-lang/ghc: ghc-7.8.3.ebuild ChangeLog
@ 2014-09-04 20:30 Sergei Trofimovich (slyfox)
0 siblings, 0 replies; 8+ messages in thread
From: Sergei Trofimovich (slyfox) @ 2014-09-04 20:30 UTC (permalink / raw
To: gentoo-commits
slyfox 14/09/04 20:30:42
Modified: ghc-7.8.3.ebuild ChangeLog
Log:
A bunch of UNREG backports (fixes sparc dynamic libraries, ia64 gmp support).
(Portage version: 2.2.12_p12/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)
Revision Changes Path
1.9 dev-lang/ghc/ghc-7.8.3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild?r1=1.8&r2=1.9
Index: ghc-7.8.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ghc-7.8.3.ebuild 23 Aug 2014 13:46:43 -0000 1.8
+++ ghc-7.8.3.ebuild 4 Sep 2014 20:30:42 -0000 1.9
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild,v 1.8 2014/08/23 13:46:43 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild,v 1.9 2014/09/04 20:30:42 slyfox Exp $
EAPI=5
@@ -396,13 +396,20 @@
epatch "${FILESDIR}"/${PN}-7.8.1_rc1-libbfd.patch
- epatch "${FILESDIR}"/${PN}-7.8.2-ia64-no-shared.patch
epatch "${FILESDIR}"/${PN}-7.8.2-cgen-constify.patch
epatch "${FILESDIR}"/${PN}-7.8.3-prim-lm.patch
# bug 518734
epatch "${FILESDIR}"/${PN}-7.6.3-preserve-inplace-xattr.patch
epatch "${FILESDIR}"/${PN}-7.8.3-unreg-lit.patch
+ # upstream backports
+ epatch "${FILESDIR}"/${PN}-7.8.3-linker-warn.patch
+ epatch "${FILESDIR}"/${PN}-7.8.3-deRefStablePtr.patch
+ epatch "${FILESDIR}"/${PN}-7.8.3-pic-asm.patch
+ epatch "${FILESDIR}"/${PN}-7.8.3-pic-sparc.patch
+ epatch "${FILESDIR}"/${PN}-7.8.3-cc-lang.patch
+ epatch "${FILESDIR}"/${PN}-7.8.3-ia64-prim.patch
+
if use prefix; then
# Make configure find docbook-xsl-stylesheets from Prefix
sed -e '/^FP_DIR_DOCBOOK_XSL/s:\[.*\]:['"${EPREFIX}"'/usr/share/sgml/docbook/xsl-stylesheets/]:' \
1.267 dev-lang/ghc/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.267&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.267&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?r1=1.266&r2=1.267
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -r1.266 -r1.267
--- ChangeLog 23 Aug 2014 13:47:55 -0000 1.266
+++ ChangeLog 4 Sep 2014 20:30:42 -0000 1.267
@@ -1,6 +1,14 @@
# ChangeLog for dev-lang/ghc
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.266 2014/08/23 13:47:55 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.267 2014/09/04 20:30:42 slyfox Exp $
+
+ 04 Sep 2014; Sergei Trofimovich <slyfox@gentoo.org>
+ +files/ghc-7.8.3-cc-lang.patch, +files/ghc-7.8.3-deRefStablePtr.patch,
+ +files/ghc-7.8.3-ia64-prim.patch, +files/ghc-7.8.3-linker-warn.patch,
+ +files/ghc-7.8.3-pic-asm.patch, +files/ghc-7.8.3-pic-sparc.patch,
+ -files/ghc-7.8.2-ia64-no-shared.patch, files/ghc-7.8.3-prim-lm.patch,
+ ghc-7.8.3.ebuild:
+ A bunch of UNREG backports (fixes sparc dynamic libraries, ia64 gmp support).
23 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> metadata.xml:
Drop redundant maintainer in favour of herd.
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-lang/ghc: ghc-7.8.3.ebuild ChangeLog
@ 2014-09-05 10:40 Sergei Trofimovich (slyfox)
0 siblings, 0 replies; 8+ messages in thread
From: Sergei Trofimovich (slyfox) @ 2014-09-05 10:40 UTC (permalink / raw
To: gentoo-commits
slyfox 14/09/05 10:40:46
Modified: ghc-7.8.3.ebuild ChangeLog
Log:
Allow USE=gmp on ia64 (fixed by ghc-7.8.3-ia64-prim.patch).
(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)
Revision Changes Path
1.10 dev-lang/ghc/ghc-7.8.3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild?r1=1.9&r2=1.10
Index: ghc-7.8.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ghc-7.8.3.ebuild 4 Sep 2014 20:30:42 -0000 1.9
+++ ghc-7.8.3.ebuild 5 Sep 2014 10:40:45 -0000 1.10
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild,v 1.9 2014/09/04 20:30:42 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild,v 1.10 2014/09/05 10:40:45 slyfox Exp $
EAPI=5
@@ -97,8 +97,6 @@
PDEPEND="!ghcbootstrap? ( =app-admin/haskell-updater-1.2* )"
REQUIRED_USE="?? ( ghcbootstrap binary )"
-# ia64 fails to return from STG GMP primitives (stage2 always SIGSEGVs)
-REQUIRED_USE+=" ia64? ( !gmp )"
# yeah, top-level 'use' sucks. I'd like to have it in 'src_install()'
use binary && QA_PREBUILT="*"
1.268 dev-lang/ghc/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.268&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.268&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?r1=1.267&r2=1.268
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v
retrieving revision 1.267
retrieving revision 1.268
diff -u -r1.267 -r1.268
--- ChangeLog 4 Sep 2014 20:30:42 -0000 1.267
+++ ChangeLog 5 Sep 2014 10:40:45 -0000 1.268
@@ -1,6 +1,9 @@
# ChangeLog for dev-lang/ghc
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.267 2014/09/04 20:30:42 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.268 2014/09/05 10:40:45 slyfox Exp $
+
+ 05 Sep 2014; Sergei Trofimovich <slyfox@gentoo.org> ghc-7.8.3.ebuild:
+ Allow USE=gmp on ia64 (fixed by ghc-7.8.3-ia64-prim.patch).
04 Sep 2014; Sergei Trofimovich <slyfox@gentoo.org>
+files/ghc-7.8.3-cc-lang.patch, +files/ghc-7.8.3-deRefStablePtr.patch,
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2014-09-05 10:40 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-07-12 6:18 [gentoo-commits] gentoo-x86 commit in dev-lang/ghc: ghc-7.8.3.ebuild ChangeLog Sergei Trofimovich (slyfox)
-- strict thread matches above, loose matches on Subject: below --
2014-09-05 10:40 Sergei Trofimovich (slyfox)
2014-09-04 20:30 Sergei Trofimovich (slyfox)
2014-08-23 13:46 Sergei Trofimovich (slyfox)
2014-08-11 10:18 Sergei Trofimovich (slyfox)
2014-07-30 13:20 Sergei Trofimovich (slyfox)
2014-07-30 11:47 Sergei Trofimovich (slyfox)
2014-07-10 19:31 Sergei Trofimovich (slyfox)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox