From 0e7118d15fc3af38b2549a12a37918703623a67b034fc45d29c8966cafc79861 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Wed, 17 Mar 2010 13:26:36 +0000 Subject: [PATCH 1/4] . OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=22 --- emacs.changes | 5 ++++ emacs.spec | 65 ++++++++++++++++++++++++++++++--------------------- 2 files changed, 44 insertions(+), 26 deletions(-) diff --git a/emacs.changes b/emacs.changes index 17b94e0..c21681a 100644 --- a/emacs.changes +++ b/emacs.changes @@ -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 diff --git a/emacs.spec b/emacs.spec index e3efb0d..9d5dcf4 100644 --- a/emacs.spec +++ b/emacs.spec @@ -20,6 +20,7 @@ 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: gcc43 Url: http://www.gnu.org/software/emacs/ License: GPLv2+ Group: Productivity/Editors/Emacs @@ -252,26 +253,40 @@ fi %patch -P 18 -p1 %build -cflags () -{ - local flag=$1; shift - case "${RPM_OPT_FLAGS}" in - *${flag}*) return - esac - if test -n "$1" && gcc -Werror $flag -S -o /dev/null -xc /dev/null > /dev/null 2>&1 ; then - local var=$1; shift - eval $var=\${$var:+\$$var\ }$flag - fi - if test -n "$1" && g++ -Werror $flag -S -o /dev/null -xc++ /dev/null > /dev/null 2>&1 ; then - local var=$1; shift - eval $var=\${$var:+\$$var\ }$flag - fi -} -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 - exit 1 -fi + CC=gcc-4.3 + cflags () + { + local flag=$1; shift + local var=$1; shift + test -n "${flag}" -a -n "${var}" || return + case "${!var}" in + *${flag}*) return + esac + case "$flag" in + -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 + fi + set +o noclobber + 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 + fi + if ${CXX:-g++} -Werror $flag -S -o /dev/null -xc++ /dev/null > /dev/null 2>&1 ; then + eval $var=\${$var:+\$$var\ }$flag + 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 + exit 1 + fi VERSION=%{version} %ifarch noarch SYS="--build=%{_build_cpu}-suse-%{_build_os} @@ -280,8 +295,8 @@ VERSION=%{version} SYS="--build=%{_target_cpu}-suse-%{_build_os} " %endif - CFLAGS="${RPM_OPT_FLAGS} -D_GNU_SOURCE" - LDFLAGS= + CFLAGS="${RPM_OPT_FLAGS} -D_GNU_SOURCE" +LDFLAGS= cflags -std=gnu89 CFLAGS cflags -pipe CFLAGS cflags -Wno-pointer-sign CFLAGS @@ -291,7 +306,7 @@ VERSION=%{version} cflags -Wl,-O2 LDFLAGS cflags -Wl,--hash-size=65521 LDFLAGS %ifarch ia64 - CFLAGS=$(echo "${CFLAGS}"|sed -r 's/-O[0-9]?/-O1/g') + CFLAGS=$(echo "${CFLAGS}"|sed -r 's/-O[0-9]?/-O1/g') %endif SMALL="-DSYSTEM_PURESIZE_EXTRA=25000 \ -DSITELOAD_PURESIZE_EXTRA=10000 \ @@ -299,9 +314,7 @@ VERSION=%{version} LARGE="-DSYSTEM_PURESIZE_EXTRA=55000 \ -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 PREFIX="--prefix=%{_prefix} \ --mandir=%{_mandir} \ From c1799c8809c99d5d8fe7ce935a9d95a8a45bb30df81ff7b108bf12b5060d8a27 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 18 Mar 2010 14:44:08 +0000 Subject: [PATCH 2/4] Updating link to change in openSUSE:Factory/emacs revision 44.0 OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=314eb253a926c3fa7a0bd30f5b9c8b5c --- ready | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 ready diff --git a/ready b/ready deleted file mode 100644 index 473a0f4..0000000 From 583ea481a021ede4b025354bf152e2281ea432560225bad39c3545a26ae336e1 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 18 Mar 2010 23:16:48 +0000 Subject: [PATCH 3/4] Accepting request 35054 from editors checked in (request 35054) OBS-URL: https://build.opensuse.org/request/show/35054 OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=23 --- emacs.changes | 5 ---- emacs.spec | 65 +++++++++++++++++++++------------------------------ 2 files changed, 26 insertions(+), 44 deletions(-) diff --git a/emacs.changes b/emacs.changes index c21681a..17b94e0 100644 --- a/emacs.changes +++ b/emacs.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -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 diff --git a/emacs.spec b/emacs.spec index 9d5dcf4..e3efb0d 100644 --- a/emacs.spec +++ b/emacs.spec @@ -20,7 +20,6 @@ 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: gcc43 Url: http://www.gnu.org/software/emacs/ License: GPLv2+ Group: Productivity/Editors/Emacs @@ -253,40 +252,26 @@ fi %patch -P 18 -p1 %build - CC=gcc-4.3 - cflags () - { - local flag=$1; shift - local var=$1; shift - test -n "${flag}" -a -n "${var}" || return - case "${!var}" in - *${flag}*) return - esac - case "$flag" in - -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 - fi - set +o noclobber - 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 - fi - if ${CXX:-g++} -Werror $flag -S -o /dev/null -xc++ /dev/null > /dev/null 2>&1 ; then - eval $var=\${$var:+\$$var\ }$flag - 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 - exit 1 - fi +cflags () +{ + local flag=$1; shift + case "${RPM_OPT_FLAGS}" in + *${flag}*) return + esac + if test -n "$1" && gcc -Werror $flag -S -o /dev/null -xc /dev/null > /dev/null 2>&1 ; then + local var=$1; shift + eval $var=\${$var:+\$$var\ }$flag + fi + if test -n "$1" && g++ -Werror $flag -S -o /dev/null -xc++ /dev/null > /dev/null 2>&1 ; then + local var=$1; shift + eval $var=\${$var:+\$$var\ }$flag + fi +} +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 + exit 1 +fi VERSION=%{version} %ifarch noarch SYS="--build=%{_build_cpu}-suse-%{_build_os} @@ -295,8 +280,8 @@ VERSION=%{version} SYS="--build=%{_target_cpu}-suse-%{_build_os} " %endif - CFLAGS="${RPM_OPT_FLAGS} -D_GNU_SOURCE" -LDFLAGS= + CFLAGS="${RPM_OPT_FLAGS} -D_GNU_SOURCE" + LDFLAGS= cflags -std=gnu89 CFLAGS cflags -pipe CFLAGS cflags -Wno-pointer-sign CFLAGS @@ -306,7 +291,7 @@ LDFLAGS= cflags -Wl,-O2 LDFLAGS cflags -Wl,--hash-size=65521 LDFLAGS %ifarch ia64 - CFLAGS=$(echo "${CFLAGS}"|sed -r 's/-O[0-9]?/-O1/g') + CFLAGS=$(echo "${CFLAGS}"|sed -r 's/-O[0-9]?/-O1/g') %endif SMALL="-DSYSTEM_PURESIZE_EXTRA=25000 \ -DSITELOAD_PURESIZE_EXTRA=10000 \ @@ -314,7 +299,9 @@ LDFLAGS= LARGE="-DSYSTEM_PURESIZE_EXTRA=55000 \ -DSITELOAD_PURESIZE_EXTRA=10000 \ " - LANG=POSIX; LC_CTYPE=ISO-8859-1 + CC=gcc +LANG=POSIX +LC_CTYPE=ISO-8859-1 export CC CFLAGS LANG LC_CTYPE LDFLAGS PREFIX="--prefix=%{_prefix} \ --mandir=%{_mandir} \ From 9133e96c274cd2a52c4b0854e8309df46fdcf0df84a92ce80610d6266f89136d Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 18 Mar 2010 23:16:49 +0000 Subject: [PATCH 4/4] Updating link to change in openSUSE:Factory/emacs revision 45.0 OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=337d458c78d4f69d430446f26d9da930 --- emacs.changes | 5 ++++ emacs.spec | 67 ++++++++++++++++++++++++++++++--------------------- 2 files changed, 45 insertions(+), 27 deletions(-) diff --git a/emacs.changes b/emacs.changes index 17b94e0..c21681a 100644 --- a/emacs.changes +++ b/emacs.changes @@ -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 diff --git a/emacs.spec b/emacs.spec index e3efb0d..81299bb 100644 --- a/emacs.spec +++ b/emacs.spec @@ -20,11 +20,12 @@ 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: gcc43 Url: http://www.gnu.org/software/emacs/ License: GPLv2+ Group: Productivity/Editors/Emacs Version: 23.1 -Release: 8 +Release: 9 Obsoletes: ge_exec ge_site emac_nox emacmisc emacsbin emacsger emacs-url Mule-UCS emacs-calc erc Requires: emacs-info = %{version} Requires: emacs_program = %{version}-%{release} @@ -252,26 +253,40 @@ fi %patch -P 18 -p1 %build -cflags () -{ - local flag=$1; shift - case "${RPM_OPT_FLAGS}" in - *${flag}*) return - esac - if test -n "$1" && gcc -Werror $flag -S -o /dev/null -xc /dev/null > /dev/null 2>&1 ; then - local var=$1; shift - eval $var=\${$var:+\$$var\ }$flag - fi - if test -n "$1" && g++ -Werror $flag -S -o /dev/null -xc++ /dev/null > /dev/null 2>&1 ; then - local var=$1; shift - eval $var=\${$var:+\$$var\ }$flag - fi -} -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 - exit 1 -fi + CC=gcc-4.3 + cflags () + { + local flag=$1; shift + local var=$1; shift + test -n "${flag}" -a -n "${var}" || return + case "${!var}" in + *${flag}*) return + esac + case "$flag" in + -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 + fi + set +o noclobber + 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 + fi + if ${CXX:-g++} -Werror $flag -S -o /dev/null -xc++ /dev/null > /dev/null 2>&1 ; then + eval $var=\${$var:+\$$var\ }$flag + 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 + exit 1 + fi VERSION=%{version} %ifarch noarch SYS="--build=%{_build_cpu}-suse-%{_build_os} @@ -280,8 +295,8 @@ VERSION=%{version} SYS="--build=%{_target_cpu}-suse-%{_build_os} " %endif - CFLAGS="${RPM_OPT_FLAGS} -D_GNU_SOURCE" - LDFLAGS= + CFLAGS="${RPM_OPT_FLAGS} -D_GNU_SOURCE" +LDFLAGS= cflags -std=gnu89 CFLAGS cflags -pipe CFLAGS cflags -Wno-pointer-sign CFLAGS @@ -291,7 +306,7 @@ VERSION=%{version} cflags -Wl,-O2 LDFLAGS cflags -Wl,--hash-size=65521 LDFLAGS %ifarch ia64 - CFLAGS=$(echo "${CFLAGS}"|sed -r 's/-O[0-9]?/-O1/g') + CFLAGS=$(echo "${CFLAGS}"|sed -r 's/-O[0-9]?/-O1/g') %endif SMALL="-DSYSTEM_PURESIZE_EXTRA=25000 \ -DSITELOAD_PURESIZE_EXTRA=10000 \ @@ -299,9 +314,7 @@ VERSION=%{version} LARGE="-DSYSTEM_PURESIZE_EXTRA=55000 \ -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 PREFIX="--prefix=%{_prefix} \ --mandir=%{_mandir} \