diff --git a/config/path b/config/path index 0df55ab7b7..e7cc313552 100644 --- a/config/path +++ b/config/path @@ -114,6 +114,10 @@ if [ -z "$PATH" -o "$PATH" = "${PATH#$ROOT/$TOOLCHAIN/bin:}" ]; then export PATH="$ROOT/$TOOLCHAIN/bin:$PATH" fi +if [ -z "$LD_LIBRARY_PATH" -o "$LD_LIBRARY_PATH" = "${LD_LIBRARY_PATH#$ROOT/$TOOLCHAIN/lib:}" ]; then + export LD_LIBRARY_PATH="$ROOT/$TOOLCHAIN/lib:$LD_LIBRARY_PATH" +fi + VERSION_SUFFIX=$TARGET_ARCH . config/functions diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-433f681-321-texturepacker-hostflags-and-rework.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-433f681-321-texturepacker-hostflags-and-rework.patch index 9cca1f335e..cbe5891222 100644 --- a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-433f681-321-texturepacker-hostflags-and-rework.patch +++ b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-433f681-321-texturepacker-hostflags-and-rework.patch @@ -133,7 +133,7 @@ diff -Naur xbmc-frodo-433f681/tools/TexturePacker/Makefile.in xbmc-frodo-433f681 + +LIBS += -lSDL_image -lSDL -llzo2 +LIBS += -L@abs_top_srcdir@/lib/libsquish -lsquish -+HOST_LIBS += -Wl,-rpath,$(HOST_ROOT_PATH)/lib -L$(HOST_ROOT_PATH)/lib -lSDL_image -lSDL -llzo2 ++HOST_LIBS += -L$(HOST_ROOT_PATH)/lib -lSDL_image -lSDL -llzo2 +HOST_LIBS += -L@abs_top_srcdir@/lib/libsquish -lsquish-native + +CXXFLAGS += \ diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-pvr-3486b24-321-texturepacker-hostflags-and-rework.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-pvr-3486b24-321-texturepacker-hostflags-and-rework.patch index 9cca1f335e..cbe5891222 100644 --- a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-pvr-3486b24-321-texturepacker-hostflags-and-rework.patch +++ b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-pvr-3486b24-321-texturepacker-hostflags-and-rework.patch @@ -133,7 +133,7 @@ diff -Naur xbmc-frodo-433f681/tools/TexturePacker/Makefile.in xbmc-frodo-433f681 + +LIBS += -lSDL_image -lSDL -llzo2 +LIBS += -L@abs_top_srcdir@/lib/libsquish -lsquish -+HOST_LIBS += -Wl,-rpath,$(HOST_ROOT_PATH)/lib -L$(HOST_ROOT_PATH)/lib -lSDL_image -lSDL -llzo2 ++HOST_LIBS += -L$(HOST_ROOT_PATH)/lib -lSDL_image -lSDL -llzo2 +HOST_LIBS += -L@abs_top_srcdir@/lib/libsquish -lsquish-native + +CXXFLAGS += \ diff --git a/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-bffd7a7-321-texturepacker-hostflags-and-rework.patch b/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-bffd7a7-321-texturepacker-hostflags-and-rework.patch index 9cca1f335e..cbe5891222 100644 --- a/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-bffd7a7-321-texturepacker-hostflags-and-rework.patch +++ b/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-bffd7a7-321-texturepacker-hostflags-and-rework.patch @@ -133,7 +133,7 @@ diff -Naur xbmc-frodo-433f681/tools/TexturePacker/Makefile.in xbmc-frodo-433f681 + +LIBS += -lSDL_image -lSDL -llzo2 +LIBS += -L@abs_top_srcdir@/lib/libsquish -lsquish -+HOST_LIBS += -Wl,-rpath,$(HOST_ROOT_PATH)/lib -L$(HOST_ROOT_PATH)/lib -lSDL_image -lSDL -llzo2 ++HOST_LIBS += -L$(HOST_ROOT_PATH)/lib -lSDL_image -lSDL -llzo2 +HOST_LIBS += -L@abs_top_srcdir@/lib/libsquish -lsquish-native + +CXXFLAGS += \ diff --git a/packages/mediacenter/xbmc/patches/xbmc-11.0.1-321-texturepacker-hostflags-and-rework.patch b/packages/mediacenter/xbmc/patches/xbmc-11.0.1-321-texturepacker-hostflags-and-rework.patch index c636c15a5c..507334d2e2 100644 --- a/packages/mediacenter/xbmc/patches/xbmc-11.0.1-321-texturepacker-hostflags-and-rework.patch +++ b/packages/mediacenter/xbmc/patches/xbmc-11.0.1-321-texturepacker-hostflags-and-rework.patch @@ -166,7 +166,7 @@ diff -Naur xbmc-pvr-11.0.1/tools/TexturePacker/Makefile.in xbmc-pvr-11.0.1.patch + +LIBS += -lSDL_image -lSDL -llzo2 +LIBS += -L@abs_top_srcdir@/lib/libsquish -lsquish -+HOST_LIBS += -Wl,-rpath,$(HOST_ROOT_PATH)/lib -L$(HOST_ROOT_PATH)/lib -lSDL_image -lSDL -llzo2 ++HOST_LIBS += -L$(HOST_ROOT_PATH)/lib -lSDL_image -lSDL -llzo2 +HOST_LIBS += -L@abs_top_srcdir@/lib/libsquish -lsquish-native + +CXXFLAGS += \ diff --git a/packages/mediacenter/xbmc/patches/xbmc-pvr-11.0.1-321-texturepacker-hostflags-and-rework.patch b/packages/mediacenter/xbmc/patches/xbmc-pvr-11.0.1-321-texturepacker-hostflags-and-rework.patch index c636c15a5c..507334d2e2 100644 --- a/packages/mediacenter/xbmc/patches/xbmc-pvr-11.0.1-321-texturepacker-hostflags-and-rework.patch +++ b/packages/mediacenter/xbmc/patches/xbmc-pvr-11.0.1-321-texturepacker-hostflags-and-rework.patch @@ -166,7 +166,7 @@ diff -Naur xbmc-pvr-11.0.1/tools/TexturePacker/Makefile.in xbmc-pvr-11.0.1.patch + +LIBS += -lSDL_image -lSDL -llzo2 +LIBS += -L@abs_top_srcdir@/lib/libsquish -lsquish -+HOST_LIBS += -Wl,-rpath,$(HOST_ROOT_PATH)/lib -L$(HOST_ROOT_PATH)/lib -lSDL_image -lSDL -llzo2 ++HOST_LIBS += -L$(HOST_ROOT_PATH)/lib -lSDL_image -lSDL -llzo2 +HOST_LIBS += -L@abs_top_srcdir@/lib/libsquish -lsquish-native + +CXXFLAGS += \ diff --git a/packages/toolchain/devel/eglibc/build b/packages/toolchain/devel/eglibc/build index dba8085e6b..6690a383ae 100755 --- a/packages/toolchain/devel/eglibc/build +++ b/packages/toolchain/devel/eglibc/build @@ -36,6 +36,8 @@ LDFLAGS=`echo $LDFLAGS | sed -e "s|-Wl,--as-needed||"` + unset LD_LIBRARY_PATH + # set some CFLAGS we need CFLAGS="$CFLAGS -g -fno-stack-protector -fgnu89-inline"