avrdude - get libelf, libftdi1 and pthread detected properly

This commit is contained in:
Ed Robbins
2014-01-13 23:18:34 +00:00
parent 60e33cc615
commit d21fe69dce
2 changed files with 45 additions and 1 deletions

View File

@@ -20,6 +20,7 @@ if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
ARCHITECTURES="$ARCHITECTURES x86_gcc2"
fi
SECONDARY_ARCHITECTURES="x86"
PATCHES="avrdude-6.0.1.patch"
GLOBAL_WRITABLE_FILES="
settings/avrdude.conf keep-old
@@ -33,9 +34,13 @@ PROVIDES="
REQUIRES="
haiku$secondaryArchSuffix >= $haikuVersion
lib:libusb_1.0$secondaryArchSuffix
lib:libftdi1$secondaryArchSuffix
lib:libelf$secondaryArchSuffix
"
BUILD_REQUIRES="
devel:libusb_1.0$secondaryArchSuffix
devel:libftdi1$secondaryArchSuffix
devel:libelf$secondaryArchSuffix
"
BUILD_PREREQUIRES="
haiku${secondaryArchSuffix}_devel >= $haikuVersion
@@ -46,12 +51,14 @@ BUILD_PREREQUIRES="
cmd:make
cmd:yacc
cmd:flex
cmd:pkg_config$secondaryArchSuffix
cmd:pkg_config
"
BUILD()
{
export PKG_CONFIG_LIBDIR=/system/develop/lib/x86/pkgconfig/
aclocal
autoconf
automake
runConfigure ./configure
make $jobArgs

View File

@@ -0,0 +1,37 @@
diff -Naur avrdude-6.0.1/configure.ac avrdude-6.0.1-haiku/configure.ac
--- avrdude-6.0.1/configure.ac 2013-09-18 06:19:42.038010880 +0000
+++ avrdude-6.0.1-haiku/configure.ac 2014-01-13 23:01:38.477102080 +0000
@@ -96,6 +96,7 @@
AC_SEARCH_LIBS([gethostent], [nsl])
AC_SEARCH_LIBS([setsockopt], [socket])
+AC_SEARCH_LIBS(socket, socket network)
AH_TEMPLATE([HAVE_LIBUSB],
[Define if USB support is enabled via libusb])
AC_CHECK_LIB([usb], [usb_get_string_simple], [have_libusb=yes])
@@ -176,11 +177,8 @@
fi
AC_CHECK_HEADERS([pthread.h])
# as there exits header file only pthread implementations for Windows, check if we have a library
-AC_CHECK_LIB([pthread], [pthread_create], [have_pthread=yes])
-if test x$have_pthread = xyes; then
- LIBPTHREAD="-lpthread"
-fi
-AC_SUBST(LIBPTHREAD, $LIBPTHREAD)
+AC_SEARCH_LIBS([pthread_create], [pthread], [have_pthread=yes])
+
# Checks for header files.
AC_CHECK_HEADERS([limits.h stdlib.h string.h])
AC_CHECK_HEADERS([fcntl.h sys/ioctl.h sys/time.h termios.h unistd.h])
diff -Naur avrdude-6.0.1/Makefile.am avrdude-6.0.1-haiku/Makefile.am
--- avrdude-6.0.1/Makefile.am 2013-09-18 05:59:07.037224448 +0000
+++ avrdude-6.0.1-haiku/Makefile.am 2014-01-13 21:50:05.837550080 +0000
@@ -63,7 +63,7 @@
libavrdude_a_CFLAGS = @ENABLE_WARNINGS@
-avrdude_LDADD = $(top_builddir)/$(noinst_LIBRARIES) @LIBUSB_1_0@ @LIBUSB@ @LIBFTDI1@ @LIBFTDI@ @LIBHID@ @LIBELF@ @LIBPTHREAD@ -lm
+avrdude_LDADD = $(top_builddir)/$(noinst_LIBRARIES) @LIBUSB_1_0@ @LIBUSB@ @LIBFTDI1@ @LIBFTDI@ @LIBHID@ @LIBELF@
bin_PROGRAMS = avrdude