pool/emacs
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=22
This commit is contained in:
Dr. Werner Fink 2010-03-17 13:26:36 +00:00 committed by Git OBS Bridge
parent 0e9ceaca47
commit 0e7118d15f
2 changed files with 44 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
emacs.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Mar 17 14:25:12 CET 2010 - werner@suse.de
- gcc45 seems not to work with emacs switch to gcc43 (bnc#587307)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Feb 24 18:13:47 UTC 2010 - coolo@novell.com Wed Feb 24 18:13:47 UTC 2010 - coolo@novell.com

43
emacs.spec
View File

@ -20,6 +20,7 @@
Name: emacs Name: emacs
BuildRequires: alsa-devel bind-devel dbus-1-devel elfutils fdupes fonts-config freetype2-devel giflib-devel gpm gtk2-devel krb5-devel libjpeg-devel libotf-devel libpng-devel librsvg-devel libtiff-devel m17n-lib-devel ncurses-devel nmh sendmail texinfo update-desktop-files xaw3d-devel xorg-x11-devel BuildRequires: alsa-devel bind-devel dbus-1-devel elfutils fdupes fonts-config freetype2-devel giflib-devel gpm gtk2-devel krb5-devel libjpeg-devel libotf-devel libpng-devel librsvg-devel libtiff-devel m17n-lib-devel ncurses-devel nmh sendmail texinfo update-desktop-files xaw3d-devel xorg-x11-devel
BuildRequires: gcc43
Url: http://www.gnu.org/software/emacs/ Url: http://www.gnu.org/software/emacs/
License: GPLv2+ License: GPLv2+
Group: Productivity/Editors/Emacs Group: Productivity/Editors/Emacs
@ -252,26 +253,40 @@ fi
%patch -P 18 -p1 %patch -P 18 -p1
%build %build
cflags () CC=gcc-4.3
{ cflags ()
{
local flag=$1; shift local flag=$1; shift
case "${RPM_OPT_FLAGS}" in local var=$1; shift
test -n "${flag}" -a -n "${var}" || return
case "${!var}" in
*${flag}*) return *${flag}*) return
esac esac
if test -n "$1" && gcc -Werror $flag -S -o /dev/null -xc /dev/null > /dev/null 2>&1 ; then case "$flag" in
local var=$1; shift -Wl,*)
set -o noclobber
echo 'int main () { return 0; }' > ldtest.c
if ${CC:-gcc} -Werror $flag -o /dev/null -xc ldtest.c > /dev/null 2>&1 ; then
eval $var=\${$var:+\$$var\ }$flag eval $var=\${$var:+\$$var\ }$flag
fi fi
if test -n "$1" && g++ -Werror $flag -S -o /dev/null -xc++ /dev/null > /dev/null 2>&1 ; then set +o noclobber
local var=$1; shift rm -f ldtest.c
;;
*)
if ${CC:-gcc} -Werror $flag -S -o /dev/null -xc /dev/null > /dev/null 2>&1 ; then
eval $var=\${$var:+\$$var\ }$flag eval $var=\${$var:+\$$var\ }$flag
fi fi
} if ${CXX:-g++} -Werror $flag -S -o /dev/null -xc++ /dev/null > /dev/null 2>&1 ; then
if test "elisp$(sed -rn '/^INFO_TARGET/{s@.*=\s*@@; :j; s@(\.\./info|\$[\(\{]infodir[\)\}])/@@g; /\\$/{N; s@\\\n\s*@@; b j;}; H;};${g;s/[[:space:]]+/ /g;p;}' doc/*/Makefile.in)" != "%info_files" eval $var=\${$var:+\$$var\ }$flag
then fi
esac
}
if test "elisp$(sed -rn '/^INFO_TARGET/{s@.*=\s*@@; :j; s@(\.\./info|\$[\(\{]infodir[\)\}])/@@g; /\\$/{N; s@\\\n\s*@@; b j;}; H;};${g;s/[[:space:]]+/ /g;p;}' doc/*/Makefile.in)" != "%info_files"
then
echo Please update info_files >&2 echo Please update info_files >&2
exit 1 exit 1
fi fi
VERSION=%{version} VERSION=%{version}
%ifarch noarch %ifarch noarch
SYS="--build=%{_build_cpu}-suse-%{_build_os} SYS="--build=%{_build_cpu}-suse-%{_build_os}
@ -281,7 +296,7 @@ VERSION=%{version}
" "
%endif %endif
CFLAGS="${RPM_OPT_FLAGS} -D_GNU_SOURCE" CFLAGS="${RPM_OPT_FLAGS} -D_GNU_SOURCE"
LDFLAGS= LDFLAGS=
cflags -std=gnu89 CFLAGS cflags -std=gnu89 CFLAGS
cflags -pipe CFLAGS cflags -pipe CFLAGS
cflags -Wno-pointer-sign CFLAGS cflags -Wno-pointer-sign CFLAGS
@ -299,9 +314,7 @@ VERSION=%{version}
LARGE="-DSYSTEM_PURESIZE_EXTRA=55000 \ LARGE="-DSYSTEM_PURESIZE_EXTRA=55000 \
-DSITELOAD_PURESIZE_EXTRA=10000 \ -DSITELOAD_PURESIZE_EXTRA=10000 \
" "
CC=gcc LANG=POSIX; LC_CTYPE=ISO-8859-1
LANG=POSIX
LC_CTYPE=ISO-8859-1
export CC CFLAGS LANG LC_CTYPE LDFLAGS export CC CFLAGS LANG LC_CTYPE LDFLAGS
PREFIX="--prefix=%{_prefix} \ PREFIX="--prefix=%{_prefix} \
--mandir=%{_mandir} \ --mandir=%{_mandir} \