Package: src:emacs23
Version: 23.3+1-3
Severity: wishlist
Tags: patch
Please use $(CRT_DIR) instead of /usr/lib64 on ppc64.
Regards,
--
Hiroyuki Yamamoto
A75D B285 7050 4BF9 AEDA 91AC 3A10 59C6 5203 04DC
diff -Nurd emacs23-23.3+1.orig/configure.in emacs23-23.3+1/configure.in
--- emacs23-23.3+1.orig/configure.in 2011-10-25 19:04:23.000000000 +0900
+++ emacs23-23.3+1/configure.in 2011-10-25 20:37:32.000000000 +0900
@@ -172,7 +172,7 @@
CRT_DIR=
AC_ARG_WITH([crt-dir],dnl
[AS_HELP_STRING([--with-crt-dir=DIR],[directory containing crtn.o etc.
-This option is only used on x86-64 and s390x GNU/Linux architectures.])])
+This option is only used on x86-64, powerpc64 and s390x GNU/Linux architectures.])])
CRT_DIR="${with_crt_dir}"
AC_ARG_WITH([gnustep-conf],dnl
@@ -1006,11 +1006,11 @@
dnl Do this early because it can frob feature test macros for Unix-98 &c.
AC_SYS_LARGEFILE
-## Note: at present CRT_DIR is only used for amdx86-64 and ibms390x.
+## Note: at present CRT_DIR is only used for amdx86-64, powerpc64 and ibms390x.
## Other machine types hard-code the location in src/[ms]/*.h.
case "${canonical}" in
- x86_64-*-linux-gnu* | s390x-*-linux-gnu* )
- ## On x86-64 and s390x GNU/Linux distributions, the standard library
+ x86_64-*-linux-gnu* | powerpc64-*-linux-gnu* | s390x-*-linux-gnu* )
+ ## On x86-64, powerpc64 and s390x GNU/Linux distributions, the standard library
## can be in a variety of places. We only try /usr/lib64 and /usr/lib.
## For anything else (eg /usr/lib32), it is up the user to specify
## the location (bug#5655).
diff -Nurd emacs23-23.3+1.orig/src/m/macppc.h emacs23-23.3+1/src/m/macppc.h
--- emacs23-23.3+1.orig/src/m/macppc.h 2011-04-05 12:46:44.000000000 +0900
+++ emacs23-23.3+1/src/m/macppc.h 2011-10-25 21:02:20.000000000 +0900
@@ -50,9 +50,9 @@
#define LD_SWITCH_MACHINE_TEMACS -Xlinker -znocombreloc
#ifdef _ARCH_PPC64
#undef START_FILES
-#define START_FILES pre-crt0.o /usr/lib64/crt1.o /usr/lib64/crti.o
+#define START_FILES pre-crt0.o $(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o
#undef LIB_STANDARD
-#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib64/crtn.o
+#define LIB_STANDARD -lgcc -lc -lgcc $(CRT_DIR)/crtn.o
#endif
#endif
