Re: Problems compiling on Archlinux 64

[Giorgos Keramidas <keramida@freebsd.org>]

On 2006-11-22 10:48, Chong Yidong <cyd@stupidchicken.com> wrote:
> Does this completely untested patch give good results (you'll have to
> regenerate configure to test it, of course)?

I just finished building an Emacs snapshot with these changes on FreeBSD
7.0-CURRENT.  No obvious regressions can be seen, so it should be ok.

- Giorgos

> *** emacs/configure.in.~1.418.~	2006-11-14 10:54:05.000000000 -0500
> --- emacs/configure.in	2006-11-22 10:42:46.000000000 -0500
> ***************
> *** 1485,1490 ****
> --- 1485,1500 ----
>   AC_SYS_LARGEFILE
>   
>   
> + ### The standard library on x86-64 GNU/Linux distributions can 
> + ### be located in either /usr/lib64 or /usr/lib.
> + case "${canonical}" in
> +   x86_64-*-linux-gnu* )
> +     if test -d /usr/lib64; then
> +       AC_DEFINE(HAVE_X86_64_LIB64_DIR, 1,
> +         [Define to 1 if the file /usr/lib64 exists.])
> + fi
> + esac
> + 
>   dnl This function defintion taken from Gnome 2.0
>   dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
>   dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
> *** emacs/src/m/amdx86-64.h.~1.11.~	2006-10-30 09:06:42.000000000 -0500
> --- emacs/src/m/amdx86-64.h	2006-11-22 10:44:40.000000000 -0500
> ***************
> *** 128,134 ****
> --- 128,138 ----
>   #else /* !__OpenBSD__ && !__FreeBSD__ */
>   
>   #undef START_FILES
> + #ifdef HAVE_X86_64_LIB64_DIR
>   #define START_FILES pre-crt0.o /usr/lib64/crt1.o /usr/lib64/crti.o
> + #else
> + #define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o
> + #endif
>   
>   /* 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,
> ***************
> *** 136,142 ****
> --- 140,150 ----
>      versions of ld are one-pass linkers, we need to mention -lgcc twice,
>      or else we risk getting unresolved externals.  */
>   #undef LIB_STANDARD
> + #ifdef HAVE_X86_64_LIB64_DIR
>   #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib64/crtn.o
> + #else
> + #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtn.o
> + #endif
>   
>   #endif /* __FreeBSD__ */