-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Folks, while reviewing test suite, found an issue in setting RPATH when TEST_INSTALLED_UCLIBC is not set. The attached patch should fix it. - --------
Build tests setting RPATH to ./ instead of $(top_builddir)lib to allow tests using their shared libraries to be loaded without setting LD_LIBRARY_PATH. When TEST_INSTALLED_UCLIBC is set, it doesn't need to set the RPATH, otherwise ass to the RPATH the $(top_builddir)lib too. UCLIBC_LDSO_ABSPATH is untouched. Signed-off-by: Carmelo Amoroso <[email protected]> Index: test/Rules.mak =================================================================== - --- test/Rules.mak (revision 25045) +++ test/Rules.mak (working copy) @@ -103,11 +103,13 @@ HOST_LDFLAGS += -static endif - -LDFLAGS += -B$(top_builddir)lib -Wl,-rpath,$(top_builddir)lib - -Wl,-rpath-link,$(top_builddir)lib +LDFLAGS += -B$(top_builddir)lib -Wl,-rpath,./ - -Wl,-rpath-link,$(top_builddir)lib UCLIBC_LDSO_ABSPATH=$(shell pwd) ifdef TEST_INSTALLED_UCLIBC - -LDFLAGS += -Wl,-rpath,./ - -UCLIBC_LDSO_ABSPATH=$(SHARED_LIB_LOADER_PREFIX) + UCLIBC_LDSO_ABSPATH=$(SHARED_LIB_LOADER_PREFIX) +else + LDFLAGS += -Wl,-rpath,$(top_builddir)lib + UCLIBC_LDSO_ABSPATH=$(shell pwd) endif ifeq ($(findstring -static,$(LDFLAGS)),) -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org iEYEARECAAYFAkmAfDcACgkQoRq/3BrK1s/b4gCfRHp6wCqpuSbtADWKGgoApyov GnYAoJmC2EPswNZeHSu+0WWXHeZutPxZ =Kzd9 -----END PGP SIGNATURE----- _______________________________________________ uClibc mailing list [email protected] http://lists.busybox.net/mailman/listinfo/uclibc
