[63424] trunk/dports/science/usrp
michaelld at macports.org
michaelld at macports.org
Thu Feb 4 12:10:01 PST 2010
Revision: 63424
http://trac.macports.org/changeset/63424
Author: michaelld at macports.org
Date: 2010-02-04 12:10:00 -0800 (Thu, 04 Feb 2010)
Log Message:
-----------
new usrp patches
Added Paths:
-----------
trunk/dports/science/usrp/files/
trunk/dports/science/usrp/files/patch-configure.diff
trunk/dports/science/usrp/files/patch-usrp_host_apps_Makefile.in.diff
trunk/dports/science/usrp/files/patch-usrp_host_lib_legacy_Makefile.in.diff
trunk/dports/science/usrp/files/patch-usrp_usrp.pc.in.diff
Added: trunk/dports/science/usrp/files/patch-configure.diff
===================================================================
--- trunk/dports/science/usrp/files/patch-configure.diff (rev 0)
+++ trunk/dports/science/usrp/files/patch-configure.diff 2010-02-04 20:10:00 UTC (rev 63424)
@@ -0,0 +1,829 @@
+--- configure 2009-07-14 18:56:02.000000000 -0400
++++ /Users/mlk/Desktop/configure_3.2.2 2009-10-26 15:30:14.000000000 -0400
+@@ -35894,9 +35894,195 @@
+ fi
+ done
+
++ req_libusb1=no
++ libusbok=no
++ have_libusb1=no
++ if test x$req_libusb1 = xyes; then
+
+
+- libusbok=yes
++
++pkg_failed=no
++{ $as_echo "$as_me:$LINENO: checking for USB" >&5
++$as_echo_n "checking for USB... " >&6; }
++
++if test -n "$PKG_CONFIG"; then
++ if test -n "$USB_CFLAGS"; then
++ pkg_cv_USB_CFLAGS="$USB_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libusb-1.0\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libusb-1.0") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_USB_CFLAGS=`$PKG_CONFIG --cflags "libusb-1.0" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ fi
++else
++ pkg_failed=untried
++fi
++
++if test x$cross_compiling = xyes
++then
++ if test -n "$PKG_CONFIG"; then
++ if test -n "$USB_LIBS"; then
++ pkg_cv_USB_LIBS="$USB_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libusb-1.0\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libusb-1.0") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_USB_LIBS=`$PKG_CONFIG --libs --static "libusb-1.0" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ fi
++else
++ pkg_failed=untried
++fi
++ _pkg_tmp=
++ for flag in $pkg_cv_USB_LIBS; do
++ case $flag in
++ (-L/lib* | -L/usr/lib* ) ;; # ignore
++ (*) _pkg_tmp="$_pkg_tmp $flag" ;;
++ esac
++ done
++ pkg_cv_USB_LIBS="$_pkg_tmp"
++else
++ if test -n "$PKG_CONFIG"; then
++ if test -n "$USB_LIBS"; then
++ pkg_cv_USB_LIBS="$USB_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libusb-1.0\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libusb-1.0") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_USB_LIBS=`$PKG_CONFIG --libs --static "libusb-1.0" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ fi
++else
++ pkg_failed=untried
++fi
++fi
++
++if test -n "$PKG_CONFIG"; then
++ if test -n "$USB_INCLUDEDIR"; then
++ pkg_cv_USB_INCLUDEDIR="$USB_INCLUDEDIR"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libusb-1.0\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libusb-1.0") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_USB_INCLUDEDIR=`$PKG_CONFIG --variable=includedir "libusb-1.0" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ fi
++else
++ pkg_failed=untried
++fi
++
++
++
++
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ USB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libusb-1.0"`
++ else
++ USB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libusb-1.0"`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$USB_PKG_ERRORS" >&5
++
++ { { $as_echo "$as_me:$LINENO: error: Package requirements (libusb-1.0) were not met:
++
++$USB_PKG_ERRORS
++
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
++
++Alternatively, you may set the environment variables USB_CFLAGS
++and USB_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++" >&5
++$as_echo "$as_me: error: Package requirements (libusb-1.0) were not met:
++
++$USB_PKG_ERRORS
++
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
++
++Alternatively, you may set the environment variables USB_CFLAGS
++and USB_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++" >&2;}
++ { (exit 1); exit 1; }; }
++elif test $pkg_failed = untried; then
++ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
++
++Alternatively, you may set the environment variables USB_CFLAGS
++and USB_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details." >&5
++$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
++
++Alternatively, you may set the environment variables USB_CFLAGS
++and USB_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details." >&2;}
++ { (exit 1); exit 1; }; }; }
++else
++ USB_CFLAGS=$pkg_cv_USB_CFLAGS
++ USB_LIBS=$pkg_cv_USB_LIBS
++ USB_INCLUDEDIR=$pkg_cv_USB_INCLUDEDIR
++
++ USB_CPPFLAGS=""
++ for flag in $USB_CFLAGS; do
++ case $flag in
++ -I* | -D* | -U*) USB_CPPFLAGS="$USB_CPPFLAGS $flag" ;;
++ esac
++ done
++ pkg_cv_USB_CPPFLAGS=$USB_CPPFLAGS
++
++
++ { $as_echo "$as_me:$LINENO: result: yes" >&5
++$as_echo "yes" >&6; }
++
++ libusbok=yes
++ have_libusb1=yes
++ usb_header='libusb-1.0/libusb.h'
++ usb_lib_func='libusb_bulk_transfer'
++ usb_lib_name='usb-1.0'
++
++fi
++ else
++
+
+
+
+@@ -36011,283 +36197,187 @@
+
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
++ libusbok=no
++elif test $pkg_failed = untried; then
++ libusbok=no
++else
++ USB_CFLAGS=$pkg_cv_USB_CFLAGS
++ USB_LIBS=$pkg_cv_USB_LIBS
++ USB_INCLUDEDIR=$pkg_cv_USB_INCLUDEDIR
+
+- ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
++ USB_CPPFLAGS=""
++ for flag in $USB_CFLAGS; do
++ case $flag in
++ -I* | -D* | -U*) USB_CPPFLAGS="$USB_CPPFLAGS $flag" ;;
++ esac
++ done
++ pkg_cv_USB_CPPFLAGS=$USB_CPPFLAGS
+
+
++ { $as_echo "$as_me:$LINENO: result: yes" >&5
++$as_echo "yes" >&6; }
++ libusbok=yes
++fi
++ if test $libusbok = no; then
+
+-for ac_header in usb.h
+-do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
++
++
++pkg_failed=no
++{ $as_echo "$as_me:$LINENO: checking for USB" >&5
++$as_echo_n "checking for USB... " >&6; }
++
++if test -n "$PKG_CONFIG"; then
++ if test -n "$USB_CFLAGS"; then
++ pkg_cv_USB_CFLAGS="$USB_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libusb-legacy\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libusb-legacy") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_USB_CFLAGS=`$PKG_CONFIG --cflags "libusb-legacy" 2>/dev/null`
++else
++ pkg_failed=yes
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ fi
+ else
+- # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
++ pkg_failed=untried
++fi
++
++if test x$cross_compiling = xyes
++then
++ if test -n "$PKG_CONFIG"; then
++ if test -n "$USB_LIBS"; then
++ pkg_cv_USB_LIBS="$USB_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libusb-legacy\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libusb-legacy") 2>&5
+ ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- ac_header_compiler=yes
++ (exit $ac_status); }; then
++ pkg_cv_USB_LIBS=`$PKG_CONFIG --libs --static "libusb-legacy" 2>/dev/null`
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_header_compiler=no
++ pkg_failed=yes
+ fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
+-
+-# Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <$ac_header>
+-_ACEOF
+-if { (ac_try="$ac_cpp conftest.$ac_ext"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
++ fi
++else
++ pkg_failed=untried
++fi
++ _pkg_tmp=
++ for flag in $pkg_cv_USB_LIBS; do
++ case $flag in
++ (-L/lib* | -L/usr/lib* ) ;; # ignore
++ (*) _pkg_tmp="$_pkg_tmp $flag" ;;
++ esac
++ done
++ pkg_cv_USB_LIBS="$_pkg_tmp"
++else
++ if test -n "$PKG_CONFIG"; then
++ if test -n "$USB_LIBS"; then
++ pkg_cv_USB_LIBS="$USB_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libusb-legacy\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libusb-legacy") 2>&5
+ ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null && {
+- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- }; then
+- ac_header_preproc=yes
++ (exit $ac_status); }; then
++ pkg_cv_USB_LIBS=`$PKG_CONFIG --libs --static "libusb-legacy" 2>/dev/null`
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_header_preproc=no
++ pkg_failed=yes
+ fi
+-
+-rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
+-
+-# So? What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+- yes:no: )
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+- ac_header_preproc=yes
+- ;;
+- no:yes:* )
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+-
+- ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
++ fi
+ else
+- eval "$as_ac_Header=\$ac_header_preproc"
++ pkg_failed=untried
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
+
++if test -n "$PKG_CONFIG"; then
++ if test -n "$USB_INCLUDEDIR"; then
++ pkg_cv_USB_INCLUDEDIR="$USB_INCLUDEDIR"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libusb-legacy\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libusb-legacy") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_USB_INCLUDEDIR=`$PKG_CONFIG --variable=includedir "libusb-legacy" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ fi
+ else
+- libusbok=no; { $as_echo "$as_me:$LINENO: result: USRP requires libusb. usb.h not found. See http://libusb.sf.net" >&5
+-$as_echo "USRP requires libusb. usb.h not found. See http://libusb.sf.net" >&6; }
++ pkg_failed=untried
+ fi
+
+-done
+
+
+- save_LIBS="$LIBS"
+- case "$host_os" in
+- darwin*)
+- LIBS="$LIBS -lIOKit"
+- ;;
+- *) ;;
+- esac
+
+- { $as_echo "$as_me:$LINENO: checking for library containing usb_bulk_write" >&5
+-$as_echo_n "checking for library containing usb_bulk_write... " >&6; }
+-if test "${ac_cv_search_usb_bulk_write+set}" = set; then
+- $as_echo_n "(cached) " >&6
+-else
+- ac_func_search_save_LIBS=$LIBS
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
++if test $pkg_failed = yes; then
+
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char usb_bulk_write ();
+-int
+-main ()
+-{
+-return usb_bulk_write ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-for ac_lib in '' usb; do
+- if test -z "$ac_lib"; then
+- ac_res="none required"
+- else
+- ac_res=-l$ac_lib
+- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+- fi
+- rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- ac_cv_search_usb_bulk_write=$ac_res
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
++ _pkg_short_errors_supported=no
+ fi
++ if test $_pkg_short_errors_supported = yes; then
++ USB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libusb-legacy"`
++ else
++ USB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libusb-legacy"`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$USB_PKG_ERRORS" >&5
+
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext
+- if test "${ac_cv_search_usb_bulk_write+set}" = set; then
+- break
+-fi
+-done
+-if test "${ac_cv_search_usb_bulk_write+set}" = set; then
+- :
+-else
+- ac_cv_search_usb_bulk_write=no
+-fi
+-rm conftest.$ac_ext
+-LIBS=$ac_func_search_save_LIBS
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_usb_bulk_write" >&5
+-$as_echo "$ac_cv_search_usb_bulk_write" >&6; }
+-ac_res=$ac_cv_search_usb_bulk_write
+-if test "$ac_res" != no; then
+- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+- USB_LIBS="$LIBS"
++ { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++ libusbok=no
++elif test $pkg_failed = untried; then
++ libusbok=no
+ else
+- libusbok=no; { $as_echo "$as_me:$LINENO: result: USRP requires libusb. usb_bulk_write not found. See http://libusb.sf.net" >&5
+-$as_echo "USRP requires libusb. usb_bulk_write not found. See http://libusb.sf.net" >&6; }
+-fi
++ USB_CFLAGS=$pkg_cv_USB_CFLAGS
++ USB_LIBS=$pkg_cv_USB_LIBS
++ USB_INCLUDEDIR=$pkg_cv_USB_INCLUDEDIR
+
++ USB_CPPFLAGS=""
++ for flag in $USB_CFLAGS; do
++ case $flag in
++ -I* | -D* | -U*) USB_CPPFLAGS="$USB_CPPFLAGS $flag" ;;
++ esac
++ done
++ pkg_cv_USB_CPPFLAGS=$USB_CPPFLAGS
+
+- LIBS="$save_LIBS"
+
+- ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
++ { $as_echo "$as_me:$LINENO: result: yes" >&5
++$as_echo "yes" >&6; }
++ libusbok=yes
++fi
++ fi
++ usb_header='usb.h'
++ usb_lib_func='usb_bulk_write'
++ usb_lib_name='usb'
++ fi
++ if test x$req_libusb1 != xyes || test $have_libusb1 = yes; then
++ libusbok=yes
+
+
+-elif test $pkg_failed = untried; then
+
+- ac_ext=c
++ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
++ save_CPPFLAGS="$CPPFLAGS"
++ if test x$USB_INCLUDEDIR != x; then
++ USB_INCLUDES="-I$USB_INCLUDEDIR"
++ CPPFLAGS="$CPPFLAGS $USB_INCLUDES"
+
++ fi
+
+-for ac_header in usb.h
++for ac_header in $usb_header
+ do
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+@@ -36429,27 +36519,49 @@
+ _ACEOF
+
+ else
+- libusbok=no; { $as_echo "$as_me:$LINENO: result: USRP requires libusb. usb.h not found. See http://libusb.sf.net" >&5
+-$as_echo "USRP requires libusb. usb.h not found. See http://libusb.sf.net" >&6; }
++ libusbok=no
+ fi
+
+ done
+
++ CPPFLAGS="$save_CPPFLAGS"
++ ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+- save_LIBS="$LIBS"
+- case "$host_os" in
+- darwin*)
+- LIBS="$LIBS -lIOKit"
+- ;;
+- *) ;;
+- esac
+
+- { $as_echo "$as_me:$LINENO: checking for library containing usb_bulk_write" >&5
+-$as_echo_n "checking for library containing usb_bulk_write... " >&6; }
+-if test "${ac_cv_search_usb_bulk_write+set}" = set; then
++ if test $libusbok = no; then
++ { $as_echo "$as_me:$LINENO: result: USRP requires libusb header '$usb_header' which was not found or was not usable. See http://www.libusb.org" >&5
++$as_echo "USRP requires libusb header '$usb_header' which was not found or was not usable. See http://www.libusb.org" >&6; }
++ else
++
++
++ ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++ save_LIBS="$LIBS"
++ LIBS=""
++ case "$host_os" in
++ darwin*)
++ USB_LIBS="$USB_LIBS -lIOKit"
++ LIBS="$USB_LIBS"
++ ;;
++ *) ;;
++ esac
++
++as_ac_Lib=`$as_echo "ac_cv_lib_$usb_lib_name''_$usb_lib_func" | $as_tr_sh`
++{ $as_echo "$as_me:$LINENO: checking for $usb_lib_func in -l$usb_lib_name" >&5
++$as_echo_n "checking for $usb_lib_func in -l$usb_lib_name... " >&6; }
++if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+ else
+- ac_func_search_save_LIBS=$LIBS
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-l$usb_lib_name $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -36463,23 +36575,16 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char usb_bulk_write ();
++char $usb_lib_func ();
+ int
+ main ()
+ {
+-return usb_bulk_write ();
++return $usb_lib_func ();
+ ;
+ return 0;
+ }
+ _ACEOF
+-for ac_lib in '' usb; do
+- if test -z "$ac_lib"; then
+- ac_res="none required"
+- else
+- ac_res=-l$ac_lib
+- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+- fi
+- rm -f conftest.$ac_objext conftest$ac_exeext
++rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (ac_try="$ac_link"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+@@ -36500,78 +36605,64 @@
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+- ac_cv_search_usb_bulk_write=$ac_res
++ eval "$as_ac_Lib=yes"
+ else
+ $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-
++ eval "$as_ac_Lib=no"
+ fi
+
+ rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext
+- if test "${ac_cv_search_usb_bulk_write+set}" = set; then
+- break
+-fi
+-done
+-if test "${ac_cv_search_usb_bulk_write+set}" = set; then
+- :
+-else
+- ac_cv_search_usb_bulk_write=no
+-fi
+-rm conftest.$ac_ext
+-LIBS=$ac_func_search_save_LIBS
++ conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_usb_bulk_write" >&5
+-$as_echo "$ac_cv_search_usb_bulk_write" >&6; }
+-ac_res=$ac_cv_search_usb_bulk_write
+-if test "$ac_res" != no; then
+- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+- USB_LIBS="$LIBS"
++ac_res=`eval 'as_val=${'$as_ac_Lib'}
++ $as_echo "$as_val"'`
++ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++as_val=`eval 'as_val=${'$as_ac_Lib'}
++ $as_echo "$as_val"'`
++ if test "x$as_val" = x""yes; then
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_LIB$usb_lib_name" | $as_tr_cpp` 1
++_ACEOF
++
++ LIBS="-l$usb_lib_name $LIBS"
++
+ else
+- libusbok=no; { $as_echo "$as_me:$LINENO: result: USRP requires libusb. usb_bulk_write not found. See http://libusb.sf.net" >&5
+-$as_echo "USRP requires libusb. usb_bulk_write not found. See http://libusb.sf.net" >&6; }
+-fi
+
++ libusbok=no
++ { $as_echo "$as_me:$LINENO: result: USRP requires library '$usb_lib_name' with function '$usb_lib_func', which was either not found or was not usable. See http://www.libusb.org" >&5
++$as_echo "USRP requires library '$usb_lib_name' with function '$usb_lib_func', which was either not found or was not usable. See http://www.libusb.org" >&6; }
+
+- LIBS="$save_LIBS"
++fi
+
+- ac_ext=c
++ case "$host_os" in
++ cygwin* | mingw*)
++ USB_LIBS="$LIBS"
++ ;;
++ *) ;;
++ esac
++ LIBS="$save_LIBS"
++ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+-
+-else
+- USB_CFLAGS=$pkg_cv_USB_CFLAGS
+- USB_LIBS=$pkg_cv_USB_LIBS
+- USB_INCLUDEDIR=$pkg_cv_USB_INCLUDEDIR
+-
+- USB_CPPFLAGS=""
+- for flag in $USB_CFLAGS; do
+- case $flag in
+- -I* | -D* | -U*) USB_CPPFLAGS="$USB_CPPFLAGS $flag" ;;
+- esac
+- done
+- pkg_cv_USB_CPPFLAGS=$USB_CPPFLAGS
+-
+-
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
+- :
+-fi
+-
+- if test x$libusbok = xyes; then
+-
+- :
+- else
+- passed=no;{ $as_echo "$as_me:$LINENO: result: Unable to find dependency libusb." >&5
+-$as_echo "Unable to find dependency libusb." >&6; }
+ fi
++ fi
++ if test $libusbok = yes; then
+
+-
++ :
++ else
++ USB_INCLUDES=
++ USB_LIBS=
++ passed=no;{ $as_echo "$as_me:$LINENO: result: Unable to find dependency libusb." >&5
++$as_echo "Unable to find dependency libusb." >&6; }
++ fi
+
+ sdccok=yes
+ # Extract the first word of "sdcc", so it can be a program name with args.
Added: trunk/dports/science/usrp/files/patch-usrp_host_apps_Makefile.in.diff
===================================================================
--- trunk/dports/science/usrp/files/patch-usrp_host_apps_Makefile.in.diff (rev 0)
+++ trunk/dports/science/usrp/files/patch-usrp_host_apps_Makefile.in.diff 2010-02-04 20:10:00 UTC (rev 63424)
@@ -0,0 +1,11 @@
+--- usrp/host/apps/Makefile.in_old 2009-10-26 18:49:48.000000000 -0400
++++ usrp/host/apps/Makefile.in 2009-10-26 18:50:36.000000000 -0400
+@@ -745,7 +745,7 @@
+ STAMPS =
+ MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp *.loT
+ AM_CPPFLAGS = $(USRP_INCLUDES) $(BOOST_CPPFLAGS) $(CPPUNIT_INCLUDES) \
+- $(WITH_INCLUDES)
++ $(WITH_INCLUDES) -I$(USB_INCLUDEDIR)
+
+ noinst_HEADERS = \
+ time_stuff.h
Added: trunk/dports/science/usrp/files/patch-usrp_host_lib_legacy_Makefile.in.diff
===================================================================
--- trunk/dports/science/usrp/files/patch-usrp_host_lib_legacy_Makefile.in.diff (rev 0)
+++ trunk/dports/science/usrp/files/patch-usrp_host_lib_legacy_Makefile.in.diff 2010-02-04 20:10:00 UTC (rev 63424)
@@ -0,0 +1,11 @@
+--- usrp/host/lib/legacy/Makefile.in_old 2009-10-26 16:39:12.000000000 -0400
++++ usrp/host/lib/legacy/Makefile.in 2009-10-26 16:40:01.000000000 -0400
+@@ -794,7 +794,7 @@
+ STAMPS = $(DEPDIR)/stamp-sources-generate*
+ MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp \
+ *.loT stamp-sources-generate
+-common_INCLUDES = $(USRP_INCLUDES)
++common_INCLUDES = $(USRP_INCLUDES) -I$(USB_INCLUDEDIR)
+ lib_LTLIBRARIES = libusrp.la
+ libusrp_la_common_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 $(BOOST_LDFLAGS)
+ libusrp_la_common_LIBADD = \
Added: trunk/dports/science/usrp/files/patch-usrp_usrp.pc.in.diff
===================================================================
--- trunk/dports/science/usrp/files/patch-usrp_usrp.pc.in.diff (rev 0)
+++ trunk/dports/science/usrp/files/patch-usrp_usrp.pc.in.diff 2010-02-04 20:10:00 UTC (rev 63424)
@@ -0,0 +1,11 @@
+--- usrp/usrp.pc.in_old 2009-10-26 19:08:28.000000000 -0400
++++ usrp/usrp.pc.in 2009-10-26 19:08:44.000000000 -0400
+@@ -5,7 +5,7 @@
+
+ Name: usrp
+ Description: USRP Client Side C++ interface
+-Requires: libusb @usrp_darwin_omnithread_pc_requires@
++Requires: libusb-legacy @usrp_darwin_omnithread_pc_requires@
+ Version: @VERSION@
+ Libs: -L${libdir} -lusrp
+ Cflags: -I${includedir} @DEFINES@
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100204/3ce1f800/attachment-0001.html>
More information about the macports-changes
mailing list