* [gentoo-commits] gentoo-x86 commit in dev-lang/ghc: ChangeLog ghc-6.10.4-r1.ebuild
@ 2009-12-05 9:19 Lennart Kolmodin (kolmodin)
0 siblings, 0 replies; 4+ messages in thread
From: Lennart Kolmodin (kolmodin) @ 2009-12-05 9:19 UTC (permalink / raw
To: gentoo-commits
kolmodin 09/12/05 09:19:27
Modified: ChangeLog
Added: ghc-6.10.4-r1.ebuild
Log:
Fix several build bugs in dev-lang/ghc-6.10.4, see ChangeLog
(Portage version: 2.1.6.13/cvs/Linux x86_64)
Revision Changes Path
1.172 dev-lang/ghc/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.172&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.172&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ghc/ChangeLog?r1=1.171&r2=1.172
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- ChangeLog 31 Oct 2009 13:29:17 -0000 1.171
+++ ChangeLog 5 Dec 2009 09:19:27 -0000 1.172
@@ -1,6 +1,21 @@
# ChangeLog for dev-lang/ghc
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.171 2009/10/31 13:29:17 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.172 2009/12/05 09:19:27 kolmodin Exp $
+
+*ghc-6.10.4-r1 (05 Dec 2009)
+
+ 05 Dec 2009; <kolmodin@gentoo.org> +ghc-6.10.4-r1.ebuild,
+ +files/ghc-6.10.4-autoconf.patch, +files/ghc-6.10.4-libm-detection.patch:
+ Attempt to fix a lot of recent trouble with building ghc-6.10.4;
+ * bug #295487, could not build with >=autoconf-2.64;
+ patch by int-e, reported by Tobias Hommel <tobi@keksbude.net>
+ * bug #292772, add CFLAGS to ghc wrapper enables hardended to build;
+ reported and fixed by Zhang, Hongjiu <secludedsage@gmail.com> with the
+ help of ivanm, trofi, dcoutts and igloo.
+ * bug #293208, undefined reference to `sqrt', libm detection trouble;
+ Roie Kerstein and Renato Gallo found and tracked down the bug,
+ asuffield suggested the fix and Sergei Trofimovich <slyfox@inbox.ru>
+ patched.
31 Oct 2009; <kolmodin@gentoo.org> -ghc-6.10.2.ebuild, -ghc-6.10.3.ebuild,
metadata.xml:
1.1 dev-lang/ghc/ghc-6.10.4-r1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ghc/ghc-6.10.4-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ghc/ghc-6.10.4-r1.ebuild?rev=1.1&content-type=text/plain
Index: ghc-6.10.4-r1.ebuild
===================================================================
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.10.4-r1.ebuild,v 1.1 2009/12/05 09:19:27 kolmodin 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.
inherit base autotools bash-completion eutils flag-o-matic toolchain-funcs ghc-package versionator
DESCRIPTION="The Glasgow Haskell Compiler"
HOMEPAGE="http://www.haskell.org/ghc/"
# discover if this is a snapshot release
IS_SNAPSHOT="$(get_version_component_range 4)" # non-empty if snapshot
EXTRA_SRC_URI="${PV}"
[[ "${IS_SNAPSHOT}" ]] && EXTRA_SRC_URI="stable/dist"
arch_binaries=""
arch_binaries="$arch_binaries x86? ( http://code.haskell.org/~ivanm/ghc-bin-${PV}-x86.tbz2 )"
arch_binaries="$arch_binaries amd64? ( http://haskell.org/~kolmodin/ghc-bin-${PV}-amd64.tbz2 )"
arch_binaries="$arch_binaries sparc? ( http://haskell.org/~duncan/ghc/ghc-bin-${PV}-sparc.tbz2 )"
arch_binaries="$arch_binaries ppc64? ( http://code.haskell.org/~slyfox/ghc-ppc64/ghc-bin-${PV}-ppc64.tbz2 )"
#arch_binaries="$arch_binaries alpha? ( mirror://gentoo/ghc-bin-${PV}-alpha.tbz2 )"
#arch_binaries="$arch_binaries amd64? ( mirror://gentoo/ghc-bin-${PV}-amd64.tbz2 )"
#arch_binaries="$arch_binaries hppa? ( mirror://gentoo/ghc-bin-${PV}-hppa.tbz2 )"
#arch_binaries="$arch_binaries ia64? ( mirror://gentoo/ghc-bin-${PV}-ia64.tbz2 )"
#arch_binaries="$arch_binaries sparc? ( mirror://gentoo/ghc-bin-${PV}-sparc.tbz2 )"
#arch_binaries="$arch_binaries x86? ( mirror://gentoo/ghc-bin-${PV}-x86.tbz2 )"
SRC_URI="!binary? ( http://haskell.org/ghc/dist/${EXTRA_SRC_URI}/${P}-src.tar.bz2 )
!ghcbootstrap? ( $arch_binaries )"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~sparc ~ppc64 ~x86"
IUSE="binary doc ghcbootstrap"
RDEPEND="
!dev-lang/ghc-bin
>=sys-devel/gcc-2.95.3
>=sys-devel/binutils-2.17
>=dev-lang/perl-5.6.1
>=dev-libs/gmp-4.1
!<dev-haskell/haddock-2.4.2"
# earlier versions than 2.4.2 of haddock only works with older ghc releases
DEPEND="${RDEPEND}
ghcbootstrap? ( doc? ( ~app-text/docbook-xml-dtd-4.2
app-text/docbook-xsl-stylesheets
>=dev-libs/libxslt-1.1.2 ) )"
# In the ghcbootstrap case we rely on the developer having
# >=ghc-5.04.3 on their $PATH already
PDEPEND="!ghcbootstrap? ( =app-admin/haskell-updater-0.9* )"
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_CFLAGS="${GHC_CFLAGS} -optc${flag}"
[[ ${assemble} ]] && GHC_CFLAGS="${GHC_CFLAGS} -opta${flag}"
[[ ${link} ]] && GHC_CFLAGS="${GHC_CFLAGS} -optl${flag}";;
esac
done
}
ghc_setup_cflags() {
# 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
filter-flags -fPIC
GHC_CFLAGS=""
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};;
# Debugging flags don't help either. You can't debug Haskell code
# at the C source level and the mangler discards the debug info.
-g*) ;;
# Ignore all other flags, including all -f* 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
# We also add -Wa,--noexecstack to get ghc to generate .o files with
# non-exectable stack. This it a hack until ghc does it itself properly.
append-ghc-cflags assemble "-Wa,--noexecstack"
}
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."
fi
}
src_unpack() {
# Create the ${S} dir if we're using the binary version
use binary && mkdir "${S}"
base_src_unpack
ghc_setup_cflags
if use binary; then
# Move unpacked files to the expected place
mv "${WORKDIR}/usr" "${S}"
else
if ! use ghcbootstrap; then
# Relocate from /usr to ${WORKDIR}/usr
sed -i -e "s|/usr|${WORKDIR}/usr|g" \
"${WORKDIR}/usr/bin/ghc-${PV}" \
"${WORKDIR}/usr/bin/ghci-${PV}" \
"${WORKDIR}/usr/bin/ghc-pkg-${PV}" \
"${WORKDIR}/usr/bin/hsc2hs" \
"${WORKDIR}/usr/$(get_libdir)/${P}/package.conf" \
|| die "Relocating ghc from /usr to workdir failed"
fi
# Hack to prevent haddock being installed, remove when ./configure
# supports something better to not build docs or haddock.
sed -i -e 's/DO_NOT_INSTALL =/DO_NOT_INSTALL = haddock/' \
"${S}/utils/Makefile"
# Modify the ghc driver script to use GHC_CFLAGS
sed -i -e "s|wrapped|wrapped ${GHC_CFLAGS}|" \
"${S}/ghc/ghc.wrapper"
cd "${S}"
# patch aclocal.m4 and configure.ac to work with >=autoconf-2.64
epatch "${FILESDIR}/${P}-autoconf.patch"
# fix configure.ac to detect libm need
# http://bugs.gentoo.org/show_bug.cgi?id=293208
# http://hackage.haskell.org/trac/ghc/ticket/3730
epatch "${FILESDIR}/ghc-6.10.4-libm-detection.patch"
# as we have changed the build system with the readline patch
eautoreconf
fi
}
src_compile() {
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 = /usr/share/doc/${P}" >> mk/build.mk
echo "htmldir = /usr/share/doc/${P}" >> mk/build.mk
# We also need to use the GHC_CFLAGS flags when building ghc itself
echo "SRC_HC_OPTS+=${GHC_CFLAGS}" >> mk/build.mk
echo "SRC_CC_OPTS+=${CFLAGS} -Wa,--noexecstack" >> 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
if use ghcbootstrap && use doc; then
echo XMLDocWays="html" >> mk/build.mk
echo HADDOCK_DOCS=YES >> mk/build.mk
else
echo XMLDocWays="" >> 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
# GHC build system knows to build unregisterised on alpha and hppa,
# but we have to tell it to build unregisterised on some arches
# ppc64: EvilMangler currently does not understand some TOCs
if use alpha || use hppa || use ppc64; then
echo "GhcUnregisterised=YES" >> mk/build.mk
echo "GhcWithInterpreter=NO" >> 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
# Have "ld -r --relax" problem with split-objs on sparc:
if use sparc; then
echo "SplitObjs=NO" >> 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
econf || die "econf failed"
emake all || die "make failed"
fi # ! use binary
}
src_install() {
if use binary; then
mv "${S}/usr" "${D}"
# Remove the docs if not requested
if ! use doc; then
rm -rf "${D}/usr/share/doc/${P}/*/" \
"${D}/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; then
if use ghcbootstrap; then
insttarget="${insttarget} install-docs"
else
mkdir -p "${D}/usr/share/doc"
mv "${WORKDIR}/usr/share/doc/${P}" "${D}/usr/share/doc" \
|| die "failed to copy docs"
fi
fi
emake -j1 ${insttarget} \
DESTDIR="${D}" \
|| die "make ${insttarget} failed"
dodoc "${S}/README" "${S}/ANNOUNCE" "${S}/LICENSE" "${S}/VERSION"
dobashcompletion "${FILESDIR}/ghc-bash-completion"
cp -p "${D}/usr/$(get_libdir)/${P}/package.conf"{,.shipped} \
|| die "failed to copy package.conf"
fi
}
pkg_postinst() {
# 'ghc-pkg check' fails in ghc 6.10.2, with the error message:
# There are problems in package rts-1.0:
# include-dirs: PAPI_INCLUDE_DIR doesn't exist or isn't a directory
# Upstream suggests this solution to fix it:
export PATH="/usr/bin:${PATH}"
$(ghc-getghcpkg) describe rts | sed 's/PAPI_INCLUDE_DIR//' | $(ghc-getghcpkg) update -
ghc-reregister
ewarn "IMPORTANT:"
ewarn "If you have upgraded from another version of ghc,"
ewarn "once app-admin/haskell-updater has installed please run:"
ewarn " /usr/sbin/haskell-updater --upgrade"
ewarn "to re-build all ghc-based Haskell libraries."
bash-completion_pkg_postinst
}
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 (potentially) modified package.conf with a copy of the
# original one, so that it will be removed during uninstall.
PKG="${ROOT}/usr/$(get_libdir)/${P}/package.conf"
cp -p "${PKG}"{.shipped,}
[[ -f ${PKG}.old ]] && rm "${PKG}.old"
}
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-lang/ghc: ChangeLog ghc-6.10.4-r1.ebuild
@ 2010-06-12 20:34 Lennart Kolmodin (kolmodin)
0 siblings, 0 replies; 4+ messages in thread
From: Lennart Kolmodin (kolmodin) @ 2010-06-12 20:34 UTC (permalink / raw
To: gentoo-commits
kolmodin 10/06/12 20:34:32
Modified: ChangeLog ghc-6.10.4-r1.ebuild
Log:
dev-lang/ghc: fixing bug #313635 for ghc 6.10.4-r1
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Revision Changes Path
1.176 dev-lang/ghc/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.176&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.176&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?r1=1.175&r2=1.176
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- ChangeLog 31 May 2010 18:18:44 -0000 1.175
+++ ChangeLog 12 Jun 2010 20:34:32 -0000 1.176
@@ -1,6 +1,13 @@
# ChangeLog for dev-lang/ghc
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.175 2010/05/31 18:18:44 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.176 2010/06/12 20:34:32 kolmodin Exp $
+
+ 12 Jun 2010; Lennart Kolmodin <kolmodin@gentoo.org> ghc-6.10.4-r1.ebuild:
+ Edit the ghc-wrapper installed by USE=binary to include GHC_CFLAGS from
+ the user's compilation.
+ This solves problems for hardend users, as the ghc binaries are not build
+ on hardend systems. See bug #313635 for details.
+ Patch by xake@rymdraket.net.
31 May 2010; Joseph Jezak <josejx@gentoo.org> ghc-6.10.4-r1.ebuild,
ghc-6.12.1.ebuild:
1.4 dev-lang/ghc/ghc-6.10.4-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-6.10.4-r1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-6.10.4-r1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-6.10.4-r1.ebuild?r1=1.3&r2=1.4
Index: ghc-6.10.4-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.10.4-r1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ghc-6.10.4-r1.ebuild 31 May 2010 18:18:44 -0000 1.3
+++ ghc-6.10.4-r1.ebuild 12 Jun 2010 20:34:32 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.10.4-r1.ebuild,v 1.3 2010/05/31 18:18:44 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.10.4-r1.ebuild,v 1.4 2010/06/12 20:34:32 kolmodin Exp $
# Brief explanation of the bootstrap logic:
#
@@ -102,7 +102,6 @@
# We also use these CFLAGS for building the C parts of ghc, ie the rts.
strip-flags
strip-unsupported-flags
- filter-flags -fPIC
GHC_CFLAGS=""
for flag in ${CFLAGS}; do
@@ -156,6 +155,13 @@
base_src_unpack
ghc_setup_cflags
+ if ! use ghcbootstrap; then
+ # Modify the wrapper script from the binary tarball to use GHC_CFLAGS.
+ # See bug #313635.
+ sed -i -e "s|wrapped|wrapped ${GHC_CFLAGS}|" \
+ "${WORKDIR}/usr/bin/ghc-${PV}"
+ fi
+
if use binary; then
# Move unpacked files to the expected place
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-lang/ghc: ChangeLog ghc-6.10.4-r1.ebuild
@ 2010-07-16 20:23 Sergei Trofimovich (slyfox)
0 siblings, 0 replies; 4+ messages in thread
From: Sergei Trofimovich (slyfox) @ 2010-07-16 20:23 UTC (permalink / raw
To: gentoo-commits
slyfox 10/07/16 20:23:28
Modified: ChangeLog ghc-6.10.4-r1.ebuild
Log:
Disable stripping of compiled ghc (and related) binary. Fixes bug #299492.
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Revision Changes Path
1.186 dev-lang/ghc/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.186&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.186&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?r1=1.185&r2=1.186
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- ChangeLog 15 Jul 2010 19:13:33 -0000 1.185
+++ ChangeLog 16 Jul 2010 20:23:27 -0000 1.186
@@ -1,6 +1,11 @@
# ChangeLog for dev-lang/ghc
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.185 2010/07/15 19:13:33 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.186 2010/07/16 20:23:27 slyfox Exp $
+
+ 16 Jul 2010; Sergei Trofimovich <slyfox@gentoo.org> ghc-6.10.4-r1.ebuild,
+ +files/ghc-6.10.4-disable-strip.patch:
+ Disable stripping of compiled ghc (and related) binary. Fixes bug #299492.
+ Thanks to Davide Pesavento <davidepesa@gmail.com> for the report.
15 Jul 2010; Sergei Trofimovich <slyfox@gentoo.org> ghc-6.12.3.ebuild,
+files/ghc-6.12.3-configure-CHOST-freebsd.patch:
1.9 dev-lang/ghc/ghc-6.10.4-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-6.10.4-r1.ebuild?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-6.10.4-r1.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-6.10.4-r1.ebuild?r1=1.8&r2=1.9
Index: ghc-6.10.4-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.10.4-r1.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ghc-6.10.4-r1.ebuild 14 Jul 2010 09:02:35 -0000 1.8
+++ ghc-6.10.4-r1.ebuild 16 Jul 2010 20:23:27 -0000 1.9
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.10.4-r1.ebuild,v 1.8 2010/07/14 09:02:35 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.10.4-r1.ebuild,v 1.9 2010/07/16 20:23:27 slyfox Exp $
# Brief explanation of the bootstrap logic:
#
@@ -186,6 +186,10 @@
cd "${S}"
+ # disable cabal built binary stripping (solves bug #299492)
+ # as installPackage strips them by default
+ epatch "${FILESDIR}/ghc-6.10.4-disable-strip.patch"
+
# patch aclocal.m4 and configure.ac to work with >=autoconf-2.64
epatch "${FILESDIR}/${P}-autoconf.patch"
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-lang/ghc: ChangeLog ghc-6.10.4-r1.ebuild
@ 2010-11-06 20:28 Sergei Trofimovich (slyfox)
0 siblings, 0 replies; 4+ messages in thread
From: Sergei Trofimovich (slyfox) @ 2010-11-06 20:28 UTC (permalink / raw
To: gentoo-commits
slyfox 10/11/06 20:28:25
Modified: ChangeLog ghc-6.10.4-r1.ebuild
Log:
Fixed failure when building against autoconf-2.66+ (bug #343111)
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Revision Changes Path
1.198 dev-lang/ghc/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.198&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.198&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?r1=1.197&r2=1.198
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -r1.197 -r1.198
--- ChangeLog 1 Nov 2010 22:14:46 -0000 1.197
+++ ChangeLog 6 Nov 2010 20:28:25 -0000 1.198
@@ -1,6 +1,10 @@
# ChangeLog for dev-lang/ghc
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.197 2010/11/01 22:14:46 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.198 2010/11/06 20:28:25 slyfox Exp $
+
+ 06 Nov 2010; Sergei Trofimovich <slyfox@gentoo.org> ghc-6.10.4-r1.ebuild:
+ Fixed failure when building against autoconf-2.66+ (bug #343111 by
+ Jean-Francis Roy <jeanfrancisroy@gmail.com>)
01 Nov 2010; Sergei Trofimovich <slyfox@gentoo.org> ghc-6.12.3.ebuild:
sparc stable (bug #338652)
1.12 dev-lang/ghc/ghc-6.10.4-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-6.10.4-r1.ebuild?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-6.10.4-r1.ebuild?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-6.10.4-r1.ebuild?r1=1.11&r2=1.12
Index: ghc-6.10.4-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.10.4-r1.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ghc-6.10.4-r1.ebuild 19 Sep 2010 16:45:24 -0000 1.11
+++ ghc-6.10.4-r1.ebuild 6 Nov 2010 20:28:25 -0000 1.12
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.10.4-r1.ebuild,v 1.11 2010/09/19 16:45:24 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.10.4-r1.ebuild,v 1.12 2010/11/06 20:28:25 slyfox Exp $
# Brief explanation of the bootstrap logic:
#
@@ -198,6 +198,9 @@
# patch aclocal.m4 and configure.ac to work with >=autoconf-2.64
epatch "${FILESDIR}/${P}-autoconf.patch"
+ # >=autoconf-2.66 compatibility
+ epatch "${FILESDIR}/ghc-6.12.3-autoconf-2.66-4252.patch"
+
# fix configure.ac to detect libm need
# http://bugs.gentoo.org/show_bug.cgi?id=293208
# http://hackage.haskell.org/trac/ghc/ticket/3730
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-11-06 20:28 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-16 20:23 [gentoo-commits] gentoo-x86 commit in dev-lang/ghc: ChangeLog ghc-6.10.4-r1.ebuild Sergei Trofimovich (slyfox)
-- strict thread matches above, loose matches on Subject: below --
2010-11-06 20:28 Sergei Trofimovich (slyfox)
2010-06-12 20:34 Lennart Kolmodin (kolmodin)
2009-12-05 9:19 Lennart Kolmodin (kolmodin)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox