From f2c00658a7a147a73028b019ee45f650e5c224a6 Mon Sep 17 00:00:00 2001 From: Joerg Wunsch Date: Sun, 17 Jan 2010 16:58:06 +0000 Subject: [PATCH] Fix build for GNU/kFreeBSD, fix FreeBSD default serial port name. git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk@925 81a1dc3b-b13d-400b-aceb-764788c761c2 --- avrdude/ChangeLog | 8 ++++++++ avrdude/configure.ac | 4 ++-- avrdude/par.c | 2 +- avrdude/ppi.c | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/avrdude/ChangeLog b/avrdude/ChangeLog index f6c05e03..1b3cf377 100644 --- a/avrdude/ChangeLog +++ b/avrdude/ChangeLog @@ -1,3 +1,11 @@ +2010-01-15 Joerg Wunsch + + Submitted by Aurelien Jarno: + * configure.ac: Fix build for GNU/kFreeBSD, fix FreeBSD + default serial port name. + * ppi.c: Fix build for GNU/kFreeBSD. + * par.c: (Dito.) + 2010-01-15 Joerg Wunsch * configure.ac: Bump version for post-5.8. diff --git a/avrdude/configure.ac b/avrdude/configure.ac index 821e26ea..2aa36a40 100644 --- a/avrdude/configure.ac +++ b/avrdude/configure.ac @@ -196,11 +196,11 @@ case $target in DEFAULT_PAR_PORT="unknown" DEFAULT_SER_PORT="/dev/ttyS0" ;; - i[[3456]]86-*-freebsd*|amd64-*-freebsd*) + i[[3456]]86-*-*freebsd*|amd64-*-*freebsd*) DEFAULT_PAR_PORT="/dev/ppi0" DEFAULT_SER_PORT="/dev/cuaa0" ;; - *-*-freebsd*) + *-*-*freebsd*) DEFAULT_PAR_PORT="unknown" DEFAULT_SER_PORT="/dev/cuaa0" ;; diff --git a/avrdude/par.c b/avrdude/par.c index 6b8bca46..5a42174d 100644 --- a/avrdude/par.c +++ b/avrdude/par.c @@ -28,7 +28,7 @@ #include #include -#if defined(__FreeBSD__) +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) # include "freebsd_ppi.h" #elif defined(__linux__) # include "linux_ppdev.h" diff --git a/avrdude/ppi.c b/avrdude/ppi.c index 4397d000..423d5923 100644 --- a/avrdude/ppi.c +++ b/avrdude/ppi.c @@ -33,7 +33,7 @@ #include #include -#if defined(__FreeBSD__) +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) # include "freebsd_ppi.h" #elif defined(__linux__) # include "linux_ppdev.h"