On 07-08-2007 00:04:13 +0200, Bernard Cafarelli wrote:
...
> some love to GNUstep support in Gentoo, which you can track progress
> from the gnustep overlay:
> http://overlays.gentoo.org/proj/gnustep
...
> Latest version of the base eclass (sent with this mail) can be found at:
> http://overlays.gentoo.org/proj/gnustep/browser/overlay/eclass/gnustep-base.eclass
We have incorporated all suggested changes more or less in our eclasses
now. We plan to inject the eclasses in a week from now if no major
issues are pointed out. So please give the eclass a quick scan if you
can and report any feedback to us. For convenience I also attached the
diffs made between the first post and this post.
Thanks for all remarks made sofar.
--
Fabian Groffen
Gentoo on a different level
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
inherit eutils flag-o-matic
# Inner gnustep eclass, should only be inherited directly by gnustep-base
# packages
#
# maintainer: GNUstep Herd <[EMAIL PROTECTED]>
# IUSE variables across all GNUstep packages
# "debug": enable code for debugging
# "doc": build and install documentation, if available
IUSE="debug doc"
# packages needed to build any base gnustep package
GNUSTEP_CORE_DEPEND="virtual/libc
doc? ( virtual/tetex =dev-tex/latex2html-2002*
>=app-text/texi2html-1.64 )"
# Where to install GNUstep
GNUSTEP_PREFIX="/usr/GNUstep"
# GNUstep environment array
typeset -a GS_ENV
# Ebuild function overrides
gnustep-base_pkg_setup() {
if test_version_info 3.3 ; then
strip-unsupported-flags
elif test_version_info 3.4 ; then
# strict-aliasing is known to break obj-c stuff in gcc-3.4*
filter-flags -fstrict-aliasing
fi
# known to break ObjC (bug 86089)
filter-flags -fomit-frame-pointer
}
gnustep-base_src_compile() {
egnustep_env
if [[ -x ./configure ]] ; then
econf || die "configure failed"
fi
egnustep_make
}
gnustep-base_src_install() {
egnustep_env
egnustep_install
if use doc ; then
egnustep_env
egnustep_doc
fi
# Copies "convenience scripts"
if [[ -f ${FILESDIR}/config-${PN}.sh ]] ; then
dodir ${GNUSTEP_SYSTEM_TOOLS}/Gentoo
exeinto ${GNUSTEP_SYSTEM_TOOLS}/Gentoo
doexe "${FILESDIR}"/config-${PN}.sh
fi
}
gnustep-base_pkg_postinst() {
# Informs user about existence of "convenience script"
if [[ -f ${FILESDIR}/config-${PN}.sh ]] ; then
elog "Make sure to set happy defaults for this package by
executing:"
elog " ${GNUSTEP_SYSTEM_TOOLS}/Gentoo/config-${PN}.sh"
elog "as the user you will run the package as."
fi
}
# Clean/reset an ebuild to the installed GNUstep environment
egnustep_env() {
# Get additional variables
GNUSTEP_SH_EXPORT_ALL_VARIABLES="true"
if [[ -f ${GNUSTEP_PREFIX}/System/Library/Makefiles/GNUstep.sh ]] ; then
# Reset GNUstep variables
source
"${GNUSTEP_PREFIX}"/System/Library/Makefiles/GNUstep-reset.sh
source "${GNUSTEP_PREFIX}"/System/Library/Makefiles/GNUstep.sh
# Needed to run installed GNUstep apps in sandbox
addpredict "/root/GNUstep"
# Set rpath in ldflags when available
case ${CHOST} in
*-linux-gnu|*-solaris*)
append-ldflags \
-Wl,-rpath="${GNUSTEP_SYSTEM_LIBRARIES}" \
-L"${GNUSTEP_SYSTEM_LIBRARIES}"
;;
*)
append-ldflags \
-L"${GNUSTEP_SYSTEM_LIBRARIES}"
;;
esac
# Set up env vars for make operations
GS_ENV=( AUXILIARY_LDFLAGS="${LDFLAGS}" \
DESTDIR="${D}" \
HOME="${T}" \
GNUSTEP_USER_DIR="${T}" \
GNUSTEP_USER_DEFAULTS_DIR="${T}"/Defaults \
GNUSTEP_INSTALLATION_DOMAIN=SYSTEM \
TAR_OPTIONS="${TAR_OPTIONS} --no-same-owner" \
messages=yes \
-j1 )
# -j1 is needed as gnustep-make is not parallel-safe
if ! use debug ; then
GS_ENV=( "[EMAIL PROTECTED]" "debug=no" )
fi
return 0
fi
die "gnustep-make not installed!"
}
# Make utilizing GNUstep Makefiles
egnustep_make() {
if [[ -f ./[mM]akefile || -f ./GNUmakefile ]] ; then
emake ${*} "[EMAIL PROTECTED]" all || die "package make failed"
return 0
fi
die "no Makefile found"
}
# Make-install utilizing GNUstep Makefiles
egnustep_install() {
# avoid problems due to our "weird" prefix, make sure it exists
mkdir -p "${D}"${GNUSTEP_SYSTEM_TOOLS}
if [[ -f ./[mM]akefile || -f ./GNUmakefile ]] ; then
emake ${*} "[EMAIL PROTECTED]" install || die "package install
failed"
return 0
fi
die "no Makefile found"
}
# Make and install docs using GNUstep Makefiles
egnustep_doc() {
if [[ -d ./Documentation ]] ; then
# Check documentation presence
cd "${S}"/Documentation
if [[ -f ./[mM]akefile || -f ./GNUmakefile ]] ; then
emake "[EMAIL PROTECTED]" all || die "doc make failed"
emake "[EMAIL PROTECTED]" install || die "doc install
failed"
fi
cd ..
fi
}
EXPORT_FUNCTIONS pkg_setup src_compile src_install pkg_postinst
Index: gnustep-base.eclass
===================================================================
--- gnustep-base.eclass (revision 203)
+++ gnustep-base.eclass (revision 228)
@@ -4,7 +4,10 @@
inherit eutils flag-o-matic
-# Inner gnustep eclass, should only be inherited directly by gnustep-base
packages
+# Inner gnustep eclass, should only be inherited directly by gnustep-base
+# packages
+#
+# maintainer: GNUstep Herd <[EMAIL PROTECTED]>
# IUSE variables across all GNUstep packages
# "debug": enable code for debugging
@@ -13,20 +16,19 @@
# packages needed to build any base gnustep package
GNUSTEP_CORE_DEPEND="virtual/libc
- doc? ( virtual/tetex
- =dev-tex/latex2html-2002*
- >=app-text/texi2html-1.64 )"
+ doc? ( virtual/tetex =dev-tex/latex2html-2002*
>=app-text/texi2html-1.64 )"
# Where to install GNUstep
GNUSTEP_PREFIX="/usr/GNUstep"
+# GNUstep environment array
+typeset -a GS_ENV
+
# Ebuild function overrides
gnustep-base_pkg_setup() {
- if test_version_info 3.3
- then
+ if test_version_info 3.3 ; then
strip-unsupported-flags
- elif test_version_info 3.4
- then
+ elif test_version_info 3.4 ; then
# strict-aliasing is known to break obj-c stuff in gcc-3.4*
filter-flags -fstrict-aliasing
fi
@@ -37,30 +39,30 @@
gnustep-base_src_compile() {
egnustep_env
- if [ -x ./configure ]; then
- econf || die
+ if [[ -x ./configure ]] ; then
+ econf || die "configure failed"
fi
- egnustep_make || die
+ egnustep_make
}
gnustep-base_src_install() {
egnustep_env
- egnustep_install || die
+ egnustep_install
if use doc ; then
egnustep_env
egnustep_doc
fi
# Copies "convenience scripts"
- if [ -f "${FILESDIR}/config-${PN}.sh" ]; then
+ if [[ -f ${FILESDIR}/config-${PN}.sh ]] ; then
dodir ${GNUSTEP_SYSTEM_TOOLS}/Gentoo
exeinto ${GNUSTEP_SYSTEM_TOOLS}/Gentoo
- doexe ${FILESDIR}/config-${PN}.sh
+ doexe "${FILESDIR}"/config-${PN}.sh
fi
}
gnustep-base_pkg_postinst() {
- # Informs user about existence of "convenience script"
- if [ -f "${FILESDIR}/config-${PN}.sh" ]; then
+ # Informs user about existence of "convenience script"
+ if [[ -f ${FILESDIR}/config-${PN}.sh ]] ; then
elog "Make sure to set happy defaults for this package by
executing:"
elog " ${GNUSTEP_SYSTEM_TOOLS}/Gentoo/config-${PN}.sh"
elog "as the user you will run the package as."
@@ -72,30 +74,15 @@
# Get additional variables
GNUSTEP_SH_EXPORT_ALL_VARIABLES="true"
- if [ -f "${GNUSTEP_PREFIX}/System/Library/Makefiles/GNUstep.sh" ] ; then
+ if [[ -f ${GNUSTEP_PREFIX}/System/Library/Makefiles/GNUstep.sh ]] ; then
# Reset GNUstep variables
- . ${GNUSTEP_PREFIX}/System/Library/Makefiles/GNUstep-reset.sh
- . ${GNUSTEP_PREFIX}/System/Library/Makefiles/GNUstep.sh
+ source
"${GNUSTEP_PREFIX}"/System/Library/Makefiles/GNUstep-reset.sh
+ source "${GNUSTEP_PREFIX}"/System/Library/Makefiles/GNUstep.sh
# Needed to run installed GNUstep apps in sandbox
addpredict "/root/GNUstep"
- # Set up common env vars for make operations
- __GS_MAKE_EVAL=" \
- HOME=\"\${T}\" \
- GNUSTEP_USER_DIR=\"\${T}\" \
- GNUSTEP_USER_DEFAULTS_DIR=\"\${T}\"/Defaults \
- DESTDIR=\"\${D}\" \
- GNUSTEP_INSTALLATION_DOMAIN=SYSTEM \
- TAR_OPTIONS=\"\${TAR_OPTIONS} --no-same-owner\" \
- messages=yes \
- -j1"
- # -j1 is needed as gnustep-make is not parallel-safe
-
- if ! use debug ; then
- __GS_MAKE_EVAL="${__GS_MAKE_EVAL} debug=no"
- fi
-
+ # Set rpath in ldflags when available
case ${CHOST} in
*-linux-gnu|*-solaris*)
append-ldflags \
@@ -107,40 +94,56 @@
-L"${GNUSTEP_SYSTEM_LIBRARIES}"
;;
esac
- __GS_MAKE_EVAL="${__GS_MAKE_EVAL}
AUXILIARY_LDFLAGS=\"\${LDFLAGS}\""
- else
- die "gnustep-make not installed!"
+
+ # Set up env vars for make operations
+ GS_ENV=( AUXILIARY_LDFLAGS="${LDFLAGS}" \
+ DESTDIR="${D}" \
+ HOME="${T}" \
+ GNUSTEP_USER_DIR="${T}" \
+ GNUSTEP_USER_DEFAULTS_DIR="${T}"/Defaults \
+ GNUSTEP_INSTALLATION_DOMAIN=SYSTEM \
+ TAR_OPTIONS="${TAR_OPTIONS} --no-same-owner" \
+ messages=yes \
+ -j1 )
+ # -j1 is needed as gnustep-make is not parallel-safe
+
+ if ! use debug ; then
+ GS_ENV=( "[EMAIL PROTECTED]" "debug=no" )
+ fi
+
+ return 0
fi
+ die "gnustep-make not installed!"
}
# Make utilizing GNUstep Makefiles
egnustep_make() {
- if [ -f ./[mM]akefile -o -f ./GNUmakefile ] ; then
- eval emake ${*} ${__GS_MAKE_EVAL} all || die "package make
failed"
- else
- die "no Makefile found"
+ if [[ -f ./[mM]akefile || -f ./GNUmakefile ]] ; then
+ emake ${*} "[EMAIL PROTECTED]" all || die "package make failed"
+ return 0
fi
+ die "no Makefile found"
}
# Make-install utilizing GNUstep Makefiles
egnustep_install() {
# avoid problems due to our "weird" prefix, make sure it exists
- mkdir -p "${D}${GNUSTEP_SYSTEM_TOOLS}"
- if [ -f ./[mM]akefile -o -f ./GNUmakefile ] ; then
- eval emake ${*} ${__GS_MAKE_EVAL} install || die "package
install failed"
- else
- die "no Makefile found"
+ mkdir -p "${D}"${GNUSTEP_SYSTEM_TOOLS}
+ if [[ -f ./[mM]akefile || -f ./GNUmakefile ]] ; then
+ emake ${*} "[EMAIL PROTECTED]" install || die "package install
failed"
+ return 0
fi
+ die "no Makefile found"
}
# Make and install docs using GNUstep Makefiles
egnustep_doc() {
- if [ -d ./Documentation ]; then
+ if [[ -d ./Documentation ]] ; then
# Check documentation presence
- cd ${S}/Documentation
- if [ -f ./[mM]akefile -o -f ./GNUmakefile ] ; then
- eval emake ${__GS_MAKE_EVAL} all || die "doc make
failed"
- eval emake ${__GS_MAKE_EVAL} install || die "doc
install failed"
+ cd "${S}"/Documentation
+ if [[ -f ./[mM]akefile || -f ./GNUmakefile ]] ; then
+ emake "[EMAIL PROTECTED]" all || die "doc make failed"
+ emake "[EMAIL PROTECTED]" install || die "doc install
failed"
fi
cd ..
fi
