diff options
| author | rgrimes <rgrimes@FreeBSD.org> | 1994-09-09 15:12:31 +0000 |
|---|---|---|
| committer | rgrimes <rgrimes@FreeBSD.org> | 1994-09-09 15:12:31 +0000 |
| commit | ae0202f3c61e6327e273fea3e5d6a47b525e7823 (patch) | |
| tree | 6dc83ec0d6493d1cd96d4cf02c75852bce588270 /gnu | |
| parent | 68697bb86cf6288524a95aaf0c556d4e5c0c1c6b (diff) | |
| download | FreeBSD-src-ae0202f3c61e6327e273fea3e5d6a47b525e7823.zip FreeBSD-src-ae0202f3c61e6327e273fea3e5d6a47b525e7823.tar.gz | |
ljo:
You need to fix the libio/_G_config.h file around lines 42-44. After
that everything should be OK. You should have seen many warning error
messages about this file. There are missing "short" "char" keywords
the file.
Michael:
Apply the following patch
rgrimes:
The patch to include/_G_config.h is highly questionable and has been
marked as such.
Reviewed by: rgrimes
Submitted by: L Jonas Olsson <ljo@ljo-slip.DIALIN.CWRU.Edu>
Submitted by: Michael Reifenberger <root@rz-wb.fh-sw.de>
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/lib/libg++/Makefile | 6 | ||||
| -rw-r--r-- | gnu/lib/libg++/include/_G_config.h | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/gnu/lib/libg++/Makefile b/gnu/lib/libg++/Makefile index 519c317..882b07a 100644 --- a/gnu/lib/libg++/Makefile +++ b/gnu/lib/libg++/Makefile @@ -5,14 +5,14 @@ SRCS= vasprintf.c strerror.c strsignal.c SRCS+= filedoalloc.c floatconv.c genops.c fileops.c iovfprintf.c iovfscanf.c ioignore.c iopadn.c iofgetpos.c iofread.c iofscanf.c iofsetpos.c iogetline.c ioprintf.c ioseekoff.c ioseekpos.c outfloat.c strops.c iofclose.c iopopen.c ioungetc.c builtinbuf.cc filebuf.cc fstream.cc indstream.cc isgetline.cc isgetsb.cc isscan.cc ioextend.cc iomanip.cc iostream.cc osform.cc procbuf.cc sbform.cc sbgetline.cc sbscan.cc stdiostream.cc stdstrbufs.cc stdstreams.cc stream.cc streambuf.cc strstream.cc PlotFile.cc SFile.cc parsestream.cc pfstream.cc editbuf.cc ioprims.c iostrerror.c cleanup.c SRCS+= AllocRing.cc Obstack.cc builtin.cc regex.cc Regex.cc String.cc Intdouble.cc Integer.cc Rational.cc Complex.cc Random.cc BitSet.cc BitString.cc LogNorm.cc SmplHist.cc SmplStat.cc Normal.cc NegExp.cc Weibull.cc Erlang.cc DiscUnif.cc Uniform.cc Poisson.cc HypGeom.cc Geom.cc Binomial.cc RNG.cc ACG.cc MLCG.cc RndInt.cc Fix.cc Fix16.cc Fix24.cc CursesW.cc GetOpt.cc new.cc chr.cc error.cc gcd.cc hash.cc lg.cc fmtq.cc ioob.cc pow.cc sqrt.cc str.cc timer.c math.cc compare.cc bitand.c bitany.c bitblt.c bitclear.c bitcopy.c bitcount.c bitinvert.c bitlcomp.c bitset1.c bitxor.c SLList.cc DLList.cc -LIB= libg++ +LIB= g++ NOMAN= noman CFLAGS+= -nostdinc -I${.CURDIR}/include -I/usr/include -CXXFLAGS+= -fexternal-templates +CXXFLAGS+= -fexternal-templates -I${.CURDIR}/include .PATH: ${.CURDIR}/libiberty ${.CURDIR}/libio ${.CURDIR}/libg++ beforeinstall: @-if [ ! -d ${DESTDIR}/usr/include/g++ ]; then mkdir ${DESTDIR}/usr/include/g++; chown ${BINOWN}.${BINGRP} ${DESTDIR}/usr/include/g++; chmod 755 ${DESTDIR}/usr/include/g++; fi - @(cd include ; for j in *.h; do cmp -s $$j ${DESTDIR}/usr/include/g++/$$j || install -c -o ${BINOWN} -g ${BINGRP} -m 444 $$j ${DESTDIR}/usr/include/$$j; done) + @(cd ${.CURDIR}/include ; for j in *.h; do cmp -s $$j ${DESTDIR}/usr/include/g++/$$j || install -c -o ${BINOWN} -g ${BINGRP} -m 444 $$j ${DESTDIR}/usr/include/$$j; done) .include <bsd.lib.mk> diff --git a/gnu/lib/libg++/include/_G_config.h b/gnu/lib/libg++/include/_G_config.h index 2b73e90..01a1787 100644 --- a/gnu/lib/libg++/include/_G_config.h +++ b/gnu/lib/libg++/include/_G_config.h @@ -1,5 +1,11 @@ /* AUTOMATICALLY GENERATED; DO NOT EDIT! */ #ifndef _G_config_h +/* + * XXX This #include added by hand, it SHOULD NOT be here, but we do + * not currently have the tools that Automatically generate this file and must + * resort to this hackery to make it compile under FreeBSD 2.X + */ +#include <sys/types.h> #define _G_config_h #define _G_LIB_VERSION "0.65" #define _G_NAMES_HAVE_UNDERSCORE 1 |
