diff --git a/emacs-22.1.50-sparc64.patch b/emacs-22.1.50-sparc64.patch new file mode 100644 index 0000000..86e9c3b --- /dev/null +++ b/emacs-22.1.50-sparc64.patch @@ -0,0 +1,22 @@ +--- emacs-22.1.50/src/m/sparc.h.old 2008-02-11 01:26:36.000000000 -0600 ++++ emacs-22.1.50/src/m/sparc.h 2008-02-11 09:12:09.000000000 -0600 +@@ -93,6 +93,19 @@ + + #ifdef __arch64__ /* GCC, 64-bit ABI. */ + #define BITS_PER_LONG 64 ++#ifdef __linux__ ++#undef START_FILES ++#define START_FILES pre-crt0.o /usr/lib64/crt1.o /usr/lib64/crti.o ++ ++/* The duplicate -lgcc is intentional in the definition of LIB_STANDARD. ++ The reason is that some functions in libgcc.a call functions from libc.a, ++ and some libc.a functions need functions from libgcc.a. Since most ++ versions of ld are one-pass linkers, we need to mention -lgcc twice, ++ or else we risk getting unresolved externals. */ ++#undef LIB_STANDARD ++#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib64/crtn.o ++#endif ++ + #ifndef _LP64 + #define _LP64 /* Done on Alpha -- not sure if it + should be here. -- fx */ diff --git a/emacs.spec b/emacs.spec index 0baec36..6ce9648 100644 --- a/emacs.spec +++ b/emacs.spec @@ -3,7 +3,7 @@ Summary: GNU Emacs text editor Name: emacs Version: 22.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ URL: http://www.gnu.org/software/emacs/ Group: Applications/Editors @@ -26,6 +26,7 @@ Source21: igrep-init.el Patch0: glibc-open-macro.patch Patch1: rpm-spec-mode.patch Patch2: po-mode-auto-replace-date-71264.patch +Patch3: emacs-22.1.50-sparc64.patch Buildroot: %{_tmppath}/%{name}-%{version}-root BuildRequires: atk-devel, cairo-devel, freetype-devel, fontconfig-devel, giflib-devel, glibc-devel, gtk2-devel, libpng-devel BuildRequires: libjpeg-devel, libtiff-devel, libX11-devel, libXau-devel, libXdmcp-devel, libXrender-devel, libXt-devel @@ -102,6 +103,7 @@ Emacs packages or see some elisp examples. %prep %setup -q %patch0 -p1 -b .glibc-open-macro +%patch3 -p1 -b .sparc64-libdir # install rest of site-lisp files ( cd site-lisp @@ -308,6 +310,9 @@ alternatives --install %{_bindir}/etags emacs.etags %{_bindir}/etags.emacs 80 \ %dir %{_datadir}/emacs/%{version} %changelog +* Thu Apr 24 2008 Dennis Gilmore 22.2-2 +- add patch fixing libdir on sparc64 + * Tue Apr 22 2008 Chip Coldwell 22.2-1 - revert back to emacs-22.2 (bz443639) - update to php-mode-1.4.0