From 4582ed39d1a53d55ff618a7d4f4cc58a83115b73 Mon Sep 17 00:00:00 2001 From: Andy Keep Date: Wed, 11 May 2016 19:23:58 -0400 Subject: [PATCH] Added CPPFLAGS, CFLAGS, and LDFLAGS to the configuration options to support machines with libraries and header files installed in alternate locations on unix-like operating systems. configure, workarea, checkin, c/Mf-base, c/Mf-* Added support for building from a directory that is not a git checkout in order to support creating release source packages. configure original commit: 41d94b0793997e3b90c10d6d28aaa4e2d43857cc --- c/Mf-a6fb | 4 ++-- c/Mf-a6le | 4 ++-- c/Mf-a6nb | 4 ++-- c/Mf-a6ob | 4 ++-- c/Mf-a6osx | 4 ++-- c/Mf-a6s2 | 4 ++-- c/Mf-arm32le | 4 ++-- c/Mf-base | 2 ++ c/Mf-i3fb | 4 ++-- c/Mf-i3le | 4 ++-- c/Mf-i3nb | 4 ++-- c/Mf-i3ob | 4 ++-- c/Mf-i3osx | 4 ++-- c/Mf-i3qnx | 4 ++-- c/Mf-i3s2 | 4 ++-- c/Mf-ppc32le | 4 ++-- c/Mf-ta6fb | 4 ++-- c/Mf-ta6le | 4 ++-- c/Mf-ta6nb | 4 ++-- c/Mf-ta6ob | 4 ++-- c/Mf-ta6osx | 4 ++-- c/Mf-ta6s2 | 4 ++-- c/Mf-ti3fb | 4 ++-- c/Mf-ti3le | 4 ++-- c/Mf-ti3nb | 4 ++-- c/Mf-ti3ob | 4 ++-- c/Mf-ti3osx | 4 ++-- c/Mf-ti3s2 | 4 ++-- c/Mf-tppc32le | 4 ++-- checkin | 2 +- configure | 37 ++++++++++++++++++++++++++++++++++++- workarea | 3 +++ 32 files changed, 98 insertions(+), 58 deletions(-) diff --git a/c/Mf-a6fb b/c/Mf-a6fb index af19c76077..19536dce30 100644 --- a/c/Mf-a6fb +++ b/c/Mf-a6fb @@ -18,7 +18,7 @@ Cpu = X86_64 mdinclude = -I/usr/local/include -I/usr/X11R6/include mdclib = -L/usr/local/lib -liconv -lm -lncurses -C = gcc -Wpointer-arith -Wextra -Werror -O +C = gcc ${CPPFLAGS} -Wpointer-arith -Wextra -Werror -O ${CFLAGS} o = o mdsrc = i3le.c mdobj = i3le.o @@ -35,7 +35,7 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a ld -r -X -o ${Kernel} ${kernelobj} ../zlib/libz.a ${Scheme}: ${Kernel} ${Main} - $C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} + $C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS} ${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a: (cd ../zlib; CFLAGS=-m64 ./configure --64) diff --git a/c/Mf-a6le b/c/Mf-a6le index 82996f90ac..865571f00d 100644 --- a/c/Mf-a6le +++ b/c/Mf-a6le @@ -17,7 +17,7 @@ m = a6le Cpu = X86_64 mdclib = -lm -ldl -lncurses -lrt -C = gcc -m64 -msse2 -Wpointer-arith -Wall -Wextra -Werror -O2 +C = gcc ${CPPFLAGS} -m64 -msse2 -Wpointer-arith -Wall -Wextra -Werror -O2 ${CFLAGS} o = o mdsrc = i3le.c mdobj = i3le.o @@ -34,7 +34,7 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a ld -melf_x86_64 -r -X -o ${Kernel} ${kernelobj} ../zlib/libz.a ${Scheme}: ${Kernel} ${Main} - $C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} + $C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS} ${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a: (cd ../zlib; CFLAGS=-m64 ./configure --64) diff --git a/c/Mf-a6nb b/c/Mf-a6nb index f724629689..07834e12ef 100644 --- a/c/Mf-a6nb +++ b/c/Mf-a6nb @@ -18,7 +18,7 @@ Cpu = X86_64 mdinclude = -I/usr/X11R7/include -I/usr/pkg/include -I/usr/pkg/include/ncurses -I/usr/local/include -I/usr/X11R6/include mdclib = /usr/lib/i18n/libiconv_std.a -lm /usr/pkg/lib/libncurses.a -C = gcc -m64 -Wpointer-arith -Wextra -Werror -O +C = gcc ${CPPFLAGS} -m64 -Wpointer-arith -Wextra -Werror -O ${CFLAGS} o = o mdsrc = i3le.c mdobj = i3le.o @@ -35,7 +35,7 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a ld -r -X -o ${Kernel} ${kernelobj} ../zlib/libz.a ${Scheme}: ${Kernel} ${Main} - $C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} + $C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS} ${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a: (cd ../zlib; CFLAGS=-m64 ./configure --64) diff --git a/c/Mf-a6ob b/c/Mf-a6ob index dcc51c66b5..e048e86c84 100644 --- a/c/Mf-a6ob +++ b/c/Mf-a6ob @@ -18,7 +18,7 @@ Cpu = X86_64 mdinclude = -I/usr/local/include -I/usr/X11R6/include mdclib = -L/usr/local/lib -liconv -lm -lncurses -C = gcc -Wpointer-arith -Werror -O +C = gcc ${CPPFLAGS} -Wpointer-arith -Werror -O ${CFLAGS} o = o mdsrc = i3le.c mdobj = i3le.o @@ -35,7 +35,7 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a ld -r -X -o ${Kernel} ${kernelobj} ../zlib/libz.a ${Scheme}: ${Kernel} ${Main} - $C -rdynamic -Wl,--export-dynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} + $C -rdynamic -Wl,--export-dynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS} ${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a: (cd ../zlib; CFLAGS=-m64 ./configure --64) diff --git a/c/Mf-a6osx b/c/Mf-a6osx index ac1d7a62bf..73c85dced9 100644 --- a/c/Mf-a6osx +++ b/c/Mf-a6osx @@ -17,7 +17,7 @@ m = a6osx Cpu = X86_64 mdclib = -liconv -lm -lncurses -C = gcc -m64 -Wpointer-arith -Wall -Wextra -Werror -O2 -I/opt/X11/include/ +C = gcc ${CPPFLAGS} -m64 -Wpointer-arith -Wall -Wextra -Werror -O2 -I/opt/X11/include/ ${CFLAGS} o = o mdsrc = i3le.c mdobj = i3le.o @@ -34,7 +34,7 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a ld -r -o ${Kernel} ${kernelobj} ../zlib/libz.a ${Scheme}: ${Kernel} ${Main} - $C -o ${Scheme} ${Kernel} ${Main} ${mdclib} + $C -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS} ${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a: (cd ../zlib; CFLAGS=-m64 ./configure --64) diff --git a/c/Mf-a6s2 b/c/Mf-a6s2 index b1d4b85035..3591b42c13 100644 --- a/c/Mf-a6s2 +++ b/c/Mf-a6s2 @@ -17,7 +17,7 @@ m = a6s2 Cpu = X86_64 mdclib = -lnsl -ldl -lm -lcurses -lrt -C = gcc -m64 -Wpointer-arith -Wextra -Werror -O +C = gcc ${CPPFLAGS} -m64 -Wpointer-arith -Wextra -Werror -O ${CFLAGS} o = o mdsrc = i3le.c mdobj = i3le.o @@ -34,7 +34,7 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a ld -melf_x86_64 -r -X -o ${Kernel} ${kernelobj} ../zlib/libz.a ${Scheme}: ${Kernel} ${Main} - $C -o ${Scheme} ${Kernel} ${Main} ${mdclib} + $C -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS} ${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a: (cd ../zlib; CFLAGS=-m64 ./configure --64) diff --git a/c/Mf-arm32le b/c/Mf-arm32le index 70cbf0ffc0..c1b52ff6f6 100644 --- a/c/Mf-arm32le +++ b/c/Mf-arm32le @@ -17,7 +17,7 @@ m = arm32le Cpu = ARMV6 mdclib = -lm -ldl -lncurses -lrt -C = gcc -Wpointer-arith -Wextra -Werror -O2 +C = gcc ${CPPFLAGS} -Wpointer-arith -Wextra -Werror -O2 ${CFLAGS} o = o mdsrc = arm32le.c mdobj = arm32le.o @@ -34,7 +34,7 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a ld -r -X -o ${Kernel} ${kernelobj} ../zlib/libz.a ${Scheme}: ${Kernel} ${Main} - $C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} + $C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS} ${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a: (cd ../zlib; ./configure) diff --git a/c/Mf-base b/c/Mf-base index ed38415916..0cc49f2121 100644 --- a/c/Mf-base +++ b/c/Mf-base @@ -13,6 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +include Mf-config + Include=../boot/$m ZlibInclude=../zlib PetiteBoot=../boot/$m/petite.boot diff --git a/c/Mf-i3fb b/c/Mf-i3fb index e8e2359e55..48ba32e2ea 100644 --- a/c/Mf-i3fb +++ b/c/Mf-i3fb @@ -18,7 +18,7 @@ Cpu = I386 mdinclude = -I/usr/local/include -I/usr/X11R6/include mdclib = -L/usr/local/lib -liconv -lm -lncurses -C = gcc -Wpointer-arith -Wextra -Werror -O +C = gcc ${CPPFLAGS} -Wpointer-arith -Wextra -Werror -O ${CFLAGS} o = o mdsrc = i3le.c mdobj = i3le.o @@ -35,7 +35,7 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a ld -r -X -o ${Kernel} ${kernelobj} ../zlib/libz.a ${Scheme}: ${Kernel} ${Main} - $C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} + $C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS} ${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a: (cd ../zlib; CFLAGS=-m32 ./configure) diff --git a/c/Mf-i3le b/c/Mf-i3le index 1a53f25047..074160bb73 100644 --- a/c/Mf-i3le +++ b/c/Mf-i3le @@ -17,7 +17,7 @@ m = i3le Cpu = I386 mdclib = -lm -ldl -lncurses -lrt -C = gcc -m32 -msse2 -Wpointer-arith -Wall -Wextra -Werror -O2 -fno-stack-protector +C = gcc ${CPPFLAGS} -m32 -msse2 -Wpointer-arith -Wall -Wextra -Werror -O2 -fno-stack-protector ${CFLAGS} o = o mdsrc = i3le.c mdobj = i3le.o @@ -34,7 +34,7 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a ld -melf_i386 -r -X -o ${Kernel} ${kernelobj} ../zlib/libz.a ${Scheme}: ${Kernel} ${Main} - $C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} + $C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS} ${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a: (cd ../zlib; CFLAGS=-m32 ./configure) diff --git a/c/Mf-i3nb b/c/Mf-i3nb index 2a0ee665d8..29f6359913 100644 --- a/c/Mf-i3nb +++ b/c/Mf-i3nb @@ -18,7 +18,7 @@ Cpu = I386 mdinclude = -I/usr/X11R7/include -I/usr/pkg/include -I/usr/pkg/include/ncurses -I/usr/X11R6/include mdclib = /usr/lib/i18n/libiconv_std.a -lm /usr/pkg/lib/libncurses.a -C = gcc -Wpointer-arith -Wextra -Werror -O +C = gcc ${CPPFLAGS} -Wpointer-arith -Wextra -Werror -O ${CFLAGS} o = o mdsrc = i3le.c mdobj = i3le.o @@ -35,7 +35,7 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a ld -r -X -o ${Kernel} ${kernelobj} ../zlib/libz.a ${Scheme}: ${Kernel} ${Main} - $C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} + $C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS} ${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a: (cd ../zlib; CFLAGS=-m32 ./configure) diff --git a/c/Mf-i3ob b/c/Mf-i3ob index c5ae4102b2..dd353c3621 100644 --- a/c/Mf-i3ob +++ b/c/Mf-i3ob @@ -18,7 +18,7 @@ Cpu = I386 mdinclude = -I/usr/local/include -I/usr/X11R6/include mdclib = -L/usr/local/lib -liconv -lm -lncurses -C = gcc -Wpointer-arith -Werror -O +C = gcc ${CPPFLAGS} -Wpointer-arith -Werror -O ${CFLAGS} o = o mdsrc = i3le.c mdobj = i3le.o @@ -35,7 +35,7 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a ld -r -X -o ${Kernel} ${kernelobj} ../zlib/libz.a ${Scheme}: ${Kernel} ${Main} - $C -rdynamic -Wl,--export-dynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} + $C -rdynamic -Wl,--export-dynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS} ${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a: (cd ../zlib; CFLAGS=-m32 ./configure) diff --git a/c/Mf-i3osx b/c/Mf-i3osx index d492c92b7f..a911752c2b 100644 --- a/c/Mf-i3osx +++ b/c/Mf-i3osx @@ -17,7 +17,7 @@ m = i3osx Cpu = I386 mdclib = -liconv -lm -lncurses -C = gcc -m32 -Wpointer-arith -Wall -Wextra -Werror -O2 -msse2 -I/opt/X11/include/ +C = gcc ${CPPFLAGS} -m32 -Wpointer-arith -Wall -Wextra -Werror -O2 -msse2 -I/opt/X11/include/ ${CFLAGS} o = o mdsrc = i3le.c mdobj = i3le.o @@ -34,7 +34,7 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a ld -r -o ${Kernel} ${kernelobj} ../zlib/libz.a ${Scheme}: ${Kernel} ${Main} - $C -o ${Scheme} ${Kernel} ${Main} ${mdclib} + $C -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS} ${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a: (cd ../zlib; CFLAGS=-m32 ./configure) diff --git a/c/Mf-i3qnx b/c/Mf-i3qnx index 7a67caa5b7..6e371a7b71 100644 --- a/c/Mf-i3qnx +++ b/c/Mf-i3qnx @@ -17,7 +17,7 @@ m = i3qnx Cpu = I386 mdclib = -lm /usr/local/lib/libiconv.so -lsocket -lncurses -C = qcc -m32 -Wpointer-arith -Wextra -Werror -O2 -N2048K +C = qcc ${CPPFLAGS} -m32 -Wpointer-arith -Wextra -Werror -O2 -N2048K ${CFLAGS} o = o mdsrc = i3le.c mdobj = i3le.o @@ -35,7 +35,7 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a ld -mi386nto -r -X -o ${Kernel} ${kernelobj} ../zlib/libz.a ${Scheme}: ${Kernel} ${Main} - $C -Wl,--export-dynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} + $C -Wl,--export-dynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS} ${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a: (cd ../zlib; CFLAGS=-m32 ./configure) diff --git a/c/Mf-i3s2 b/c/Mf-i3s2 index 1d5108145f..60618ae2d9 100644 --- a/c/Mf-i3s2 +++ b/c/Mf-i3s2 @@ -17,7 +17,7 @@ m = i3s2 Cpu = I386 mdclib = -lnsl -ldl -lm -lcurses -lrt -C = gcc -m32 -Wpointer-arith -Wextra -Werror -O +C = gcc ${CFLAGS} -m32 -Wpointer-arith -Wextra -Werror -O ${CPPFLAGS} o = o mdsrc = i3le.c mdobj = i3le.o @@ -34,7 +34,7 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a ld -melf_i386 -r -X -o ${Kernel} ${kernelobj} ../zlib/libz.a ${Scheme}: ${Kernel} ${Main} - $C -o ${Scheme} ${Kernel} ${Main} ${mdclib} + $C -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS} ${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a: (cd ../zlib; CFLAGS=-m32 ./configure) diff --git a/c/Mf-ppc32le b/c/Mf-ppc32le index 18c7a86eac..445b61846e 100644 --- a/c/Mf-ppc32le +++ b/c/Mf-ppc32le @@ -17,7 +17,7 @@ m = ppc32le Cpu = PPC32 mdclib = -lm -ldl -lncurses -lrt -C = gcc -m32 -Wpointer-arith -Wextra -Werror -O2 +C = gcc ${CPPFLAGS} -m32 -Wpointer-arith -Wextra -Werror -O2 ${CFLAGS} o = o mdsrc = ppc32.c mdobj = ppc32.o @@ -34,7 +34,7 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a ld -r -X -o ${Kernel} ${kernelobj} ../zlib/libz.a ${Scheme}: ${Kernel} ${Main} - $C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} + $C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS} ${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a: (cd ../zlib; CFLAGS=-m32 ./configure) diff --git a/c/Mf-ta6fb b/c/Mf-ta6fb index a3f484013c..2577037f5f 100644 --- a/c/Mf-ta6fb +++ b/c/Mf-ta6fb @@ -18,7 +18,7 @@ Cpu = X86_64 mdinclude = -I/usr/local/include -I/usr/X11R6/include mdclib = -L/usr/local/lib -liconv -lm -lncurses -lpthread -C = gcc -Wpointer-arith -Wextra -Werror -O2 -D_REENTRANT -pthread +C = gcc ${CPPFLAGS} -Wpointer-arith -Wextra -Werror -O2 -D_REENTRANT -pthread ${CFLAGS} o = o mdsrc = i3le.c mdobj = i3le.o @@ -35,7 +35,7 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a ld -r -X -o ${Kernel} ${kernelobj} ../zlib/libz.a ${Scheme}: ${Kernel} ${Main} - $C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} + $C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS} ${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a: (cd ../zlib; CFLAGS=-m64 ./configure --64) diff --git a/c/Mf-ta6le b/c/Mf-ta6le index 2329b26e4a..7088e87a22 100644 --- a/c/Mf-ta6le +++ b/c/Mf-ta6le @@ -17,7 +17,7 @@ m = ta6le Cpu = X86_64 mdclib = -lm -ldl -lncurses -lpthread -lrt -C = gcc -m64 -msse2 -Wpointer-arith -Wall -Wextra -Werror -O2 -D_REENTRANT -pthread +C = gcc ${CPPFLAGS} -m64 -msse2 -Wpointer-arith -Wall -Wextra -Werror -O2 -D_REENTRANT -pthread ${CFLAGS} o = o mdsrc = i3le.c mdobj = i3le.o @@ -34,7 +34,7 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a ld -melf_x86_64 -r -X -o ${Kernel} ${kernelobj} ../zlib/libz.a ${Scheme}: ${Kernel} ${Main} - $C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} + $C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS} ${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a: (cd ../zlib; CFLAGS=-m64 ./configure --64) diff --git a/c/Mf-ta6nb b/c/Mf-ta6nb index ff48b4707c..447b0bf7de 100644 --- a/c/Mf-ta6nb +++ b/c/Mf-ta6nb @@ -18,7 +18,7 @@ Cpu = X86_64 mdinclude = -I/usr/X11R7/include -I/usr/pkg/include -I/usr/pkg/include/ncurses -I/usr/X11R6/include mdclib = /usr/lib/i18n/libiconv_std.a -lm /usr/pkg/lib/libncurses.a -lpthread -C = gcc -m64 -Wpointer-arith -Wextra -Werror -O2 -D_REENTRANT -pthread +C = gcc ${CPPFLAGS} -m64 -Wpointer-arith -Wextra -Werror -O2 -D_REENTRANT -pthread ${CFLAGS} o = o mdsrc = i3le.c mdobj = i3le.o @@ -35,7 +35,7 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a ld -r -X -o ${Kernel} ${kernelobj} ../zlib/libz.a ${Scheme}: ${Kernel} ${Main} - $C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} + $C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS} ${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a: (cd ../zlib; CFLAGS=-m64 ./configure --64) diff --git a/c/Mf-ta6ob b/c/Mf-ta6ob index 01f6fce8ab..85ad62d2d0 100644 --- a/c/Mf-ta6ob +++ b/c/Mf-ta6ob @@ -18,7 +18,7 @@ Cpu = X86_64 mdinclude = -I/usr/local/include -I/usr/X11R6/include mdclib = -L/usr/local/lib -liconv -lm -lncurses -lpthread -C = gcc -Wpointer-arith -Werror -O2 -D_REENTRANT -pthread +C = gcc ${CPPFLAGS} -Wpointer-arith -Werror -O2 -D_REENTRANT -pthread ${CFLAGS} o = o mdsrc = i3le.c mdobj = i3le.o @@ -35,7 +35,7 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a ld -r -X -o ${Kernel} ${kernelobj} ../zlib/libz.a ${Scheme}: ${Kernel} ${Main} - $C -rdynamic -Wl,--export-dynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} + $C -rdynamic -Wl,--export-dynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS} ${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a: (cd ../zlib; CFLAGS=-m64 ./configure --64) diff --git a/c/Mf-ta6osx b/c/Mf-ta6osx index 50699fe617..e807275a15 100644 --- a/c/Mf-ta6osx +++ b/c/Mf-ta6osx @@ -17,7 +17,7 @@ m = ta6osx Cpu = X86_64 mdclib = -liconv -lm -lncurses -C = gcc -m64 -Wpointer-arith -Wall -Wextra -Werror -O2 -I/opt/X11/include/ +C = gcc ${CPPFLAGS} -m64 -Wpointer-arith -Wall -Wextra -Werror -O2 -I/opt/X11/include/ ${CFLAGS} o = o mdsrc = i3le.c mdobj = i3le.o @@ -34,7 +34,7 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a ld -r -o ${Kernel} ${kernelobj} ../zlib/libz.a ${Scheme}: ${Kernel} ${Main} - $C -o ${Scheme} ${Kernel} ${Main} ${mdclib} + $C -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS} ${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a: (cd ../zlib; CFLAGS=-m64 ./configure --64) diff --git a/c/Mf-ta6s2 b/c/Mf-ta6s2 index 196f288ba4..e03c65e8c5 100644 --- a/c/Mf-ta6s2 +++ b/c/Mf-ta6s2 @@ -17,7 +17,7 @@ m = ta6s2 Cpu = X86_64 mdclib = -lnsl -ldl -lm -lpthread -lcurses -lrt -C = gcc -m64 -Wpointer-arith -Wextra -Werror -O2 -D_REENTRANT +C = gcc ${CPPFLAGS} -m64 -Wpointer-arith -Wextra -Werror -O2 -D_REENTRANT ${CFLAGS} o = o mdsrc = i3le.c mdobj = i3le.o @@ -34,7 +34,7 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a ld -melf_x86_64 -r -X -o ${Kernel} ${kernelobj} ../zlib/libz.a ${Scheme}: ${Kernel} ${Main} - $C -o ${Scheme} ${Kernel} ${Main} ${mdclib} + $C -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS} ${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a: (cd ../zlib; CFLAGS=-m64 ./configure --64) diff --git a/c/Mf-ti3fb b/c/Mf-ti3fb index ea491d7870..a88e3915ed 100644 --- a/c/Mf-ti3fb +++ b/c/Mf-ti3fb @@ -18,7 +18,7 @@ Cpu = I386 mdinclude = -I/usr/local/include -I/usr/X11R6/include mdclib = -L/usr/local/lib -liconv -lm -lncurses -lpthread -C = gcc -Wpointer-arith -Wextra -Werror -O2 -D_REENTRANT -pthread +C = gcc ${CPPFLAGS} -Wpointer-arith -Wextra -Werror -O2 -D_REENTRANT -pthread ${CFLAGS} o = o mdsrc = i3le.c mdobj = i3le.o @@ -35,7 +35,7 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a ld -r -X -o ${Kernel} ${kernelobj} ../zlib/libz.a ${Scheme}: ${Kernel} ${Main} - $C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} + $C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS} ${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a: (cd ../zlib; CFLAGS=-m32 ./configure) diff --git a/c/Mf-ti3le b/c/Mf-ti3le index 5029e1cf48..51bb6da607 100644 --- a/c/Mf-ti3le +++ b/c/Mf-ti3le @@ -17,7 +17,7 @@ m = ti3le Cpu = I386 mdclib = -lm -ldl -lncurses -lpthread -lrt -C = gcc -m32 -msse2 -Wpointer-arith -Wall -Wextra -Werror -O2 -D_REENTRANT -pthread +C = gcc ${CPPFLAGS} -m32 -msse2 -Wpointer-arith -Wall -Wextra -Werror -O2 -D_REENTRANT -pthread ${CFLAGS} o = o mdsrc = i3le.c mdobj = i3le.o @@ -34,7 +34,7 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a ld -melf_i386 -r -X -o ${Kernel} ${kernelobj} ../zlib/libz.a ${Scheme}: ${Kernel} ${Main} - $C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} + $C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS} ${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a: (cd ../zlib; CFLAGS=-m32 ./configure) diff --git a/c/Mf-ti3nb b/c/Mf-ti3nb index 4968d4ffaa..2f44e007e4 100644 --- a/c/Mf-ti3nb +++ b/c/Mf-ti3nb @@ -18,7 +18,7 @@ Cpu = I386 mdinclude = -I/usr/X11R7/include -I/usr/pkg/include -I/usr/pkg/include/ncurses -I/usr/X11R6/include mdclib = /usr/lib/i18n/libiconv_std.a -lm /usr/pkg/lib/libncurses.a -lpthread -C = gcc -m32 -Wpointer-arith -Wextra -Werror -O2 -D_REENTRANT -pthread +C = gcc ${CPPFLAGS} -m32 -Wpointer-arith -Wextra -Werror -O2 -D_REENTRANT -pthread ${CFLAGS} o = o mdsrc = i3le.c mdobj = i3le.o @@ -35,7 +35,7 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a ld -m elf_i386 -r -X -o ${Kernel} ${kernelobj} ../zlib/libz.a ${Scheme}: ${Kernel} ${Main} - $C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} + $C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS} ${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a: (cd ../zlib; CFLAGS=-m32 ./configure) diff --git a/c/Mf-ti3ob b/c/Mf-ti3ob index a53d614b24..1370c9f295 100644 --- a/c/Mf-ti3ob +++ b/c/Mf-ti3ob @@ -18,7 +18,7 @@ Cpu = I386 mdinclude = -I/usr/local/include -I/usr/X11R6/include mdclib = -L/usr/local/lib -liconv -lm -lncurses -lpthread -C = gcc -Wpointer-arith -Werror -O2 -D_REENTRANT -pthread +C = gcc ${CPPFLAGS} -Wpointer-arith -Werror -O2 -D_REENTRANT -pthread ${CFLAGS} o = o mdsrc = i3le.c mdobj = i3le.o @@ -35,7 +35,7 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a ld -r -X -o ${Kernel} ${kernelobj} ../zlib/libz.a ${Scheme}: ${Kernel} ${Main} - $C -rdynamic -Wl,--export-dynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} + $C -rdynamic -Wl,--export-dynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS} ${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a: (cd ../zlib; CFLAGS=-m32 ./configure) diff --git a/c/Mf-ti3osx b/c/Mf-ti3osx index f62daf403b..eafe3b395f 100644 --- a/c/Mf-ti3osx +++ b/c/Mf-ti3osx @@ -17,7 +17,7 @@ m = ti3osx Cpu = I386 mdclib = -liconv -lm -lncurses -C = gcc -m32 -Wpointer-arith -Wall -Wextra -Werror -O2 -msse2 -I/opt/X11/include/ +C = gcc ${CPPFLAGS} -m32 -Wpointer-arith -Wall -Wextra -Werror -O2 -msse2 -I/opt/X11/include/ ${CFLAGS} o = o mdsrc = i3le.c mdobj = i3le.o @@ -34,7 +34,7 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a ld -r -o ${Kernel} ${kernelobj} ../zlib/libz.a ${Scheme}: ${Kernel} ${Main} - $C -o ${Scheme} ${Kernel} ${Main} ${mdclib} + $C -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS} ${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a: (cd ../zlib; CFLAGS=-m32 ./configure) diff --git a/c/Mf-ti3s2 b/c/Mf-ti3s2 index c2e1dfd0c0..3dd407c509 100644 --- a/c/Mf-ti3s2 +++ b/c/Mf-ti3s2 @@ -17,7 +17,7 @@ m = ti3s2 Cpu = I386 mdclib = -lnsl -ldl -lm -lpthread -lcurses -lrt -C = gcc -m32 -Wpointer-arith -Wextra -Werror -O2 -D_REENTRANT +C = gcc ${CPPFLAGS} -m32 -Wpointer-arith -Wextra -Werror -O2 -D_REENTRANT ${CFLAGS} o = o mdsrc = i3le.c mdobj = i3le.o @@ -34,7 +34,7 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a ld -melf_i386 -r -X -o ${Kernel} ${kernelobj} ../zlib/libz.a ${Scheme}: ${Kernel} ${Main} - $C -o ${Scheme} ${Kernel} ${Main} ${mdclib} + $C -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS} ${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a: (cd ../zlib; CFLAGS=-m32 ./configure) diff --git a/c/Mf-tppc32le b/c/Mf-tppc32le index b290c6a232..a59d50e8e7 100644 --- a/c/Mf-tppc32le +++ b/c/Mf-tppc32le @@ -17,7 +17,7 @@ m = tppc32le Cpu = PPC32 mdclib = -lm -ldl -lncurses -lpthread -lrt -C = gcc -m32 -Wpointer-arith -Wextra -Werror -O2 -D_REENTRANT -pthread +C = gcc ${CPPFLAGS} -m32 -Wpointer-arith -Wextra -Werror -O2 -D_REENTRANT -pthread ${CFLAGS} o = o mdsrc = ppc32le.c mdobj = ppc32le.o @@ -34,7 +34,7 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a ld -r -X -o ${Kernel} ${kernelobj} ../zlib/libz.a ${Scheme}: ${Kernel} ${Main} - $C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} + $C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS} ${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a: (cd ../zlib; CFLAGS=-m32 ./configure) diff --git a/checkin b/checkin index 403398b8ba..3359077246 100755 --- a/checkin +++ b/checkin @@ -122,7 +122,7 @@ end set sfiles = () foreach x ($tmpsfiles) - if ("$x" == "./Makefile" || "$x" == "./Mf-install" || "$x" == "./Mf-boot" || "$x" == "c/config.h") then + if ("$x" == "./Makefile" || "$x" == "./Mf-install" || "$x" == "./Mf-boot" || "$x" == "c/config.h" || "$x" == "c/Mf-config") then set ignorefiles = ($ignorefiles $x) else cmp $W/$x $x >& /dev/null diff --git a/configure b/configure index c801e1d728..dbba509b20 100755 --- a/configure +++ b/configure @@ -37,6 +37,9 @@ installman="" installschemename="scheme" installpetitename="petite" installscriptname="scheme-script" +CPPFLAGS="" +CFLAGS="" +LDFLAGS="" case `uname` in Linux) @@ -178,6 +181,15 @@ while [ $# != 0 ] ; do --help) help=yes ;; + CPPFLAGS=*) + CPPFLAGS=`echo $1 | sed -e 's/^CPPFLAGS=//'` + ;; + CFLAGS=*) + CFLAGS=`echo $1 | sed -e 's/^CFLAGS=//'` + ;; + LDFLAGS=*) + LDFLAGS=`echo $1 | sed -e 's/^LDFLAGS=//'` + ;; *) echo "option '$1' unrecognized or missing an argument; try $0 --help" exit 1 @@ -244,6 +256,9 @@ if [ "$help" = "yes" ]; then echo " --installscriptname= install with group ($installscriptname)" echo " --[no]gzip-man-pages compress manual pages ($gzipmanpages)" echo " --workarea= build directory ($w)" + echo " CPPFLAGS= additional C preprocessor flags ($CPPFLAGS)" + echo " CFLAGS= additional C compiler flags ($CFLAGS)" + echo " LDFLAGS= additional linker flags ($LDFLAGS)" echo "" echo "Available machine types: $machs" echo "" @@ -273,7 +288,21 @@ if [ "$m" = "" -o ! -f boot/$m/scheme.boot ] ; then exit 1 fi -git submodule init && git submodule update || exit 1 +if [ -d '.git' ] ; then + git submodule init && git submodule update || exit 1 +else + if [ ! -f 'nanopass/nanopass.ss' ] ; then + rmdir nanopass && (curl -L -o v1.9.tar.gz https://github.com/nanopass/nanopass-framework-scheme/archive/v1.9.tar.gz && tar -zxf v1.9.tar.gz && mv nanopass-framework-scheme-1.9 nanopass && rm v1.9.tar.gz) || exit 1 + fi + + if [ ! -f 'zlib/configure' ] ; then + rmdir zlib && (curl -L -o v1.2.8.tar.gz https://github.com/madler/zlib/archive/v1.2.8.tar.gz && tar -xzf v1.2.8.tar.gz && mv zlib-1.2.8 zlib && rm v1.2.8.tar.gz) || exit 1 + fi + + if [ ! -f 'stex/Mf-stex' ] ; then + rmdir stex && (curl -L -o v1.2.tar.gz https://github.com/dybvig/stex/archive/v1.2.tar.gz && tar -zxf v1.2.tar.gz && mv stex-1.2 stex && rm v1.2.tar.gz) || exit 1 + fi +fi ./workarea $m $w @@ -305,3 +334,9 @@ cat > $w/c/config.h << END #define SCHEME_SCRIPT "$installscriptname" #define DEFAULT_HEAP_PATH "$installlib/csv%v/%m" END + +cat > $w/c/Mf-config << END +CPPFLAGS=$CPPFLAGS +CFLAGS=$CFLAGS +LDFLAGS=$LDFLAGS +END diff --git a/workarea b/workarea index 0c41424b0b..734625e55d 100755 --- a/workarea +++ b/workarea @@ -116,6 +116,9 @@ workdir $W/c if [ ! -e $W/c/config.h ] ; then touch $W/c/config.h fi +if [ ! -e $W/c/Mf-config ] ; then + touch $W/c/Mf-config +fi workdir $W/s (cd $W/s; workln ../../s/Mf-$M Mf-$M)