From 5f077fed266c2a0c0927709a36401c01b6d974b7 Mon Sep 17 00:00:00 2001 From: bas524 Date: Thu, 16 Nov 2017 12:53:19 +0300 Subject: [PATCH] fix : disable requirement - use export LD_LIBRARY_PATH=${PWD}/platform/lib/Linux/x86_64 before running bin/Linux/x86_64/macchina --- platform/build/config/ARM-CAS-Linux | 2 +- platform/build/config/ARM-Linux | 2 +- platform/build/config/Android | 2 +- platform/build/config/Angstrom | 2 +- platform/build/config/Arago | 2 +- platform/build/config/BeagleBoard | 2 +- platform/build/config/CygLinux | 2 +- platform/build/config/DigiEL | 2 +- platform/build/config/DigiEL-A8 | 2 +- platform/build/config/ELDK | 2 +- platform/build/config/FreeBSD | 2 +- platform/build/config/FreeBSD-Linux-compat | 2 +- platform/build/config/GCCEMBEDLINUX | 2 +- platform/build/config/Linux | 2 +- platform/build/config/Linux-clang | 2 +- platform/build/config/NIOS2-Linux | 2 +- platform/build/config/OpenPandora | 2 +- platform/build/config/PPC-Linux | 2 +- platform/build/config/QNX | 2 +- platform/build/config/QNX-Linux | 2 +- platform/build/config/SH-Linux | 2 +- platform/build/config/SSV-LINUX | 2 +- platform/build/config/SmartOS-gcc | 2 +- platform/build/config/SunOS-GCC | 2 +- platform/build/config/Yocto | 2 +- platform/build/rules/global | 22 ++++++++++++---------- platform/doc/99150-GMakeBuildNotes.page | 2 +- 27 files changed, 38 insertions(+), 36 deletions(-) diff --git a/platform/build/config/ARM-CAS-Linux b/platform/build/config/ARM-CAS-Linux index 2df3eadb8..427557e1b 100644 --- a/platform/build/config/ARM-CAS-Linux +++ b/platform/build/config/ARM-CAS-Linux @@ -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 diff --git a/platform/build/config/ARM-Linux b/platform/build/config/ARM-Linux index f258b8130..432654bdd 100644 --- a/platform/build/config/ARM-Linux +++ b/platform/build/config/ARM-Linux @@ -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 diff --git a/platform/build/config/Android b/platform/build/config/Android index 9227a3352..308530197 100644 --- a/platform/build/config/Android +++ b/platform/build/config/Android @@ -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 diff --git a/platform/build/config/Angstrom b/platform/build/config/Angstrom index 62e35c8d0..db4d8b738 100644 --- a/platform/build/config/Angstrom +++ b/platform/build/config/Angstrom @@ -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 diff --git a/platform/build/config/Arago b/platform/build/config/Arago index afc5debcc..dc0b40d14 100644 --- a/platform/build/config/Arago +++ b/platform/build/config/Arago @@ -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 diff --git a/platform/build/config/BeagleBoard b/platform/build/config/BeagleBoard index c3e6784fc..1734eec6d 100644 --- a/platform/build/config/BeagleBoard +++ b/platform/build/config/BeagleBoard @@ -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 diff --git a/platform/build/config/CygLinux b/platform/build/config/CygLinux index 32334e1a2..e6b3d1ea2 100644 --- a/platform/build/config/CygLinux +++ b/platform/build/config/CygLinux @@ -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 diff --git a/platform/build/config/DigiEL b/platform/build/config/DigiEL index 3bea07a20..1f2204b23 100644 --- a/platform/build/config/DigiEL +++ b/platform/build/config/DigiEL @@ -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 diff --git a/platform/build/config/DigiEL-A8 b/platform/build/config/DigiEL-A8 index 537386845..125342296 100644 --- a/platform/build/config/DigiEL-A8 +++ b/platform/build/config/DigiEL-A8 @@ -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 diff --git a/platform/build/config/ELDK b/platform/build/config/ELDK index 2f0b34148..5b41aa3c9 100644 --- a/platform/build/config/ELDK +++ b/platform/build/config/ELDK @@ -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 diff --git a/platform/build/config/FreeBSD b/platform/build/config/FreeBSD index 9be16adfa..2356cb282 100644 --- a/platform/build/config/FreeBSD +++ b/platform/build/config/FreeBSD @@ -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 diff --git a/platform/build/config/FreeBSD-Linux-compat b/platform/build/config/FreeBSD-Linux-compat index e7a62b592..0f656afed 100644 --- a/platform/build/config/FreeBSD-Linux-compat +++ b/platform/build/config/FreeBSD-Linux-compat @@ -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 diff --git a/platform/build/config/GCCEMBEDLINUX b/platform/build/config/GCCEMBEDLINUX index 9397e9533..b9b3dc800 100644 --- a/platform/build/config/GCCEMBEDLINUX +++ b/platform/build/config/GCCEMBEDLINUX @@ -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 diff --git a/platform/build/config/Linux b/platform/build/config/Linux index 3119a41bd..b0501b52b 100644 --- a/platform/build/config/Linux +++ b/platform/build/config/Linux @@ -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 diff --git a/platform/build/config/Linux-clang b/platform/build/config/Linux-clang index f5ab587ad..1c553188d 100644 --- a/platform/build/config/Linux-clang +++ b/platform/build/config/Linux-clang @@ -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 diff --git a/platform/build/config/NIOS2-Linux b/platform/build/config/NIOS2-Linux index 199f62d66..2e3ca5bb3 100644 --- a/platform/build/config/NIOS2-Linux +++ b/platform/build/config/NIOS2-Linux @@ -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 diff --git a/platform/build/config/OpenPandora b/platform/build/config/OpenPandora index fd7a877cf..7e82489a5 100644 --- a/platform/build/config/OpenPandora +++ b/platform/build/config/OpenPandora @@ -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 diff --git a/platform/build/config/PPC-Linux b/platform/build/config/PPC-Linux index ed4f9327e..1beda7a91 100644 --- a/platform/build/config/PPC-Linux +++ b/platform/build/config/PPC-Linux @@ -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 diff --git a/platform/build/config/QNX b/platform/build/config/QNX index bb933a217..37579883a 100644 --- a/platform/build/config/QNX +++ b/platform/build/config/QNX @@ -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 diff --git a/platform/build/config/QNX-Linux b/platform/build/config/QNX-Linux index 0e65e4ffe..cf84bb2fd 100644 --- a/platform/build/config/QNX-Linux +++ b/platform/build/config/QNX-Linux @@ -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 diff --git a/platform/build/config/SH-Linux b/platform/build/config/SH-Linux index b8a50678b..88d66e963 100644 --- a/platform/build/config/SH-Linux +++ b/platform/build/config/SH-Linux @@ -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 diff --git a/platform/build/config/SSV-LINUX b/platform/build/config/SSV-LINUX index 4ed21c4fe..3934b5cbc 100644 --- a/platform/build/config/SSV-LINUX +++ b/platform/build/config/SSV-LINUX @@ -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 diff --git a/platform/build/config/SmartOS-gcc b/platform/build/config/SmartOS-gcc index f5750d618..b722b70c5 100644 --- a/platform/build/config/SmartOS-gcc +++ b/platform/build/config/SmartOS-gcc @@ -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 diff --git a/platform/build/config/SunOS-GCC b/platform/build/config/SunOS-GCC index 7b93d7c46..2cb4d8339 100644 --- a/platform/build/config/SunOS-GCC +++ b/platform/build/config/SunOS-GCC @@ -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 diff --git a/platform/build/config/Yocto b/platform/build/config/Yocto index f066e8974..090cc6d24 100644 --- a/platform/build/config/Yocto +++ b/platform/build/config/Yocto @@ -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 diff --git a/platform/build/rules/global b/platform/build/rules/global index dc413300c..9b608717b 100644 --- a/platform/build/rules/global +++ b/platform/build/rules/global @@ -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) diff --git a/platform/doc/99150-GMakeBuildNotes.page b/platform/doc/99150-GMakeBuildNotes.page index 8820f429f..0edac7144 100644 --- a/platform/doc/99150-GMakeBuildNotes.page +++ b/platform/doc/99150-GMakeBuildNotes.page @@ -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