* [gentoo-commits] gentoo-x86 commit in dev-lang/ghc: ghc-7.6.3-r1.ebuild ChangeLog
@ 2013-08-01 13:15 Sergei Trofimovich (slyfox)
0 siblings, 0 replies; 10+ messages in thread
From: Sergei Trofimovich (slyfox) @ 2013-08-01 13:15 UTC (permalink / raw
To: gentoo-commits
slyfox 13/08/01 13:15:33
Modified: ChangeLog
Added: ghc-7.6.3-r1.ebuild
Log:
Fixed CFLAGS=-Os ghci failure (bug #452442 by Jason Mours). Added weak symbol processing into ghci. Limit maximum parallel job count down to 4 workers (-j1 is too slow on mmodern boxes, but -j12 kills the build almost always). Does not eliminate failures completely, but reduces them significantly (bug #456386).
(Portage version: 2.2.0_alpha186/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)
Revision Changes Path
1.245 dev-lang/ghc/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.245&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.245&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?r1=1.244&r2=1.245
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -r1.244 -r1.245
--- ChangeLog 19 Jul 2013 10:21:35 -0000 1.244
+++ ChangeLog 1 Aug 2013 13:15:33 -0000 1.245
@@ -1,6 +1,16 @@
# ChangeLog for dev-lang/ghc
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.244 2013/07/19 10:21:35 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.245 2013/08/01 13:15:33 slyfox Exp $
+
+*ghc-7.6.3-r1 (01 Aug 2013)
+
+ 01 Aug 2013; Sergei Trofimovich <slyfox@gentoo.org>
+ +files/ghc-7.6.3-trac-3333-weak-syms.patch, +ghc-7.6.3-r1.ebuild:
+ Fixed CFLAGS=-Os ghci failure (bug #452442 by Jason Mours). Added weak symbol
+ processing into ghci. Limit maximum parallel job count down to 4 workers (-j1
+ is too slow on mmodern boxes, but -j12 kills the build almost always). Does
+ not eliminate failures completely, but reduces them significantly (bug
+ #456386).
19 Jul 2013; Sergei Trofimovich <slyfox@gentoo.org> ghc-7.6.3.ebuild:
Fix building on systems where libdir differs from the one we have built GHC
1.1 dev-lang/ghc/ghc-7.6.3-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild?rev=1.1&content-type=text/plain
Index: ghc-7.6.3-r1.ebuild
===================================================================
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild,v 1.1 2013/08/01 13:15:33 slyfox Exp $
# Brief explanation of the bootstrap logic:
#
# Previous ghc ebuilds have been split into two: ghc and ghc-bin,
# where ghc-bin was primarily used for bootstrapping purposes.
# From now on, these two ebuilds have been combined, with the
# binary USE flag used to determine whether or not the pre-built
# binary package should be emerged or whether ghc should be compiled
# from source. If the latter, then the relevant ghc-bin for the
# arch in question will be used in the working directory to compile
# ghc from source.
#
# This solution has the advantage of allowing us to retain the one
# ebuild for both packages, and thus phase out virtual/ghc.
# Note to users of hardened gcc-3.x:
#
# If you emerge ghc with hardened gcc it should work fine (because we
# turn off the hardened features that would otherwise break ghc).
# However, emerging ghc while using a vanilla gcc and then switching to
# hardened gcc (using gcc-config) will leave you with a broken ghc. To
# fix it you would need to either switch back to vanilla gcc or re-emerge
# ghc (or ghc-bin). Note that also if you are using hardened gcc-3.x and
# you switch to gcc-4.x that this will also break ghc and you'll need to
# re-emerge ghc (or ghc-bin). People using vanilla gcc can switch between
# gcc-3.x and 4.x with no problems.
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 multiprocessing 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.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
}
SRC_URI="!binary? ( http://www.haskell.org/ghc/dist/${PV}/${P}-src.tar.bz2 )"
[[ -n $arch_binaries ]] && SRC_URI+=" !ghcbootstrap? ( $arch_binaries )"
LICENSE="BSD"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="doc ghcbootstrap ghcmakebinary +gmp llvm"
IUSE+=" binary" # don't forget about me later!
IUSE+=" elibc_glibc" # system stuff
RDEPEND="
!kernel_Darwin? ( >=sys-devel/gcc-2.95.3 )
kernel_linux? ( >=sys-devel/binutils-2.17 )
kernel_SunOS? ( >=sys-devel/binutils-2.17 )
>=dev-lang/perl-5.6.1
>=dev-libs/gmp-5
virtual/libffi
!<dev-haskell/haddock-2.4.2
sys-libs/ncurses[unicode]"
# earlier versions than 2.4.2 of haddock only works with older ghc releases
# 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.14
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.15 ) ) )"
PDEPEND="!ghcbootstrap? ( =app-admin/haskell-updater-1.2* )"
PDEPEND="
${PDEPEND}
llvm? ( sys-devel/llvm )"
# ia64 fails to return from STG GMP primitives (stage2 always SIGSEGVs)
REQUIRED_USE="ia64? ( !gmp )"
is_crosscompile() {
[[ ${CHOST} != ${CTARGET} ]]
}
append-ghc-cflags() {
local flag compile assemble link
for flag in $*; do
case ${flag} in
compile) compile="yes";;
assemble) assemble="yes";;
link) link="yes";;
*)
[[ ${compile} ]] && GHC_FLAGS="${GHC_FLAGS} -optc${flag}" CFLAGS="${CFLAGS} ${flag}"
[[ ${assemble} ]] && GHC_FLAGS="${GHC_FLAGS} -opta${flag}" CFLAGS="${CFLAGS} ${flag}"
[[ ${link} ]] && GHC_FLAGS="${GHC_FLAGS} -optl${flag}" FILTERED_LDFLAGS="${FILTERED_LDFLAGS} ${flag}";;
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
GHC_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
FILTERED_LDFLAGS=""
for flag in ${LDFLAGS}; do
case ${flag} in
# Pass the canary. we don't quite respect LDFLAGS, but we have an excuse!
"-Wl,--hash-style="*) append-ghc-cflags link ${flag};;
# Ignore all other flags
esac
done
# hardened-gcc needs to be disabled, because the mangler doesn't accept
# its output.
gcc-specs-pie && append-ghc-cflags compile link -nopie
gcc-specs-ssp && append-ghc-cflags 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 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 compile -G0 -Os
# Unfortunately driver/split/ghc-split.lprl is dumb
# enough to preserve stack marking for each split object
# and it flags stack marking violation:
# * !WX --- --- usr/lib64/ghc-7.4.1/base-4.5.0.0/libHSbase-4.5.0.0.a:Fingerprint__1.o
# * !WX --- --- usr/lib64/ghc-7.4.1/base-4.5.0.0/libHSbase-4.5.0.0.a:Fingerprint__2.o
# * !WX --- --- usr/lib64/ghc-7.4.1/base-4.5.0.0/libHSbase-4.5.0.0.a:Fingerprint__3.o
case $($(tc-getAS) -v 2>&1 </dev/null) in
*"GNU Binutils"*) # GNU ld
append-ghc-cflags compile assemble -Wa,--noexecstack
;;
esac
}
# 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-${PV}-orig"
cp "${WORKDIR}/usr/bin/ghc-pkg-${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-${PV}" \
"${WORKDIR}/usr/bin/ghci-${PV}" \
"${WORKDIR}/usr/bin/ghc-pkg-${PV}" \
"${WORKDIR}/usr/bin/hsc2hs" \
"${WORKDIR}/usr/bin/runghc-${PV}" \
"$gp_back" \
"${WORKDIR}/usr/$(get_libdir)/${P}/package.conf.d/"*
fi
# Relocate from /usr to ${EPREFIX}/usr
relocate_path "/usr" "${to}/usr" \
"${WORKDIR}/usr/bin/ghc-${PV}" \
"${WORKDIR}/usr/bin/ghci-${PV}" \
"${WORKDIR}/usr/bin/ghc-pkg-${PV}" \
"${WORKDIR}/usr/bin/hsc2hs" \
"${WORKDIR}/usr/bin/runghc-${PV}" \
"${WORKDIR}/usr/$(get_libdir)/${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-${PV}" \
"${WORKDIR}/usr/bin/ghci-${PV}" \
"${WORKDIR}/usr/bin/ghc-pkg-${PV}" \
"${WORKDIR}/usr/bin/hsc2hs" \
"${WORKDIR}/usr/bin/runghc-${PV}" \
"$gp_back" \
|| 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 for"
ewarn "use with the ghc ebuild's USE=\"binary\" feature."
use binary && \
die "USE=\"ghcbootstrap binary\" is not a valid combination."
[[ -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=${P}-src.tar.bz2 ;;
esac
unpack ${ONLYA}
}
src_prepare() {
ghc_setup_cflags
if ! use ghcbootstrap && [[ ${CHOST} != *-darwin* && ${CHOST} != *-solaris* ]]; then
# Modify the wrapper script from the binary tarball to use GHC_FLAGS.
# See bug #313635.
sed -i -e "s|\"\$topdir\"|\"\$topdir\" ${GHC_FLAGS}|" \
"${WORKDIR}/usr/bin/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)/${P}/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_FLAGS}|" \
"${S}/ghc/ghc.wrapper"
cd "${S}" # otherwise epatch will break
epatch "${FILESDIR}/ghc-7.0.4-CHOST-prefix.patch"
# epatch "${FILESDIR}"/${PN}-7.0.4-darwin8.patch
# failed to apply. FIXME
#epatch "${FILESDIR}"/${PN}-6.12.3-mach-o-relocation-limit.patch
# epatch "${FILESDIR}"/${PN}-7.4-rc2-macos-prefix-respect-gcc.patch
# epatch "${FILESDIR}"/${PN}-7.2.1-freebsd-CHOST.patch
we_want_libffi_workaround() {
use ghcmakebinary && return 1
# pick only registerised arches
# http://bugs.gentoo.org/463814
use amd64 && return 0
use x86 && return 0
return 1
}
# one mode external depend with unstable ABI be careful to stash it
# avoid external libffi runtime when we build binaries
we_want_libffi_workaround && epatch "${FILESDIR}"/${PN}-7.5.20120505-system-libffi.patch
epatch "${FILESDIR}"/${PN}-7.4.1-ticket-7339-fix-unaligned-unreg.patch
epatch "${FILESDIR}"/${PN}-7.6.2-integer-simple-div-mod.patch
# ghc-7.8 changed linker code and likely fixed it
epatch "${FILESDIR}"/${PN}-7.6.3-trac-3333-weak-syms.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() {
GHC_PV=${PV} # overrided in live ebuilds
if ! use binary; then
# initialize build.mk
echo '# Gentoo changes' > mk/build.mk
# Put docs into the right place, ie /usr/share/doc/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+=${FILTERED_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
if is_crosscompile; then
# TODO this is a workaround for this build error with the live ebuild with haddock:
# make[1]: *** No rule to make target `compiler/stage2/build/Module.hi',
# needed by `utils/haddock/dist/build/Main.o'. Stop.
echo "HADDOCK_DOCS = NO" >> mk/build.mk
else
echo "HADDOCK_DOCS = YES" >> mk/build.mk
fi
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
# circumvent a very strange bug that seems related with ghc producing
# too much output while being filtered through tee (e.g. due to
# portage logging) reported as bug #111183
echo "SRC_HC_OPTS+=-w" >> mk/build.mk
# some arches do not support ELF parsing for ghci module loading
# PPC64: never worked (should be easy to implement)
# alpha: never worked
# arm: http://hackage.haskell.org/trac/ghc/changeset/27302c9094909e04eb73f200d52d5e9370c34a8a
if use alpha || use ppc64; then
echo "GhcWithInterpreter=NO" >> mk/build.mk
fi
# we have to tell it to build unregisterised on some arches
# ppc64: EvilMangler currently does not understand some TOCs
# ia64: EvilMangler bitrot
# set GHC_IS_UNREG if you like to build slow unregisterised
# host compiler. Handy if you plan to user resulting
# host compiler as a booting compiler for crosscompiler
# which can work only in unregisterised mode.
if use alpha || use ia64 || use ppc64 || [[ -n ${GHC_IS_UNREG} ]]; then
echo "GhcUnregisterised=YES" >> mk/build.mk
echo "GhcWithNativeCodeGen=NO" >> mk/build.mk
echo "SplitObjs=NO" >> mk/build.mk
echo "GhcRTSWays := debug" >> mk/build.mk
echo "GhcNotThreaded=YES" >> mk/build.mk
fi
# arm: no EvilMangler support, no NCG support
if use arm; then
echo "GhcUnregisterised=YES" >> mk/build.mk
echo "GhcWithNativeCodeGen=NO" >> mk/build.mk
fi
# Have "ld -r --relax" problem with split-objs on sparc:
if use sparc; then
echo "SplitObjs=NO" >> mk/build.mk
fi
if ! use llvm; then
echo "GhcWithLlvmCodeGen=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
# Since GHC 6.12.2 the GHC wrappers store which GCC version GHC was
# compiled with, by saving the path to it. The purpose is to make sure
# that GHC will use the very same gcc version when it compiles haskell
# sources, as the extra-gcc-opts files contains extra gcc options which
# match only this GCC version.
# However, this is not required in Gentoo, as only modern GCCs are used
# (>4).
# Instead, this causes trouble when for example ccache is used during
# compilation, but we don't want the wrappers to point to ccache.
# Due to the above, we simply set GCC to be "gcc". When compiling ghc it
# might point to ccache, once installed it will point to the users
# regular gcc.
local econf_args=()
is_crosscompile || econf_args+=--with-gcc=${CHOST}-gcc
econf ${econf_args[@]} --enable-bootstrap-with-devel-snapshot \
|| die "econf failed"
[[ ${PV} == *9999* ]] && GHC_PV="$(grep 'S\[\"PACKAGE_VERSION\"\]' config.status | sed -e 's@^.*=\"\(.*\)\"@\1@')"
GHC_TPF="$(grep 'S\[\"TargetPlatformFull\"\]' config.status | sed -e 's@^.*=\"\(.*\)\"@\1@')"
fi # ! use binary
}
src_compile() {
if ! use binary; then
limit_jobs() {
local user_jobs=$(makeopts_jobs)
local max_nonbreaking_jobs=$1
[[ ${user_jobs} -le ${max_nonbreaking_jobs} ]] && return
if [[ -n ${I_DEMAND_MY_CORES_LOADED} ]]; then
ewarn "You have requested parallel build which is known to break."
ewarn "Please report all breakages upstream."
return
else
ewarn "Limiting MAKEOPTS -j${user_jobs} -> -j${max_nonbreaking_jobs} (bug #456386)"
user_jobs=${max_nonbreaking_jobs}
fi
echo -j${user_jobs}
}
# ghc massively parallel make: #409631, #409873
# but let users screw it by setting 'I_DEMAND_MY_CORES_LOADED'
# 4 parallel jobs usually does not break
emake $(limit_jobs 4) all
emake all V=1
if is_crosscompile; then
# runghc does not work for a stage1 compiler, we can build it anyway
# so it will print the error message: not built for interactive use
pushd "${S}/utils/runghc" || die "Could not cd to utils/runghc"
if [ ! -f Setup.hs ]; then
echo 'import Distribution.Simple; main = defaultMainWithHooks defaultUserHooks' \
> Setup.hs || die "failed to create default Setup.hs"
fi
ghc -o setup --make Setup.hs || die "setup build failed"
./setup configure || die "runghc configure failed"
sed -e "s@VERSION@\"${GHC_PV}\"@" -i runghc.hs
./setup build || die "runghc build failed"
popd
fi
fi # ! use binary
}
ghc-needs-c_nonshared-for-interpreter-libs() {
local sample_test=${T}/c_nonshared-test.c
echo "int main() {} " > "${sample_test}" || die
$(tc-getCC) -o "${sample_test}".result "${sample_test}" \
-L"${ROOT}"/usr/$(get_libdir) -lc_nonshared
}
add-c_nonshared-to-ghci-libs() {
local ghci_lib
local nonshared_dir=${T}/libc_nonshared_objects
is_crosscompile && return
ghc-needs-c_nonshared-for-interpreter-libs || return
get-nonshared-objects() {
# ns - 'nonshared'
local ns_objects=" "
local ns_sym
local ns_srco
local ns_dsto
# extract
mkdir "${nonshared_dir}" || die
pushd "${nonshared_dir}" >/dev/null || die
$(tc-getAR) x "${ROOT}"/usr/$(get_libdir)/libc_nonshared.a
popd >/dev/null || die
for ns_sym in \
stat fstat lstat mknod \
stat64 fstat64 lstat64 \
fstatat fstatat64 mknodat
do
ns_srco=${nonshared_dir}/${ns_sym}.oS
ns_dsto=${nonshared_dir}/${ns_sym}_weakened.o
[[ -f ${ns_srco} ]] || continue
# here we do The Magic:
# 1. --keep-global-symbol= hides everything to adoid double definition
# of stuff like __stat, __fstat and
# 2. --weaken converts exported symbols to weak symbols to be available
# for redefinition
$(tc-getOBJCOPY) \
--weaken --keep-global-symbol=${ns_sym} \
"${ns_srco}" "${ns_dsto}" || die
ns_objects+=" ${ns_dsto}"
done
echo "${ns_objects}"
}
# bug #452442: when building libraries for ghci
# ghc basically glues them together:
# $ ld -r -o result foo.o bar.o ...
# that way some symbols defined in libc_nonshared.a
# do not get included into final HS*.o files
# We piggyback on one of early loaded wired-in library
# loaded before 'base'.
while read ghci_lib
do
einfo "relinking '${ghci_lib}' with c_includes"
mv "${ghci_lib}" "${ghci_lib}".unrelinked.o || die
$(tc-getLD) -r -o "${ghci_lib}" \
"${ghci_lib}".unrelinked.o \
$(get-nonshared-objects) || die
rm -r "${nonshared_dir}" || die
rm "${ghci_lib}".unrelinked.o || die
done < <(find "${ED}"/usr/$(get_libdir)/${P}/ -name 'HSghc-prim*.o')
}
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
local insttarget="install"
# We only built 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}/README" "${S}/ANNOUNCE" "${S}/LICENSE" "${S}/VERSION"
fi
emake -j1 ${insttarget} \
DESTDIR="${D}" \
|| die "make ${insttarget} failed"
# remove wrapper and linker
rm -f "${ED}"/usr/bin/haddock*
add-c_nonshared-to-ghci-libs
# 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)/${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)/${PN}-${GHC_PV}/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)/${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
if is_crosscompile; then
ewarn
ewarn "\e[1;31m************************************************************************\e[0m"
ewarn
ewarn "GHC built as a cross compiler. The interpreter, ghci and runghc, do"
ewarn "not work for a cross compiler."
ewarn "For the ghci error: \"<command line>: not built for interactive use\" see:"
ewarn "http://www.haskell.org/haskellwiki/GHC:FAQ#When_I_try_to_start_ghci_.28probably_one_I_compiled_myself.29_it_says_ghc-5.02:_not_built_for_interactive_use"
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 ${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)/${P}/package.conf.d/package.cache"
rm -rf "${PKGCACHE}"
cp -p "${PKGCACHE}"{.shipped,}
}
^ permalink raw reply [flat|nested] 10+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-lang/ghc: ghc-7.6.3-r1.ebuild ChangeLog
@ 2013-08-02 11:29 Sergei Trofimovich (slyfox)
0 siblings, 0 replies; 10+ messages in thread
From: Sergei Trofimovich (slyfox) @ 2013-08-02 11:29 UTC (permalink / raw
To: gentoo-commits
slyfox 13/08/02 11:29:49
Modified: ghc-7.6.3-r1.ebuild ChangeLog
Log:
unbreak ghci on 7.6.3-r1 on x86 arch.
libc_nonshared.a contains PIC objects while ghci needs non-PIC.
They are in libc.a. Picked that.
(Portage version: 2.2.0_alpha190/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)
Revision Changes Path
1.2 dev-lang/ghc/ghc-7.6.3-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild?r1=1.1&r2=1.2
Index: ghc-7.6.3-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ghc-7.6.3-r1.ebuild 1 Aug 2013 13:15:33 -0000 1.1
+++ ghc-7.6.3-r1.ebuild 2 Aug 2013 11:29:49 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild,v 1.1 2013/08/01 13:15:33 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild,v 1.2 2013/08/02 11:29:49 slyfox Exp $
# Brief explanation of the bootstrap logic:
#
@@ -615,19 +615,12 @@
fi # ! use binary
}
-ghc-needs-c_nonshared-for-interpreter-libs() {
- local sample_test=${T}/c_nonshared-test.c
- echo "int main() {} " > "${sample_test}" || die
- $(tc-getCC) -o "${sample_test}".result "${sample_test}" \
- -L"${ROOT}"/usr/$(get_libdir) -lc_nonshared
-}
-
add-c_nonshared-to-ghci-libs() {
local ghci_lib
local nonshared_dir=${T}/libc_nonshared_objects
is_crosscompile && return
- ghc-needs-c_nonshared-for-interpreter-libs || return
+ use elibc_glibc || return
get-nonshared-objects() {
# ns - 'nonshared'
@@ -639,15 +632,18 @@
# extract
mkdir "${nonshared_dir}" || die
pushd "${nonshared_dir}" >/dev/null || die
- $(tc-getAR) x "${ROOT}"/usr/$(get_libdir)/libc_nonshared.a
+ $(tc-getAR) x "${ROOT}"/usr/$(get_libdir)/libc.a
popd >/dev/null || die
+ # they are mostly contents of /usr/$(get_libdir)/libc_nonstahed.a
+ # but 'c_nonstahed' contains PIC variants of symbols.
+ # ghci uses non-PIC ones
for ns_sym in \
stat fstat lstat mknod \
stat64 fstat64 lstat64 \
fstatat fstatat64 mknodat
do
- ns_srco=${nonshared_dir}/${ns_sym}.oS
+ ns_srco=${nonshared_dir}/${ns_sym}.o
ns_dsto=${nonshared_dir}/${ns_sym}_weakened.o
[[ -f ${ns_srco} ]] || continue
# here we do The Magic:
1.246 dev-lang/ghc/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.246&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.246&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?r1=1.245&r2=1.246
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -r1.245 -r1.246
--- ChangeLog 1 Aug 2013 13:15:33 -0000 1.245
+++ ChangeLog 2 Aug 2013 11:29:49 -0000 1.246
@@ -1,6 +1,10 @@
# ChangeLog for dev-lang/ghc
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.245 2013/08/01 13:15:33 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.246 2013/08/02 11:29:49 slyfox Exp $
+
+ 02 Aug 2013; Sergei Trofimovich <slyfox@gentoo.org> ghc-7.6.3-r1.ebuild:
+ unbreak ghci on 7.6.3-r1 on x86 arch. libc_nonshared.a contains PIC objects
+ while ghci needs non-PIC. They are in libc.a. Picked that.
*ghc-7.6.3-r1 (01 Aug 2013)
^ permalink raw reply [flat|nested] 10+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-lang/ghc: ghc-7.6.3-r1.ebuild ChangeLog
@ 2013-09-03 9:39 Agostino Sarubbo (ago)
0 siblings, 0 replies; 10+ messages in thread
From: Agostino Sarubbo (ago) @ 2013-09-03 9:39 UTC (permalink / raw
To: gentoo-commits
ago 13/09/03 09:39:48
Modified: ghc-7.6.3-r1.ebuild ChangeLog
Log:
Stable for amd64, wrt bug #483462
(Portage version: 2.1.13.7/cvs/Linux x86_64, RepoMan options: --include-arches="amd64", signed Manifest commit with key 7194459F)
Revision Changes Path
1.3 dev-lang/ghc/ghc-7.6.3-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild?r1=1.2&r2=1.3
Index: ghc-7.6.3-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ghc-7.6.3-r1.ebuild 2 Aug 2013 11:29:49 -0000 1.2
+++ ghc-7.6.3-r1.ebuild 3 Sep 2013 09:39:48 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild,v 1.2 2013/08/02 11:29:49 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild,v 1.3 2013/09/03 09:39:48 ago Exp $
# Brief explanation of the bootstrap logic:
#
@@ -85,7 +85,7 @@
[[ -n $arch_binaries ]] && SRC_URI+=" !ghcbootstrap? ( $arch_binaries )"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="doc ghcbootstrap ghcmakebinary +gmp llvm"
IUSE+=" binary" # don't forget about me later!
IUSE+=" elibc_glibc" # system stuff
1.247 dev-lang/ghc/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.247&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.247&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?r1=1.246&r2=1.247
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -r1.246 -r1.247
--- ChangeLog 2 Aug 2013 11:29:49 -0000 1.246
+++ ChangeLog 3 Sep 2013 09:39:48 -0000 1.247
@@ -1,6 +1,9 @@
# ChangeLog for dev-lang/ghc
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.246 2013/08/02 11:29:49 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.247 2013/09/03 09:39:48 ago Exp $
+
+ 03 Sep 2013; Agostino Sarubbo <ago@gentoo.org> ghc-7.6.3-r1.ebuild:
+ Stable for amd64, wrt bug #483462
02 Aug 2013; Sergei Trofimovich <slyfox@gentoo.org> ghc-7.6.3-r1.ebuild:
unbreak ghci on 7.6.3-r1 on x86 arch. libc_nonshared.a contains PIC objects
^ permalink raw reply [flat|nested] 10+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-lang/ghc: ghc-7.6.3-r1.ebuild ChangeLog
@ 2013-09-09 19:46 Sergei Trofimovich (slyfox)
0 siblings, 0 replies; 10+ messages in thread
From: Sergei Trofimovich (slyfox) @ 2013-09-09 19:46 UTC (permalink / raw
To: gentoo-commits
slyfox 13/09/09 19:46:12
Modified: ghc-7.6.3-r1.ebuild ChangeLog
Log:
Add prebuilt binary for alpha/ia64/ppc/ppc64/sparc.
(Portage version: 2.2.1_p20/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)
Revision Changes Path
1.4 dev-lang/ghc/ghc-7.6.3-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild?r1=1.3&r2=1.4
Index: ghc-7.6.3-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ghc-7.6.3-r1.ebuild 3 Sep 2013 09:39:48 -0000 1.3
+++ ghc-7.6.3-r1.ebuild 9 Sep 2013 19:46:12 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild,v 1.3 2013/09/03 09:39:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild,v 1.4 2013/09/09 19:46:12 slyfox Exp $
# Brief explanation of the bootstrap logic:
#
@@ -51,13 +51,13 @@
arch_binaries=""
# sorted!
-arch_binaries="$arch_binaries alpha? ( http://code.haskell.org/~slyfox/ghc-alpha/ghc-bin-${PV}-alpha.tbz2 )"
+arch_binaries="$arch_binaries alpha? ( http://code.haskell.org/~slyfox/ghc-alpha/ghc-bin-${PV}-r1-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.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 ia64? ( http://code.haskell.org/~slyfox/ghc-ia64/ghc-bin-${PV}-r1-ia64.tbz2 )"
+arch_binaries="$arch_binaries ppc? ( http://code.haskell.org/~slyfox/ghc-ppc/ghc-bin-${PV}-r1-ppc.tbz2 )"
+arch_binaries="$arch_binaries ppc64? ( http://code.haskell.org/~slyfox/ghc-ppc64/ghc-bin-${PV}-r1-ppc64.tbz2 )"
+arch_binaries="$arch_binaries sparc? ( http://code.haskell.org/~slyfox/ghc-sparc/ghc-bin-${PV}-r1-sparc.tbz2 )"
arch_binaries="$arch_binaries x86? ( http://code.haskell.org/~slyfox/ghc-x86/ghc-bin-${PV}-x86.tbz2 )"
# various ports:
@@ -73,9 +73,9 @@
#;;
amd64) return 0 ;;
ia64) return 0 ;;
- #ppc) return 0 ;;
- #ppc64) return 0 ;;
- #sparc) return 0 ;;
+ ppc) return 0 ;;
+ ppc64) return 0 ;;
+ sparc) return 0 ;;
x86) return 0 ;;
*) return 1 ;;
esac
@@ -85,7 +85,7 @@
[[ -n $arch_binaries ]] && SRC_URI+=" !ghcbootstrap? ( $arch_binaries )"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="doc ghcbootstrap ghcmakebinary +gmp llvm"
IUSE+=" binary" # don't forget about me later!
IUSE+=" elibc_glibc" # system stuff
1.248 dev-lang/ghc/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.248&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.248&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?r1=1.247&r2=1.248
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -r1.247 -r1.248
--- ChangeLog 3 Sep 2013 09:39:48 -0000 1.247
+++ ChangeLog 9 Sep 2013 19:46:12 -0000 1.248
@@ -1,6 +1,9 @@
# ChangeLog for dev-lang/ghc
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.247 2013/09/03 09:39:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.248 2013/09/09 19:46:12 slyfox Exp $
+
+ 09 Sep 2013; Sergei Trofimovich <slyfox@gentoo.org> ghc-7.6.3-r1.ebuild:
+ Add prebuilt binary for alpha/ia64/ppc/ppc64/sparc.
03 Sep 2013; Agostino Sarubbo <ago@gentoo.org> ghc-7.6.3-r1.ebuild:
Stable for amd64, wrt bug #483462
^ permalink raw reply [flat|nested] 10+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-lang/ghc: ghc-7.6.3-r1.ebuild ChangeLog
@ 2013-09-10 8:37 Agostino Sarubbo (ago)
0 siblings, 0 replies; 10+ messages in thread
From: Agostino Sarubbo (ago) @ 2013-09-10 8:37 UTC (permalink / raw
To: gentoo-commits
ago 13/09/10 08:37:00
Modified: ghc-7.6.3-r1.ebuild ChangeLog
Log:
Stable for amd64, wrt bug #483462
(Portage version: 2.2.1/cvs/Linux x86_64, RepoMan options: --include-arches="amd64", signed Manifest commit with key 7194459F)
Revision Changes Path
1.5 dev-lang/ghc/ghc-7.6.3-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild?r1=1.4&r2=1.5
Index: ghc-7.6.3-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ghc-7.6.3-r1.ebuild 9 Sep 2013 19:46:12 -0000 1.4
+++ ghc-7.6.3-r1.ebuild 10 Sep 2013 08:37:00 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild,v 1.4 2013/09/09 19:46:12 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild,v 1.5 2013/09/10 08:37:00 ago Exp $
# Brief explanation of the bootstrap logic:
#
@@ -85,7 +85,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="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="doc ghcbootstrap ghcmakebinary +gmp llvm"
IUSE+=" binary" # don't forget about me later!
IUSE+=" elibc_glibc" # system stuff
1.249 dev-lang/ghc/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.249&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.249&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?r1=1.248&r2=1.249
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -r1.248 -r1.249
--- ChangeLog 9 Sep 2013 19:46:12 -0000 1.248
+++ ChangeLog 10 Sep 2013 08:37:00 -0000 1.249
@@ -1,6 +1,9 @@
# ChangeLog for dev-lang/ghc
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.248 2013/09/09 19:46:12 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.249 2013/09/10 08:37:00 ago Exp $
+
+ 10 Sep 2013; Agostino Sarubbo <ago@gentoo.org> ghc-7.6.3-r1.ebuild:
+ Stable for amd64, wrt bug #483462
09 Sep 2013; Sergei Trofimovich <slyfox@gentoo.org> ghc-7.6.3-r1.ebuild:
Add prebuilt binary for alpha/ia64/ppc/ppc64/sparc.
^ permalink raw reply [flat|nested] 10+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-lang/ghc: ghc-7.6.3-r1.ebuild ChangeLog
@ 2013-09-22 6:44 Agostino Sarubbo (ago)
0 siblings, 0 replies; 10+ messages in thread
From: Agostino Sarubbo (ago) @ 2013-09-22 6:44 UTC (permalink / raw
To: gentoo-commits
ago 13/09/22 06:44:22
Modified: ghc-7.6.3-r1.ebuild ChangeLog
Log:
Stable for x86, wrt bug #483462
(Portage version: 2.2.2/cvs/Linux x86_64, RepoMan options: --include-arches="x86", signed Manifest commit with key 7194459F)
Revision Changes Path
1.6 dev-lang/ghc/ghc-7.6.3-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild?r1=1.5&r2=1.6
Index: ghc-7.6.3-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ghc-7.6.3-r1.ebuild 10 Sep 2013 08:37:00 -0000 1.5
+++ ghc-7.6.3-r1.ebuild 22 Sep 2013 06:44:22 -0000 1.6
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild,v 1.5 2013/09/10 08:37:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild,v 1.6 2013/09/22 06:44:22 ago Exp $
# Brief explanation of the bootstrap logic:
#
@@ -85,7 +85,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="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="doc ghcbootstrap ghcmakebinary +gmp llvm"
IUSE+=" binary" # don't forget about me later!
IUSE+=" elibc_glibc" # system stuff
1.250 dev-lang/ghc/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.250&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.250&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?r1=1.249&r2=1.250
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -r1.249 -r1.250
--- ChangeLog 10 Sep 2013 08:37:00 -0000 1.249
+++ ChangeLog 22 Sep 2013 06:44:22 -0000 1.250
@@ -1,6 +1,9 @@
# ChangeLog for dev-lang/ghc
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.249 2013/09/10 08:37:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.250 2013/09/22 06:44:22 ago Exp $
+
+ 22 Sep 2013; Agostino Sarubbo <ago@gentoo.org> ghc-7.6.3-r1.ebuild:
+ Stable for x86, wrt bug #483462
10 Sep 2013; Agostino Sarubbo <ago@gentoo.org> ghc-7.6.3-r1.ebuild:
Stable for amd64, wrt bug #483462
^ permalink raw reply [flat|nested] 10+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-lang/ghc: ghc-7.6.3-r1.ebuild ChangeLog
@ 2013-09-29 18:22 Sergei Trofimovich (slyfox)
0 siblings, 0 replies; 10+ messages in thread
From: Sergei Trofimovich (slyfox) @ 2013-09-29 18:22 UTC (permalink / raw
To: gentoo-commits
slyfox 13/09/29 18:22:25
Modified: ghc-7.6.3-r1.ebuild ChangeLog
Log:
Disable ghci linker hack on x86-hardened (bug #486140 by Anton Kochkov).
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)
Revision Changes Path
1.7 dev-lang/ghc/ghc-7.6.3-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild?r1=1.6&r2=1.7
Index: ghc-7.6.3-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ghc-7.6.3-r1.ebuild 22 Sep 2013 06:44:22 -0000 1.6
+++ ghc-7.6.3-r1.ebuild 29 Sep 2013 18:22:25 -0000 1.7
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild,v 1.6 2013/09/22 06:44:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild,v 1.7 2013/09/29 18:22:25 slyfox Exp $
# Brief explanation of the bootstrap logic:
#
@@ -622,6 +622,11 @@
is_crosscompile && return
use elibc_glibc || return
+ # we expect 'libc.a' bits be self-sufficient
+ if gcc-specs-pie; then
+ use x86 && return # but on x86 pie means linker support: #486140
+ fi
+
get-nonshared-objects() {
# ns - 'nonshared'
local ns_objects=" "
1.251 dev-lang/ghc/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.251&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.251&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?r1=1.250&r2=1.251
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -r1.250 -r1.251
--- ChangeLog 22 Sep 2013 06:44:22 -0000 1.250
+++ ChangeLog 29 Sep 2013 18:22:25 -0000 1.251
@@ -1,6 +1,9 @@
# ChangeLog for dev-lang/ghc
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.250 2013/09/22 06:44:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.251 2013/09/29 18:22:25 slyfox Exp $
+
+ 29 Sep 2013; Sergei Trofimovich <slyfox@gentoo.org> ghc-7.6.3-r1.ebuild:
+ Disable ghci linker hack on x86-hardened (bug #486140 by Anton Kochkov).
22 Sep 2013; Agostino Sarubbo <ago@gentoo.org> ghc-7.6.3-r1.ebuild:
Stable for x86, wrt bug #483462
^ permalink raw reply [flat|nested] 10+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-lang/ghc: ghc-7.6.3-r1.ebuild ChangeLog
@ 2014-04-03 20:05 Sergei Trofimovich (slyfox)
0 siblings, 0 replies; 10+ messages in thread
From: Sergei Trofimovich (slyfox) @ 2014-04-03 20:05 UTC (permalink / raw
To: gentoo-commits
slyfox 14/04/03 20:05:01
Modified: ghc-7.6.3-r1.ebuild ChangeLog
Log:
Disable ghci relinking hack on prefix. Found out by Wilfred Hughes on RHEL5 with glibc-2.7.
(Portage version: 2.2.8_p62/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)
Revision Changes Path
1.10 dev-lang/ghc/ghc-7.6.3-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild?r1=1.9&r2=1.10
Index: ghc-7.6.3-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ghc-7.6.3-r1.ebuild 15 Feb 2014 08:52:36 -0000 1.9
+++ ghc-7.6.3-r1.ebuild 3 Apr 2014 20:05:01 -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.6.3-r1.ebuild,v 1.9 2014/02/15 08:52:36 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild,v 1.10 2014/04/03 20:05:01 slyfox Exp $
# Brief explanation of the bootstrap logic:
#
@@ -626,6 +626,7 @@
is_crosscompile && return
use elibc_glibc || return
+ use prefix && return
# we expect 'libc.a' bits be self-sufficient
if gcc-specs-pie; then
1.254 dev-lang/ghc/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.254&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.254&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?r1=1.253&r2=1.254
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -r1.253 -r1.254
--- ChangeLog 15 Feb 2014 08:52:36 -0000 1.253
+++ ChangeLog 3 Apr 2014 20:05:01 -0000 1.254
@@ -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.253 2014/02/15 08:52:36 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.254 2014/04/03 20:05:01 slyfox Exp $
+
+ 03 Apr 2014; Sergei Trofimovich <slyfox@gentoo.org> ghc-7.6.3-r1.ebuild:
+ Disable ghci relinking hack on prefix. Found out by Wilfred Hughes on RHEL5
+ with glibc-2.7.
15 Feb 2014; Sergei Trofimovich <slyfox@gentoo.org> ghc-6.12.3-r2.ebuild,
ghc-7.0.4.ebuild, ghc-7.4.1-r1.ebuild, ghc-7.4.1.ebuild, ghc-7.4.2.ebuild,
^ permalink raw reply [flat|nested] 10+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-lang/ghc: ghc-7.6.3-r1.ebuild ChangeLog
@ 2014-06-27 9:54 Sergei Trofimovich (slyfox)
0 siblings, 0 replies; 10+ messages in thread
From: Sergei Trofimovich (slyfox) @ 2014-06-27 9:54 UTC (permalink / raw
To: gentoo-commits
slyfox 14/06/27 09:54:03
Modified: ghc-7.6.3-r1.ebuild ChangeLog
Log:
Ignore flags '--with-compiler/--with-gcc' passed by cabal with 'QA_CONFIGURE_OPTIONS'. Bug #515354 by Patrick Lauer, bug #469618 by Roman Žilka.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)
Revision Changes Path
1.11 dev-lang/ghc/ghc-7.6.3-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild?r1=1.10&r2=1.11
Index: ghc-7.6.3-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ghc-7.6.3-r1.ebuild 3 Apr 2014 20:05:01 -0000 1.10
+++ ghc-7.6.3-r1.ebuild 27 Jun 2014 09:54:02 -0000 1.11
@@ -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.6.3-r1.ebuild,v 1.10 2014/04/03 20:05:01 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild,v 1.11 2014/06/27 09:54:02 slyfox Exp $
# Brief explanation of the bootstrap logic:
#
@@ -125,6 +125,9 @@
use binary && QA_PREBUILT="*"
+# haskell libraries built with cabal in configure mode, #515354
+QA_CONFIGURE_OPTIONS+=" --with-compiler --with-gcc"
+
is_crosscompile() {
[[ ${CHOST} != ${CTARGET} ]]
}
1.256 dev-lang/ghc/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.256&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.256&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?r1=1.255&r2=1.256
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -r1.255 -r1.256
--- ChangeLog 22 Apr 2014 14:09:47 -0000 1.255
+++ ChangeLog 27 Jun 2014 09:54:02 -0000 1.256
@@ -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.255 2014/04/22 14:09:47 mjo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.256 2014/06/27 09:54:02 slyfox Exp $
+
+ 27 Jun 2014; Sergei Trofimovich <slyfox@gentoo.org> ghc-7.6.3-r1.ebuild:
+ Ignore flags '--with-compiler/--with-gcc' passed by cabal with
+ 'QA_CONFIGURE_OPTIONS'. Bug #515354 by Patrick Lauer, bug #469618 by Roman
+ Žilka.
22 Apr 2014; Michael Orlitzky <mjo@gentoo.org> metadata.xml:
Fix typo in llvm USE flag description, fixes bug #508398.
^ permalink raw reply [flat|nested] 10+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-lang/ghc: ghc-7.6.3-r1.ebuild ChangeLog
@ 2014-07-05 15:40 Sergei Trofimovich (slyfox)
0 siblings, 0 replies; 10+ messages in thread
From: Sergei Trofimovich (slyfox) @ 2014-07-05 15:40 UTC (permalink / raw
To: gentoo-commits
slyfox 14/07/05 15:40:40
Modified: ghc-7.6.3-r1.ebuild ChangeLog
Log:
pax-mark ghc-stage2 before it's used first time. Fixes bootstrap failure on hardened (bug #516430 by Markus Oehme).
(Portage version: 2.2.10_p15/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)
Revision Changes Path
1.12 dev-lang/ghc/ghc-7.6.3-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild?r1=1.11&r2=1.12
Index: ghc-7.6.3-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ghc-7.6.3-r1.ebuild 27 Jun 2014 09:54:02 -0000 1.11
+++ ghc-7.6.3-r1.ebuild 5 Jul 2014 15:40:40 -0000 1.12
@@ -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.6.3-r1.ebuild,v 1.11 2014/06/27 09:54:02 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild,v 1.12 2014/07/05 15:40:40 slyfox Exp $
# Brief explanation of the bootstrap logic:
#
@@ -603,8 +603,13 @@
# ghc massively parallel make: #409631, #409873
# but let users screw it by setting 'I_DEMAND_MY_CORES_LOADED'
# 4 parallel jobs usually does not break
- emake $(limit_jobs 4) all
- emake all V=1
+
+ # 1. build compiler binary(+wrapper) first
+ emake $(limit_jobs 4) inplace/bin/ghc-stage2 V=1
+ # 2. pax-mark (bug #516430)
+ pax-mark -m inplace/lib/ghc-stage2
+ # 3. and then all the rest
+ emake $(limit_jobs 4) all V=1
if is_crosscompile; then
# runghc does not work for a stage1 compiler, we can build it anyway
1.257 dev-lang/ghc/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.257&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.257&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?r1=1.256&r2=1.257
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -r1.256 -r1.257
--- ChangeLog 27 Jun 2014 09:54:02 -0000 1.256
+++ ChangeLog 5 Jul 2014 15:40:40 -0000 1.257
@@ -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.256 2014/06/27 09:54:02 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.257 2014/07/05 15:40:40 slyfox Exp $
+
+ 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
+ hardened (bug #516430 by Markus Oehme).
27 Jun 2014; Sergei Trofimovich <slyfox@gentoo.org> ghc-7.6.3-r1.ebuild:
Ignore flags '--with-compiler/--with-gcc' passed by cabal with
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2014-07-05 15:40 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-07-05 15:40 [gentoo-commits] gentoo-x86 commit in dev-lang/ghc: ghc-7.6.3-r1.ebuild ChangeLog Sergei Trofimovich (slyfox)
-- strict thread matches above, loose matches on Subject: below --
2014-06-27 9:54 Sergei Trofimovich (slyfox)
2014-04-03 20:05 Sergei Trofimovich (slyfox)
2013-09-29 18:22 Sergei Trofimovich (slyfox)
2013-09-22 6:44 Agostino Sarubbo (ago)
2013-09-10 8:37 Agostino Sarubbo (ago)
2013-09-09 19:46 Sergei Trofimovich (slyfox)
2013-09-03 9:39 Agostino Sarubbo (ago)
2013-08-02 11:29 Sergei Trofimovich (slyfox)
2013-08-01 13:15 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