Messages in this thread Patch in this message | | | From | (david parsons) | Subject | [PATCH] 2314 tweaks to help make ``make menuconfig'' work on Mastodon | Date | 19 Aug 1999 16:21:05 -0700 |
| |
This patch helps make 2.3.14 build on a Mastodon (BSD tools) system, plus it yanks the explicit search for libncurses, but instead has the compiler bitch if -lncurses isn't there.
The three changes are:
a) Berkeley find doesn't support the -regex option, so I rewrote that part of ``make clean'' to do find | grep | xargs. b) GNU awk does token pasting in function arguments, BSD awk doesn't; so I changed Menuconfig to build the submenu before passing it to a function. c) On my development machine (libc4 for system stuff, libc5 for the kernel, gl*bc for the killer app [Civilization]), libncurses doesn't live where the lxdialog expects it to be, but cc can find it without any problem.
____ david parsons \bi/ it would be nice to have this in the baseline. \/
diff -Naur linux-2.3.14-orig/Makefile linux-2.3.14/Makefile --- linux-2.3.14-orig/Makefile Wed Aug 18 09:45:10 1999 +++ linux-2.3.14/Makefile Thu Aug 19 00:30:24 1999 @@ -356,7 +356,7 @@ clean: archclean rm -f kernel/ksyms.lst include/linux/compile.h - rm -f core `find . -name '*.[oas]' ! -regex '.*lxdialog/.*' -print` + find . -name '*.[oas]' -print | grep -v lxdialog/ | xargs rm -f rm -f core `find . -type f -name 'core' -print` rm -f core `find . -name '.*.flags' -print` rm -f vmlinux System.map diff -Naur linux-2.3.14-orig/scripts/Menuconfig linux-2.3.14/scripts/Menuconfig --- linux-2.3.14-orig/scripts/Menuconfig Sun May 2 09:51:16 1999 +++ linux-2.3.14/scripts/Menuconfig Thu Aug 19 00:30:24 1999 @@ -633,12 +633,13 @@ printf("submenu %s MCmenu%s\n", $0, menu_no) >>menu + newmenu = sprintf("MCmenu%d", menu_no); printf( "function MCmenu%s () {\n"\ "default=$1\n"\ "menu_name %s\n",\ - menu_no, $0) >"MCmenu"menu_no + menu_no, $0) >newmenu - parser(ifile, "MCmenu"menu_no) + parser(ifile, newmenu) } else if ($1 ~ "endmenu") { printf("}\n") >>menu diff -Naur linux-2.3.14-orig/scripts/lxdialog/Makefile linux-2.3.14/scripts/lxdialog/Makefile --- linux-2.3.14-orig/scripts/lxdialog/Makefile Mon Jul 20 10:05:16 1998 +++ linux-2.3.14/scripts/lxdialog/Makefile Thu Aug 19 00:30:24 1999 @@ -25,21 +25,9 @@ SRCS = $(OBJS:.o=.c) -all: ncurses lxdialog +all: lxdialog lxdialog: $(OBJS) - -ncurses: - @x=`find /lib/ /usr/lib/ /usr/local/lib/ -maxdepth 1 -name 'libncurses.*'` ;\ - if [ ! "$$x" ]; then \ - echo -e "\007" ;\ - echo ">> Unable to find the Ncurses libraries." ;\ - echo ">>" ;\ - echo ">> You must have Ncurses installed in order" ;\ - echo ">> to use 'make menuconfig'" ;\ - echo ;\ - exit 1 ;\ - fi clean: rm -f core *.o *~ lxdialog - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.rutgers.edu Please read the FAQ at http://www.tux.org/lkml/
| |