diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2011-10-05 22:50:41 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2011-10-05 22:50:41 +0200 |
| commit | a5094a056ad99da7763d93a97b8e61630f60d170 (patch) | |
| tree | e6a58a4956015b507b5420d6f91d43d7946ef771 | |
| parent | 63b7450072c72a1b2f4af6c893e70dd9658e9fb3 (diff) | |
openocd: remove fixed ldflags breaking build
The openocd configure script would forcibly add -L/usr/lib to LDFLAGS,
causing the cross compiler to use host libraries, breaking the build.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
| -rw-r--r-- | package/openocd/openocd-0005-dont-force-ldflags.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/package/openocd/openocd-0005-dont-force-ldflags.patch b/package/openocd/openocd-0005-dont-force-ldflags.patch new file mode 100644 index 000000000..1880e0050 --- /dev/null +++ b/package/openocd/openocd-0005-dont-force-ldflags.patch @@ -0,0 +1,37 @@ +[PATCH] don't force library search path / rpath settings + +openocd adds -L$exec_prefix/lib -Wl,rpath,$exec_prefix/lib to the compile +LDFLAGS if it isn't installed into /usr/local, which breaks cross compilation +as the compiler ends up using host libraries. +--- + configure.in | 17 ----------------- + 1 file changed, 17 deletions(-) + +Index: openocd-0.5.0/configure.in +=================================================================== +--- openocd-0.5.0.orig/configure.in ++++ openocd-0.5.0/configure.in +@@ -174,23 +174,6 @@ + # Let make expand exec_prefix. + test x"$OCDxprefix" = xNONE && OCDxprefix="$OCDprefix" + +-# what matters is the "exec-prefix" +-if test "$OCDxprefix" != "$ac_default_prefix" +-then +- # We are installing in a non-standard place +- # Nonstandard --prefix and/or --exec-prefix +- # We have an override of some sort. +- # use build specific install library dir +- +- LDFLAGS="$LDFLAGS -L$OCDxprefix/lib" +- # RPATH becomes an issue on Linux only +- if test $host_os = linux-gnu || test $host_os = linux ; then +- LDFLAGS="$LDFLAGS -Wl,-rpath,$OCDxprefix/lib" +- fi +- # The "INCDIR" is also usable +- CFLAGS="$CFLAGS -I$includedir" +-fi +- + AC_ARG_WITH(ftd2xx, + AS_HELP_STRING([--with-ftd2xx=<PATH>],[This option has been removed.]), + [ |