From owner-p4-projects@FreeBSD.ORG Fri Mar 19 16:55:41 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DF88D16A4D0; Fri, 19 Mar 2004 16:55:40 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B68C416A4CE for ; Fri, 19 Mar 2004 16:55:40 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9748043D1F for ; Fri, 19 Mar 2004 16:55:40 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2K0teGe033940 for ; Fri, 19 Mar 2004 16:55:40 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2K0tdOI033936 for perforce@freebsd.org; Fri, 19 Mar 2004 16:55:39 -0800 (PST) (envelope-from peter@freebsd.org) Date: Fri, 19 Mar 2004 16:55:39 -0800 (PST) Message-Id: <200403200055.i2K0tdOI033936@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 49319 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Mar 2004 00:55:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=49319 Change 49319 by peter@peter_overcee on 2004/03/19 16:55:27 hack around libgnuregex bogusness Affected files ... .. //depot/projects/hammer/build32.sh#2 edit Differences ... ==== //depot/projects/hammer/build32.sh#2 (text+kox) ==== @@ -1,5 +1,5 @@ #! /bin/sh -# $P4: //depot/projects/hammer/build32.sh#1 $ +# $P4: //depot/projects/hammer/build32.sh#2 $ # # This script is for running on a self-hosted amd64 machine, with an up-to-date # world and toolchain etc. ie: the installed world is assumed to match the sources. @@ -7,7 +7,12 @@ # # Its purpose is to build a 32 bit library set and a ld-elf32.so.1. +# XXX beware.. some of the library targets have no way to disable +# XXX installation of includes. ie: it will re-install some files in +# XXX /usr/include for you. + # Set up an obj tree +chflags -R noschg /tmp/i386 rm -rf /tmp/i386 # and a place to put the alternate include tree into. @@ -24,6 +29,8 @@ # Now the libraries. This doesn't work for bind and stdc++ yet. hence -k make -DNOMAN -DNODOC -DNOINFO MAKEOBJDIRPREFIX=/tmp/i386 LIBDIR=/usr/lib32 SHLIBDIR=/usr/lib32 MACHINE_ARCH=i386 CC="cc -m32 -I/tmp/i386/root/usr/include -L/usr/lib32 -B/usr/lib32" CXX="c++ -m32 -I/tmp/i386/root/usr/include/c++/3.3 -L/usr/lib32 -B/usr/lib32" LD="ld -m elf_i386_fbsd -Y P,/usr/lib32" -k libraries +(cd gnu/lib/libregex; make -DNOMAN -DNODOC -DNOINFO MAKEOBJDIRPREFIX=/tmp/i386 LIBDIR=/usr/lib32 SHLIBDIR=/usr/lib32 MACHINE_ARCH=i386 CC="cc -m32 -I/tmp/i386/root/usr/include/gnu -I/tmp/i386/root/usr/include -L/usr/lib32 -B/usr/lib32" CXX="c++ -m32 -I/tmp/i386/root/usr/include/c++/3.3 -L/usr/lib32 -B/usr/lib32" LD="ld -m elf_i386_fbsd -Y P,/usr/lib32" all install) + # and now that we have enough libraries, build ld-elf32.so.1 cd libexec/rtld-elf make -DNOMAN -DNODOC -DNOINFO PROG=ld-elf32.so.1 MAKEOBJDIRPREFIX=/tmp/i386 LIBDIR=/usr/lib32 SHLIBDIR=/usr/lib32 MACHINE_ARCH=i386 CC="cc -m32 -I/tmp/i386/root/usr/include -L/usr/lib32 -B/usr/lib32 -DCOMPAT_32BIT" LD="ld -m elf_i386_fbsd -Y P,/usr/lib32" obj