emacs-22.2 patch for Linux/SPARC

emacs-22.2 patch for Linux/SPARC

[Chip Coldwell]

The following patch was required to get emacs-22.2 to build on
Linux/SPARC.  Please consider this for inclusion in emacs-23 and
future releases of emacs-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 */


Chip

-- 
Charles M. "Chip" Coldwell
Senior Software Engineer
Red Hat, Inc
978-392-2426

GPG ID:  852E052F
GPG FPR: 77E5 2B51 4907 F08A 7E92  DE80 AFA9 9A8F 852E 052F

---------- Forwarded message ----------
Date: Thu, 24 Apr 2008 18:18:28 GMT
From: Dennis Gilmore <ausil@fedoraproject.org>
To: cvsextras@fedora.redhat.com, coldwell@redhat.com
Subject: rpms/emacs/F-9 emacs-22.1.50-sparc64.patch, NONE, 1.1 emacs.spec,
    1.110, 1.111

Author: ausil

Update of /cvs/pkgs/rpms/emacs/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22416

Modified Files:
	emacs.spec 
Added Files:
	emacs-22.1.50-sparc64.patch 
Log Message:
add patch fixing build on sparc64


emacs-22.1.50-sparc64.patch:

--- NEW FILE emacs-22.1.50-sparc64.patch ---
Index: emacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emacs/F-9/emacs.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- emacs.spec	23 Apr 2008 17:12:32 -0000	1.110
+++ emacs.spec	24 Apr 2008 18:17:52 -0000	1.111
@@ -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 @@
 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 @@
 %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 @@
 %dir %{_datadir}/emacs/%{version}
 
 %changelog
+* Thu Apr 24 2008 Dennis Gilmore <dennis@ausil.us> 22.2-2
+- add patch fixing libdir on sparc64
+
 * Tue Apr 22 2008 Chip Coldwell <coldwell@redhat.com> 22.2-1
 - revert back to emacs-22.2 (bz443639)
 - update to php-mode-1.4.0

Re: emacs-22.2 patch for Linux/SPARC

[Glenn Morris]

Chip Coldwell wrote:

> The following patch was required to get emacs-22.2 to build on
> Linux/SPARC.  Please consider this for inclusion in emacs-23 and
> future releases of emacs-22.

Thanks for forwarding bug reports and patches.

For legal reasons, when you send patches, please could you explicitly
give the name and email address of the patch author.

In this case, it seems to be Dennis Gilmore, ausil at fedoraproject.org,
is that right?

ChangeLog entries too would be perfect. :)

"emacs-23" packages [was Re: emacs-22.2 patch for Linux/SPARC]

[Glenn Morris]

PS whilst looking through bugzilla, I noticed references to "Emacs-23"
packages in Red Hat, eg

https://bugzilla.redhat.com/show_bug.cgi?id=443639

Perhaps I misunderstand, but I think this is a recipe for trouble.
There is no such thing as "Emacs 23" yet. "emacs-snapshot" or
"emacs-cvs" would be a much better name. I'm not sure releasing
"emacs-23.0.60" rpms makes this distinction clear. "23.0.60" is a
movable feast that doesn't have much meaning as a version number. The
date of your CVS snapshot would be much more meaningful.

Re: emacs-22.2 patch for Linux/SPARC

[Richard M Stallman]

    The following patch was required to get emacs-22.2 to build on
    Linux/SPARC.

Thanks for showing us this patch, but you can't build Emacs on Linux
alone.  Linux is just a kernel.

To build or run Emacs, you need a GNU/Linux system.  We, the GNU
Project, are the principal developers of that system, but if you call
it "Linux", you give us none of the credit.  Would you please call it
GNU/Linux?

See http://www.gnu.org/gnu/linux-and-gnu.html for more explanation.
And http://www.gnu.org/gnu/gnu-linux-faq.html.