[102719] trunk/dports/cross/openocd

[raimue at macports.org]

Revision: 102719
          https://trac.macports.org/changeset/102719
Author:   raimue at macports.org
Date:     2013-02-07 09:56:54 -0800 (Thu, 07 Feb 2013)
Log Message:
-----------
cross/openocd:
Fix build error for +ft2232_ftd2xx,
the search location for libftdi was wrong

Modified Paths:
--------------
    trunk/dports/cross/openocd/Portfile

Added Paths:
-----------
    trunk/dports/cross/openocd/files/patch-ftd2xx-path.diff

Modified: trunk/dports/cross/openocd/Portfile
===================================================================
--- trunk/dports/cross/openocd/Portfile	2013-02-07 17:54:37 UTC (rev 102718)
+++ trunk/dports/cross/openocd/Portfile	2013-02-07 17:56:54 UTC (rev 102719)
@@ -46,6 +46,7 @@
 }
 
 variant ft2232_ftd2xx conflicts ft2232  description {Enable building support for FT2232 based devices using the FTD2XX driver from ftdichip.com} {
+    patchfiles-append patch-ftd2xx-path.diff
     configure.args-append --enable-ft2232_ftd2xx
 	depends_lib-append port:libftd2xx
 }

Added: trunk/dports/cross/openocd/files/patch-ftd2xx-path.diff
===================================================================
--- trunk/dports/cross/openocd/files/patch-ftd2xx-path.diff	                        (rev 0)
+++ trunk/dports/cross/openocd/files/patch-ftd2xx-path.diff	2013-02-07 17:56:54 UTC (rev 102719)
@@ -0,0 +1,46 @@
+--- configure.ac.orig	2013-02-07 17:24:02.000000000 +0100
++++ configure.ac	2013-02-07 17:26:53.000000000 +0100
+@@ -879,14 +879,14 @@
+ if test $build_ft2232_ftd2xx = yes -o $build_presto_ftd2xx = yes ; then
+    AC_MSG_CHECKING([for libftd2xx.a (darwin)])
+ 
+-   if test ! -f /usr/local/include/ftd2xx.h ; then
+-      AC_MSG_ERROR([ftd2xx library from FTDICHIP.com seems to be missing, cannot find: /usr/local/include/ftd2xx.h])
++   if test ! -f $prefix/include/ftd2xx.h ; then
++      AC_MSG_ERROR([ftd2xx library from FTDICHIP.com seems to be missing, cannot find: $prefix/include/ftd2xx.h])
+    fi
+ 
+-   CFLAGS="$CFLAGS -I/usr/local/include"
+-   LDFLAGS="$LDFLAGS -L/usr/local/lib"
++   CFLAGS="$CFLAGS -I$prefix/include"
++   LDFLAGS="$LDFLAGS -L$prefix/lib"
+    LIBS="$LIBS -lftd2xx"
+-   AC_MSG_RESULT([-L/usr/local/lib -lftd2xx])
++   AC_MSG_RESULT([-L$prefix/lib -lftd2xx])
+ fi
+ fi # darwin
+ 
+--- configure.orig	2013-02-07 17:29:21.000000000 +0100
++++ configure	2013-02-07 17:29:40.000000000 +0100
+@@ -14186,15 +14186,15 @@
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libftd2xx.a (darwin)" >&5
+ $as_echo_n "checking for libftd2xx.a (darwin)... " >&6; }
+ 
+-   if test ! -f /usr/local/include/ftd2xx.h ; then
+-      as_fn_error $? "ftd2xx library from FTDICHIP.com seems to be missing, cannot find: /usr/local/include/ftd2xx.h" "$LINENO" 5
++   if test ! -f $prefix/include/ftd2xx.h ; then
++      as_fn_error $? "ftd2xx library from FTDICHIP.com seems to be missing, cannot find: $prefix/include/ftd2xx.h" "$LINENO" 5
+    fi
+ 
+-   CFLAGS="$CFLAGS -I/usr/local/include"
+-   LDFLAGS="$LDFLAGS -L/usr/local/lib"
++   CFLAGS="$CFLAGS -I$prefix/include"
++   LDFLAGS="$LDFLAGS -L$prefix/lib"
+    LIBS="$LIBS -lftd2xx"
+-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: -L/usr/local/lib -lftd2xx" >&5
+-$as_echo "-L/usr/local/lib -lftd2xx" >&6; }
++   { $as_echo "$as_me:${as_lineno-$LINENO}: result: -L$prefix/lib -lftd2xx" >&5
++$as_echo "-L$prefix/lib -lftd2xx" >&6; }
+ fi
+ fi # darwin
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130207/8808ebc5/attachment.html>