Tool offset patch

cnc@ubuntu:~$ git clone git://git.linuxcnc.org/git/linuxcnc.git linuxcnc-dev The program 'git' is currently not installed. You can install it by typing: sudo apt-get install git-core cnc@ubuntu:~$ sudo apt-get install git-core [sudo] password for cnc: Reading package lists... Done Building dependency tree Reading state information... Done The following packages were automatically installed and are no longer required: user-setup localechooser-data Use 'apt-get autoremove' to remove them. The following extra packages will be installed: libdigest-sha1-perl liberror-perl Suggested packages: git-doc git-arch git-cvs git-svn git-email git-daemon-run git-gui gitk gitweb The following NEW packages will be installed: git-core libdigest-sha1-perl liberror-perl 0 upgraded, 3 newly installed, 0 to remove and 178 not upgraded. Need to get 5,688kB of archives. After this operation, 11.9MB of additional disk space will be used. Do you want to continue [Y/n]? y Get:1 http://us.archive.ubuntu.com/ubuntu/ lucid/main liberror-perl 0.17-1 [23.8kB] Get:2 http://us.archive.ubuntu.com/ubuntu/ lucid/main libdigest-sha1-perl 2.12-1build1 [26.2kB] Get:3 http://us.archive.ubuntu.com/ubuntu/ lucid-updates/main git-core 1:1.7.0.4-1ubuntu0.2 [5,638kB] Fetched 5,688kB in 19s (294kB/s) Selecting previously deselected package liberror-perl. (Reading database ... 133788 files and directories currently installed.) Unpacking liberror-perl (from .../liberror-perl_0.17-1_all.deb) ... Selecting previously deselected package libdigest-sha1-perl. Unpacking libdigest-sha1-perl (from .../libdigest-sha1-perl_2.12-1build1_i386.deb) ... Selecting previously deselected package git-core. Unpacking git-core (from .../git-core_1%3a1.7.0.4-1ubuntu0.2_i386.deb) ... Processing triggers for man-db ... Setting up liberror-perl (0.17-1) ... Setting up libdigest-sha1-perl (2.12-1build1) ... Setting up git-core (1:1.7.0.4-1ubuntu0.2) ... cnc@ubuntu:~$ git clone git://git.linuxcnc.org/git/linuxcnc.git linuxcnc-dev Initialized empty Git repository in /home/cnc/linuxcnc-dev/.git/ remote: Counting objects: 122925, done. remote: Compressing objects: 100% (28550/28550), done. remote: Total 122925 (delta 97145), reused 118704 (delta 93272) Receiving objects: 100% (122925/122925), 63.39 MiB | 197 KiB/s, done. Resolving deltas: 100% (97145/97145), done. cnc@ubuntu:~$ cd linuxcnc-dev cnc@ubuntu:~/linuxcnc-dev$ ls app-defaults docs linuxcnc-wizard.gif share bin include linuxcnc.xcf src configs lathe_style_tool_change2.patch nc_files tcl COPYING lib README tests debian linuxcnc.gif rtlib TODO directory.map linuxcncicon.png scripts VERSION cnc@ubuntu:~/linuxcnc-dev$ git am --signoff lathe_style_tool_change2.patch Applying: lathe_style_toolchange /home/cnc/linuxcnc-dev/.git/rebase-apply/patch:41: trailing whitespace. CHP((find_tool_pocket(settings, geo_offset_register, &pocket_number))); /home/cnc/linuxcnc-dev/.git/rebase-apply/patch:45: trailing whitespace. CHP((find_tool_pocket(settings, wear_offset_register, &pocket_number))); /home/cnc/linuxcnc-dev/.git/rebase-apply/patch:50: trailing whitespace. } /home/cnc/linuxcnc-dev/.git/rebase-apply/patch:74: trailing whitespace. } warning: 4 lines add whitespace errors. cnc@ubuntu:~/linuxcnc-dev$ cd src cnc@ubuntu:~/linuxcnc-dev/src$ make clean Makefile:55: Makefile.inc: No such file or directory Makefile:66: *** Makefile.inc must specify RTPREFIX and other variables. Stop. cnc@ubuntu:~/linuxcnc-dev/src$

cnc@ubuntu:~/linuxcnc-dev/src$ ./autogen.sh cnc@ubuntu:~/linuxcnc-dev/src$ ./configure --enable-run-in-place checking libgl1-mesa-dri workaround... required - need to preload /usr/lib/libstdc++.so.6 checking build toplevel... /home/cnc/linuxcnc-dev checking installation prefix... run in place checking for grep... /bin/grep checking for egrep... /bin/egrep checking for RT dir... Using /usr/realtime-2.6.32-122-rtai/bin/rtai-config as the RT signature checking for location of kernel headers... using value from RTS: /usr/src/linux-headers-2.6.32-122-rtai checking for cc version... found gcc in rtai-config checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking how to run the C preprocessor... gcc -E checking for usability of rdtscll from asm/msr.h... no checking for usability of linux/hidraw.h... yes checking for libmodbus3... no checking for libmodbus2... no checking for grep that handles long lines and -e... (cached) /bin/grep checking for egrep... (cached) /bin/egrep checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking /usr/src/linux-headers-2.6.32-122-rtai/include/linux/version.h usability... yes checking /usr/src/linux-headers-2.6.32-122-rtai/include/linux/version.h presence... yes checking for /usr/src/linux-headers-2.6.32-122-rtai/include/linux/version.h... yes checking for kernel version string... 2.6.32-122-rtai checking for kernel module extension... .ko checking kernel build system... kbuild checking for module installation directory... configuring for run-in-place /home/cnc/linuxcnc-dev/rtlib configure: WARNING: --enable-run-in-place will be removed soon. Configure without specifying --prefix to get a run-in-place build. checking for glib... yes - 2.24.1 checking for GTK 2.4.0 or above... yes - 2.20.1 checking for libgnomeprintui-2.2... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking whether make sets $(MAKE)... yes checking for ranlib... ranlib checking for ar... /usr/bin/ar checking for install... /usr/bin/install checking for sed... /bin/sed checking for ps... /bin/ps checking for kill... /bin/kill checking for whoami... /usr/bin/whoami checking for awk... /usr/bin/awk checking for insmod... /sbin/insmod checking for rmmod... /sbin/rmmod checking for lsmod... /sbin/lsmod checking for pidof... /bin/pidof checking for ipcs... /usr/bin/ipcs checking for fuser... /bin/fuser checking for mandb... /usr/bin/mandb checking for python... /usr/bin/python checking whether to build documentation... no checking for kernel math support... ok, using RTAI's libm kernel module checking for adeos... not found checking for rtai_hal... /usr/realtime-2.6.32-122-rtai/modules/rtai_hal.ko checking for rtai_ksched... /usr/realtime-2.6.32-122-rtai/modules/rtai_ksched.ko checking for rtai_fifos... /usr/realtime-2.6.32-122-rtai/modules/rtai_fifos.ko checking for rtai_shm... not found checking for rtai_sem... /usr/realtime-2.6.32-122-rtai/modules/rtai_sem.ko checking for rtai_math... /usr/realtime-2.6.32-122-rtai/modules/rtai_math.ko checking for rtai... not found checking for rt_mem_mgr... not found checking for rtai_sched... /usr/realtime-2.6.32-122-rtai/modules/rtai_sched.ko checking for rtai_libm... not found checking for rtl... not found checking for mbuff... not found checking for rtl_time... not found checking for rtl_sched... not found checking for rtl_posixio... not found checking for rtl_fifo... not found checking for ANSI C header files... (cached) yes checking for sys/wait.h that is POSIX.1 compatible... yes checking for semtimedop... yes checking for sincos function... yes checking for __sincos... no checking for tcl... /usr/lib/tcl8.5/tclConfig.sh found checking for tk... /usr/lib/tk8.5/tkConfig.sh found checking for BWidget using /usr/bin/tclsh8.5... found checking for BLT using tclsh8.5... found checking for X... libraries , headers checking for gethostbyname... yes checking for connect... yes checking for remove... yes checking for shmat... yes checking for IceConnectionNumber in -lICE... yes checking X11/extensions/Xinerama.h usability... yes checking X11/extensions/Xinerama.h presence... yes checking for X11/extensions/Xinerama.h... yes checking for XineramaQueryExtension in -lXinerama... yes checking for X11/Xaw/XawInit.h... yes checking for XawDialogGetValueString in -lXaw... yes checking readline/readline.h usability... yes checking readline/readline.h presence... yes checking for readline/readline.h... yes checking readline/history.h usability... yes checking readline/history.h presence... yes checking for readline/history.h... yes Trying readline without -ltermcap checking for readline in -lreadline... yes Trying readline with -ltermcap checking for readline in -lreadline... yes Readline does not require -ltermcap checking ncurses.h usability... yes checking ncurses.h presence... yes checking for ncurses.h... yes checking for initscr in -lncurses... yes checking locale.h usability... yes checking locale.h presence... yes checking for locale.h... yes checking for setlocale... yes checking libintl.h usability... yes checking libintl.h presence... yes checking for libintl.h... yes checking for gettext in -lintl... no checking for xgettext... /usr/bin/xgettext checking for xgettext tcl bug... xgettext version 0.17 OK checking for msgfmt... /usr/bin/msgfmt checking for --tcl support in msgfmt... yes checking for Python support... yes checking python version... OK checking version of python libraries... python2.6 checking match between tk and Tkinter versions... 8.5 checking location of Python header files... /usr/include/python2.6 checking for Python headers... -I/usr/include/python2.6 checking for Python libraries... -lpthread -ldl -lutil checking whether the Boost::Python headers are available... no configure: error: boost::python is required to build LinuxCNC cnc@ubuntu:~/linuxcnc-dev/src$ make Makefile:55: Makefile.inc: No such file or directory Makefile:66: *** Makefile.inc must specify RTPREFIX and other variables. Stop. cnc@ubuntu:~/linuxcnc-dev/src$ ls autogen.sh configure libnml module_helper tests autom4te.cache configure.in Makefile move-if-change CodingStyle doxconfig Makefile.inc.in po config.h.in emc Makefile.modinc.in rtapi config.log hal modsilent.py Submakefile.skel cnc@ubuntu:~/linuxcnc-dev/src$