From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.bugs Subject: Re: Emacs 22.1 fails to build under GNU/Linux on S/390x due to multilib assumption Date: Wed, 16 Jan 2008 14:14:51 -0500 Message-ID: <8tir1tbn10.fsf@fencepost.gnu.org> References: <18317.10868.856546.238@a1ihome1.kph.uni-mainz.de> <200801151851.20725.vapier@gentoo.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1200510914 7343 80.91.229.12 (16 Jan 2008 19:15:14 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 16 Jan 2008 19:15:14 +0000 (UTC) Cc: Andreas Schwab , Ulrich Mueller , bug-gnu-emacs@gnu.org, emacs@gentoo.org To: Mike Frysinger Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Jan 16 20:15:30 2008 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1JFDjR-0004jB-88 for geb-bug-gnu-emacs@m.gmane.org; Wed, 16 Jan 2008 20:15:25 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JFDj2-0008SS-I1 for geb-bug-gnu-emacs@m.gmane.org; Wed, 16 Jan 2008 14:15:00 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JFDiw-0008OI-3Z for bug-gnu-emacs@gnu.org; Wed, 16 Jan 2008 14:14:54 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JFDiu-0008Lt-Hz for bug-gnu-emacs@gnu.org; Wed, 16 Jan 2008 14:14:53 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JFDiu-0008Lh-EI for bug-gnu-emacs@gnu.org; Wed, 16 Jan 2008 14:14:52 -0500 Original-Received: from fencepost.gnu.org ([140.186.70.10]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1JFDiu-0002Gv-7E for bug-gnu-emacs@gnu.org; Wed, 16 Jan 2008 14:14:52 -0500 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.67) (envelope-from ) id 1JFDit-0007pA-Jg; Wed, 16 Jan 2008 14:14:51 -0500 X-Spook: undercover Albania Firewalls Mole World Trade Center X-Ran: qGJq>Uz$B4YA94i$7;\Po)Nc+>Zb06%Te|| (Mike Frysinger's message of "Tue, 15 Jan 2008 18:51:19 -0500") User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) X-detected-kernel: by monty-python.gnu.org: Linux 2.6, seldom 2.4 (older, 4) X-BeenThere: bug-gnu-emacs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:17354 Archived-At: Mike Frysinger wrote: > - for $host_cpu == s390x, check /usr/lib64/ and then /usr/lib/ So in other words, for Emacs 22.2 we can just do for s390x what we already do for amd64? Could someone confirm if this works: *** configure.in 7 Jan 2008 08:53:18 -0000 1.444.2.6 --- configure.in 16 Jan 2008 19:12:52 -0000 *************** *** 1532,1538 **** ### 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.]) --- 1532,1538 ---- ### 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* | s390x-*-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.]) *** ibms390x.h 8 Jan 2008 04:04:33 -0000 1.4.2.3 --- ibms390x.h 16 Jan 2008 19:11:41 -0000 *************** *** 161,170 **** --- 161,178 ---- #define XPNTR(a) XUINT (a) #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 #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 /* arch-tag: 4b87653c-6add-4663-8691-7d9dc17b5519 (do not change this comment) */