openocd-0005-dont-force-ldflags.patch 1.3 KB

12345678910111213141516171819202122232425262728293031323334353637
  1. [PATCH] don't force library search path / rpath settings
  2. openocd adds -L$exec_prefix/lib -Wl,rpath,$exec_prefix/lib to the compile
  3. LDFLAGS if it isn't installed into /usr/local, which breaks cross compilation
  4. as the compiler ends up using host libraries.
  5. ---
  6. configure.in | 17 -----------------
  7. 1 file changed, 17 deletions(-)
  8. Index: openocd-0.5.0/configure.in
  9. ===================================================================
  10. --- openocd-0.5.0.orig/configure.in
  11. +++ openocd-0.5.0/configure.in
  12. @@ -174,23 +174,6 @@
  13. # Let make expand exec_prefix.
  14. test x"$OCDxprefix" = xNONE && OCDxprefix="$OCDprefix"
  15. -# what matters is the "exec-prefix"
  16. -if test "$OCDxprefix" != "$ac_default_prefix"
  17. -then
  18. - # We are installing in a non-standard place
  19. - # Nonstandard --prefix and/or --exec-prefix
  20. - # We have an override of some sort.
  21. - # use build specific install library dir
  22. -
  23. - LDFLAGS="$LDFLAGS -L$OCDxprefix/lib"
  24. - # RPATH becomes an issue on Linux only
  25. - if test $host_os = linux-gnu || test $host_os = linux ; then
  26. - LDFLAGS="$LDFLAGS -Wl,-rpath,$OCDxprefix/lib"
  27. - fi
  28. - # The "INCDIR" is also usable
  29. - CFLAGS="$CFLAGS -I$includedir"
  30. -fi
  31. -
  32. AC_ARG_WITH(ftd2xx,
  33. AS_HELP_STRING([--with-ftd2xx=<PATH>],[This option has been removed.]),
  34. [