Date: Thu, 16 Sep 2004 01:15:36 GMT From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 61579 for review Message-ID: <200409160115.i8G1FatP012247@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=61579 Change 61579 by peter@peter_melody on 2004/09/16 01:14:41 make build32.sh work completely. fix up libgnuregex's -I overrides and remove build32.sh hack Affected files ... .. //depot/projects/hammer/gnu/lib/libregex/Makefile#5 edit .. //depot/projects/hammer/tools/lib32/build32.sh#3 edit Differences ... ==== //depot/projects/hammer/gnu/lib/libregex/Makefile#5 (text+ko) ==== @@ -5,10 +5,10 @@ LIB= gnuregex SHLIB_MAJOR= 2 -SRCS= regex.c +SRCS= gnuregex.c INCSGROUPS= INCS WRINCS PXINCS INCS= regex.h.patched -CLEANFILES+= regex.h.patched +CLEANFILES+= regex.h.patched gnuregex.c INCSNAME= regex.h INCSDIR= ${INCLUDEDIR}/gnu WRINCS= gnuregex.h @@ -22,4 +22,8 @@ sed 's=<posix/regex\.h>=<gnu/posix/regex.h>=g' \ < ${.ALLSRC} > ${.TARGET} +gnuregex.c: regex.c + sed 's=<regex\.h>=<gnu/regex.h>=g' \ + < ${.ALLSRC} > ${.TARGET} + .include <bsd.lib.mk> ==== //depot/projects/hammer/tools/lib32/build32.sh#3 (text+ko) ==== @@ -25,7 +25,7 @@ mkdir -p $MAKEOBJDIRPREFIX CCARGS="-m32 -march=athlon-xp -msse2 -mfancy-math-387 -I/tmp/i386/root/usr/include -L/usr/lib32 -B/usr/lib32" -CXXARGS="-m32 -march=athlon-xp -msse2 -mfancy-math-387 -I/tmp/i386/root/usr/include/c++/3.3 -I/tmp/i386/root/usr/include -L/usr/lib32 -B/usr/lib32" +CXXARGS="-m32 -march=athlon-xp -msse2 -mfancy-math-387 -I/tmp/i386/root/usr/include/c++/3.4 -I/tmp/i386/root/usr/include -L/usr/lib32 -B/usr/lib32" # and a place to put the alternate include tree into. mkdir -p $MAKEOBJDIRPREFIX/root @@ -44,6 +44,7 @@ # libncurses needs a build-tools pass first. I wish build-tools was a recursive target. (cd lib/libncurses; make -s build-tools) +(cd lib/libmagic; make -s build-tools) # Now the libraries. This doesn't work for gnuregex yet. hence -k. # libbind is just an internal target, ignore it. @@ -53,14 +54,8 @@ export CC="cc $CCARGS" export CXX="c++ $CXXARGS" export LD="ld -m elf_i386_fbsd -Y P,/usr/lib32" -make -s -DNO_BIND -DNOMAN -DNODOC -DNOINFO -k libraries - -# Hack to fix gnuregex which does hacks to the -I path based on $DESTDIR. But, we cannot -# use DESTDIR during the libraries target, because we're just using alternate includes, not -# an alternate install directory. -unset CC -export CC="cc -I/tmp/i386/root/usr/include/gnu $CCARGS" -(cd gnu/lib/libregex; make -k -DNOMAN -DNODOC -DNOINFOall install) +export AS="as --32" +make -s -DNO_BIND -DNOMAN -DNODOC -DNOINFO libraries # and now that we have enough libraries, build ld-elf32.so.1 cd libexec/rtld-elf
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200409160115.i8G1FatP012247>