Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix : disable requirement - use export LD_LIBRARY_PATH #75

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion platform/build/config/ARM-CAS-Linux
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ STATICOPT_CXX =
STATICOPT_LINK = -static
SHAREDOPT_CC = -fPIC
SHAREDOPT_CXX = -fPIC
SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH)
SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH),-rpath,$(LIBPLATFORMPATH)
DEBUGOPT_CC = -g -D_DEBUG
DEBUGOPT_CXX = -g -D_DEBUG
DEBUGOPT_LINK = -g
Expand Down
2 changes: 1 addition & 1 deletion platform/build/config/ARM-Linux
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ STATICOPT_CXX =
STATICOPT_LINK = -static
SHAREDOPT_CC = -fPIC
SHAREDOPT_CXX = -fPIC
SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH)
SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH),-rpath,$(LIBPLATFORMPATH)
DEBUGOPT_CC = -g -D_DEBUG
DEBUGOPT_CXX = -g -D_DEBUG
DEBUGOPT_LINK = -g
Expand Down
2 changes: 1 addition & 1 deletion platform/build/config/Android
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ STATICOPT_CXX =
STATICOPT_LINK = -static
SHAREDOPT_CC =
SHAREDOPT_CXX =
SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH)
SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH),-rpath,$(LIBPLATFORMPATH)
DEBUGOPT_CC = -g -D_DEBUG
DEBUGOPT_CXX = -g -D_DEBUG
DEBUGOPT_LINK = -g
Expand Down
2 changes: 1 addition & 1 deletion platform/build/config/Angstrom
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ STATICOPT_CXX =
STATICOPT_LINK = -static
SHAREDOPT_CC = -fPIC
SHAREDOPT_CXX = -fPIC
SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH)
SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH),-rpath,$(LIBPLATFORMPATH)
DEBUGOPT_CC = -g -D_DEBUG
DEBUGOPT_CXX = -g -D_DEBUG
DEBUGOPT_LINK = -g
Expand Down
2 changes: 1 addition & 1 deletion platform/build/config/Arago
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ STATICOPT_CXX =
STATICOPT_LINK = -static
SHAREDOPT_CC = -fPIC
SHAREDOPT_CXX = -fPIC
SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH)
SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH),-rpath,$(LIBPLATFORMPATH)
DEBUGOPT_CC = -g -D_DEBUG
DEBUGOPT_CXX = -g -D_DEBUG
DEBUGOPT_LINK = -g
Expand Down
2 changes: 1 addition & 1 deletion platform/build/config/BeagleBoard
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ STATICOPT_CXX =
STATICOPT_LINK = -static
SHAREDOPT_CC = -fPIC
SHAREDOPT_CXX = -fPIC
SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH)
SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH),-rpath,$(LIBPLATFORMPATH)
DEBUGOPT_CC = -g -D_DEBUG
DEBUGOPT_CXX = -g -D_DEBUG
DEBUGOPT_LINK = -g
Expand Down
2 changes: 1 addition & 1 deletion platform/build/config/CygLinux
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ STATICOPT_CXX =
STATICOPT_LINK = -static
SHAREDOPT_CC = -fPIC
SHAREDOPT_CXX = -fPIC
SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH)
SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH),-rpath,$(LIBPLATFORMPATH)
DEBUGOPT_CC = -g -D_DEBUG
DEBUGOPT_CXX = -g -D_DEBUG
DEBUGOPT_LINK = -g
Expand Down
2 changes: 1 addition & 1 deletion platform/build/config/DigiEL
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ STATICOPT_CXX =
STATICOPT_LINK = -static
SHAREDOPT_CC = -fPIC
SHAREDOPT_CXX = -fPIC
SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH)
SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH),-rpath,$(LIBPLATFORMPATH)
DEBUGOPT_CC = -g -D_DEBUG
DEBUGOPT_CXX = -g -D_DEBUG
DEBUGOPT_LINK = -g
Expand Down
2 changes: 1 addition & 1 deletion platform/build/config/DigiEL-A8
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ STATICOPT_CXX =
STATICOPT_LINK = -static
SHAREDOPT_CC = -fPIC
SHAREDOPT_CXX = -fPIC
SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH)
SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH),-rpath,$(LIBPLATFORMPATH)
DEBUGOPT_CC = -g -D_DEBUG
DEBUGOPT_CXX = -g -D_DEBUG
DEBUGOPT_LINK = -g
Expand Down
2 changes: 1 addition & 1 deletion platform/build/config/ELDK
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ STATICOPT_CXX =
STATICOPT_LINK = -static
SHAREDOPT_CC = -fPIC
SHAREDOPT_CXX = -fPIC
SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH)
SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH),-rpath,$(LIBPLATFORMPATH)
DEBUGOPT_CC = -g -D_DEBUG
DEBUGOPT_CXX = -g -D_DEBUG
DEBUGOPT_LINK = -g
Expand Down
2 changes: 1 addition & 1 deletion platform/build/config/FreeBSD
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ STATICOPT_CXX =
STATICOPT_LINK = -static
SHAREDOPT_CC = -fPIC
SHAREDOPT_CXX = -fPIC
SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH)
SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH),-rpath,$(LIBPLATFORMPATH)
DEBUGOPT_CC = -g -D_DEBUG
DEBUGOPT_CXX = -g -D_DEBUG
DEBUGOPT_LINK = -g
Expand Down
2 changes: 1 addition & 1 deletion platform/build/config/FreeBSD-Linux-compat
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ STATICOPT_CXX =
STATICOPT_LINK = -static
SHAREDOPT_CC = -fPIC
SHAREDOPT_CXX = -fPIC
SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH)
SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH),-rpath,$(LIBPLATFORMPATH)
DEBUGOPT_CC = -g -D_DEBUG
DEBUGOPT_CXX = -g -D_DEBUG
DEBUGOPT_LINK = -g
Expand Down
2 changes: 1 addition & 1 deletion platform/build/config/GCCEMBEDLINUX
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ STATICOPT_CXX =
STATICOPT_LINK = -static
SHAREDOPT_CC = -fPIC
SHAREDOPT_CXX = -fPIC
SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH)
SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH),-rpath,$(LIBPLATFORMPATH)
DEBUGOPT_CC = -g -D_DEBUG
DEBUGOPT_CXX = -g -D_DEBUG
DEBUGOPT_LINK = -g
Expand Down
2 changes: 1 addition & 1 deletion platform/build/config/Linux
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ STATICOPT_CXX =
STATICOPT_LINK = -static
SHAREDOPT_CC = -fPIC
SHAREDOPT_CXX = -fPIC
SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH)
SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH),-rpath,$(LIBPLATFORMPATH)
DEBUGOPT_CC = -g -D_DEBUG
DEBUGOPT_CXX = -g -D_DEBUG
DEBUGOPT_LINK = -g
Expand Down
2 changes: 1 addition & 1 deletion platform/build/config/Linux-clang
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ STATICOPT_CXX =
STATICOPT_LINK = -static
SHAREDOPT_CC = -fPIC
SHAREDOPT_CXX = -fPIC
SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH)
SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH),-rpath,$(LIBPLATFORMPATH)
DEBUGOPT_CC = -g -D_DEBUG
DEBUGOPT_CXX = -g -D_DEBUG
DEBUGOPT_LINK = -g
Expand Down
2 changes: 1 addition & 1 deletion platform/build/config/NIOS2-Linux
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ STATICOPT_CXX =
STATICOPT_LINK = -static
SHAREDOPT_CC = -fPIC
SHAREDOPT_CXX = -fPIC
SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH)
SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH),-rpath,$(LIBPLATFORMPATH)
DEBUGOPT_CC = -g -D_DEBUG
DEBUGOPT_CXX = -g -D_DEBUG
DEBUGOPT_LINK = -g
Expand Down
2 changes: 1 addition & 1 deletion platform/build/config/OpenPandora
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ STATICOPT_CXX =
STATICOPT_LINK = -static
SHAREDOPT_CC = -fPIC
SHAREDOPT_CXX = -fPIC
SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH)
SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH),-rpath,$(LIBPLATFORMPATH)
DEBUGOPT_CC = -g -D_DEBUG
DEBUGOPT_CXX = -g -D_DEBUG
DEBUGOPT_LINK = -g
Expand Down
2 changes: 1 addition & 1 deletion platform/build/config/PPC-Linux
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ STATICOPT_CXX =
STATICOPT_LINK = -static
SHAREDOPT_CC = -fPIC
SHAREDOPT_CXX = -fPIC
SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH)
SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH),-rpath,$(LIBPLATFORMPATH)
DEBUGOPT_CC = -g -D_DEBUG
DEBUGOPT_CXX = -g -D_DEBUG
DEBUGOPT_LINK = -g
Expand Down
2 changes: 1 addition & 1 deletion platform/build/config/QNX
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ STATICOPT_CXX =
STATICOPT_LINK = -static
SHAREDOPT_CC = -fpic
SHAREDOPT_CXX = -fpic
SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH)
SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH),-rpath,$(LIBPLATFORMPATH)
DEBUGOPT_CC = -g -D_DEBUG
DEBUGOPT_CXX = -g -D_DEBUG
DEBUGOPT_LINK = -g
Expand Down
2 changes: 1 addition & 1 deletion platform/build/config/QNX-Linux
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ STATICOPT_CXX =
STATICOPT_LINK = -static
SHAREDOPT_CC = -fpic
SHAREDOPT_CXX = -fpic
SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH)
SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH),-rpath,$(LIBPLATFORMPATH)
DEBUGOPT_CC = -g -D_DEBUG
DEBUGOPT_CXX = -g -D_DEBUG
DEBUGOPT_LINK = -g
Expand Down
2 changes: 1 addition & 1 deletion platform/build/config/SH-Linux
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ STATICOPT_CXX =
STATICOPT_LINK = -static
SHAREDOPT_CC = -fPIC
SHAREDOPT_CXX = -fPIC
SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH)
SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH),-rpath,$(LIBPLATFORMPATH)
DEBUGOPT_CC = -g -D_DEBUG
DEBUGOPT_CXX = -g -D_DEBUG
DEBUGOPT_LINK = -g
Expand Down
2 changes: 1 addition & 1 deletion platform/build/config/SSV-LINUX
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ STATICOPT_CXX =
STATICOPT_LINK = -static
SHAREDOPT_CC = -fPIC
SHAREDOPT_CXX = -fPIC
SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH)
SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH),-rpath,$(LIBPLATFORMPATH)
DEBUGOPT_CC = -g -D_DEBUG
DEBUGOPT_CXX = -g -D_DEBUG
DEBUGOPT_LINK = -g
Expand Down
2 changes: 1 addition & 1 deletion platform/build/config/SmartOS-gcc
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ STATICOPT_CXX =
STATICOPT_LINK = -static
SHAREDOPT_CC = -fPIC
SHAREDOPT_CXX = -fPIC
SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH)
SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH),-rpath,$(LIBPLATFORMPATH)
DEBUGOPT_CC = -g -D_DEBUG
DEBUGOPT_CXX = -g -D_DEBUG
DEBUGOPT_LINK = -g
Expand Down
2 changes: 1 addition & 1 deletion platform/build/config/SunOS-GCC
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ STATICOPT_CXX =
STATICOPT_LINK = -static
SHAREDOPT_CC = -fPIC
SHAREDOPT_CXX = -fPIC
SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH)
SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH),-rpath,$(LIBPLATFORMPATH)
DEBUGOPT_CC = -g -D_DEBUG
DEBUGOPT_CXX = -g -D_DEBUG
DEBUGOPT_LINK = -g
Expand Down
2 changes: 1 addition & 1 deletion platform/build/config/Yocto
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ STATICOPT_CXX =
STATICOPT_LINK = -static
SHAREDOPT_CC = -fPIC
SHAREDOPT_CXX = -fPIC
SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH)
SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH),-rpath,$(LIBPLATFORMPATH)
DEBUGOPT_CC = -g -D_DEBUG
DEBUGOPT_CXX = -g -D_DEBUG
DEBUGOPT_LINK = -g
Expand Down
22 changes: 12 additions & 10 deletions platform/build/rules/global
Original file line number Diff line number Diff line change
Expand Up @@ -195,16 +195,18 @@ COMPONENT := $(shell $(POCO_BASE)/build/script/projname "$(PROJECT_BASE)")
#
# Define standard directories
#
SRCDIR = src
INCDIR = include
LIBDIR = lib/$(OSNAME)/$(OSARCH)
BINDIR = bin/$(OSNAME)/$(OSARCH)
OBJDIR = obj/$(OSNAME)/$(OSARCH)
DEPDIR = .dep/$(OSNAME)/$(OSARCH)
LIBPATH = $(POCO_BUILD)/$(LIBDIR)
BINPATH = $(POCO_BUILD)/$(COMPONENT)/$(BINDIR)
OBJPATH = $(POCO_BUILD)/$(COMPONENT)/$(OBJDIR)
DEPPATH = $(POCO_BUILD)/$(COMPONENT)/$(DEPDIR)
SRCDIR = src
INCDIR = include
LIBDIR = lib/$(OSNAME)/$(OSARCH)
LIBPLATFORMDIR = platform/lib/$(OSNAME)/$(OSARCH)
BINDIR = bin/$(OSNAME)/$(OSARCH)
OBJDIR = obj/$(OSNAME)/$(OSARCH)
DEPDIR = .dep/$(OSNAME)/$(OSARCH)
LIBPATH = $(POCO_BUILD)/$(LIBDIR)
LIBPLATFORMPATH = $(POCO_BUILD)/$(LIBPLATFORMDIR)
BINPATH = $(POCO_BUILD)/$(COMPONENT)/$(BINDIR)
OBJPATH = $(POCO_BUILD)/$(COMPONENT)/$(OBJDIR)
DEPPATH = $(POCO_BUILD)/$(COMPONENT)/$(DEPDIR)

POCO_HOST_BINDIR = bin/$(POCO_HOST_OSNAME)/$(POCO_HOST_OSARCH)
POCO_TARGET_BINDIR = $(BINDIR)
Expand Down
2 changes: 1 addition & 1 deletion platform/doc/99150-GMakeBuildNotes.page
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,7 @@ you'll usually create a new build configuration file (by copying an existing one
STATICOPT_LINK = -static
SHAREDOPT_CC = -fPIC
SHAREDOPT_CXX = -fPIC
SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH)
SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH),-rpath,$(LIBPLATFORMPATH)
DEBUGOPT_CC = -g -D_DEBUG
DEBUGOPT_CXX = -g -D_DEBUG
DEBUGOPT_LINK = -g
Expand Down