mirror of
https://github.com/schnitzeltony/meta-musicians.git
synced 2026-09-12 21:49:33 +02:00
lsp-plugins: upgrade 1.1.11 -> 1.1.13
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
@@ -1,33 +0,0 @@
|
||||
From b207c69abfc8fea9b9d126f0366cfd5d84d95806 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Mon, 25 Mar 2019 00:14:49 +0100
|
||||
Subject: [PATCH] Remove RPATHs
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Inappropriate [embedded specific]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
scripts/make/tools.mk | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/scripts/make/tools.mk b/scripts/make/tools.mk
|
||||
index 2adb3c56..0d67881b 100644
|
||||
--- a/scripts/make/tools.mk
|
||||
+++ b/scripts/make/tools.mk
|
||||
@@ -22,7 +22,7 @@ export LD ?= $(TOOL_LD)
|
||||
export MAKE_OPTS = -s
|
||||
export CFLAGS += $(CC_ARCH) -std=c++98 -fdata-sections -pthread -ffunction-sections -fno-exceptions -fno-asynchronous-unwind-tables -Wall -pipe -fno-rtti $(CC_FLAGS) -DLSP_MAIN_VERSION=\"$(VERSION)\" -DLSP_INSTALL_PREFIX=\"$(PREFIX)\"
|
||||
export CXXFLAGS += $(CC_ARCH) -std=c++98 -fdata-sections -pthread -ffunction-sections -fno-exceptions -fno-asynchronous-unwind-tables -Wall -pipe -fno-rtti $(CC_FLAGS) -DLSP_MAIN_VERSION=\"$(VERSION)\" -DLSP_INSTALL_PREFIX=\"$(PREFIX)\"
|
||||
-export SO_FLAGS = $(CC_ARCH) -Wl,-rpath,$(LD_PATH) $(FLAG_RELRO) -Wl,--gc-sections -shared -Llibrary -lc -fPIC
|
||||
+export SO_FLAGS = $(CC_ARCH) $(FLAG_RELRO) -Wl,--gc-sections -shared -Llibrary -lc -fPIC
|
||||
export MERGE_FLAGS = $(LD_ARCH) -r
|
||||
-export EXE_TEST_FLAGS = $(LDFLAGS) $(CC_ARCH) -Wl,-rpath,$(LD_PATH)
|
||||
-export EXE_FLAGS = $(LDFLAGS) $(CC_ARCH) -Wl,-rpath,$(LD_PATH) $(FLAG_RELRO) -Wl,--gc-sections
|
||||
+export EXE_TEST_FLAGS = $(LDFLAGS) $(CC_ARCH)
|
||||
+export EXE_FLAGS = $(LDFLAGS) $(CC_ARCH) $(FLAG_RELRO) -Wl,--gc-sections
|
||||
--
|
||||
2.21.0
|
||||
|
||||
@@ -5,11 +5,10 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3000208d539ec061b899bce1d9ce9404"
|
||||
|
||||
SRC_URI = " \
|
||||
gitsm://github.com/sadko4u/lsp-plugins.git \
|
||||
file://0001-Remove-RPATHs.patch \
|
||||
file://0002-Add-missing-dsp-in-SUBDIRS.patch \
|
||||
file://0001-Add-missing-dsp-in-SUBDIRS.patch \
|
||||
"
|
||||
SRCREV = "543e17e9de3b8dc9de6e31438d1223d792054626"
|
||||
SRCREV = "6a598435b35e9faf10de621cc40c460021c4eccc"
|
||||
S = "${WORKDIR}/git"
|
||||
PV = "1.1.10"
|
||||
PV = "1.1.13"
|
||||
|
||||
do_configure[noexec] = "1"
|
||||
|
||||
@@ -33,17 +33,16 @@ index 189af3f5..52706983 100644
|
||||
|
||||
# Files
|
||||
diff --git a/scripts/make/configure.mk b/scripts/make/configure.mk
|
||||
index ecb208c3..7b3e4a1d 100644
|
||||
index e2d3d58a..660c1b5a 100644
|
||||
--- a/scripts/make/configure.mk
|
||||
+++ b/scripts/make/configure.mk
|
||||
@@ -57,65 +57,6 @@ export INSTALLATIONS
|
||||
@@ -57,69 +57,6 @@ export INSTALLATIONS
|
||||
export UNINSTALLATIONS
|
||||
export RELEASES
|
||||
|
||||
-# Configure compiler and linker flags
|
||||
-LD_ARCH =
|
||||
-CC_ARCH =
|
||||
-LD_PATH =
|
||||
-
|
||||
-# Build profile
|
||||
-ifeq ($(BUILD_PROFILE),i586)
|
||||
@@ -54,7 +53,6 @@ index ecb208c3..7b3e4a1d 100644
|
||||
- ifeq ($(BUILD_PLATFORM), BSD)
|
||||
- LD_ARCH = -m elf_i386_fbsd
|
||||
- endif
|
||||
- LD_PATH = /usr/lib:/lib:/usr/local/lib
|
||||
-endif
|
||||
-
|
||||
-ifeq ($(BUILD_PROFILE),x86_64)
|
||||
@@ -65,36 +63,42 @@ index ecb208c3..7b3e4a1d 100644
|
||||
- ifeq ($(BUILD_PLATFORM), BSD)
|
||||
- LD_ARCH = -m elf_x86_64_fbsd
|
||||
- endif
|
||||
- LD_PATH = /usr/lib:/lib:/usr/local/lib
|
||||
-endif
|
||||
-
|
||||
-ifeq ($(BUILD_PLATFORM), BSD)
|
||||
- ifeq ($(BUILD_PROFILE),arm)
|
||||
- CC_ARCH = -marm -Wl,-rpath=/usr/local/lib/gcc8
|
||||
- LD_PATH = /usr/local/lib/gcc8
|
||||
- CC_ARCH = -marm
|
||||
- ifneq ($(LD_PATH),)
|
||||
- CC_ARCH += -Wl,-rpath=$(LD_PATH)
|
||||
- endif
|
||||
- endif
|
||||
-endif
|
||||
-
|
||||
-ifeq ($(BUILD_PROFILE),armv6a)
|
||||
- CC_ARCH = -march=armv6-a -marm
|
||||
- LD_PATH = /usr/lib64:/lib64:/usr/local/lib64
|
||||
-endif
|
||||
-
|
||||
-ifeq ($(BUILD_PROFILE),armv7a)
|
||||
- CC_ARCH = -march=armv7-a -marm
|
||||
- LD_PATH = /usr/lib64:/lib64:/usr/local/lib64
|
||||
-endif
|
||||
-
|
||||
-ifeq ($(BUILD_PROFILE),armv7ve)
|
||||
- CC_ARCH = -march=armv7ve -marm
|
||||
-endif
|
||||
-
|
||||
-ifeq ($(BUILD_PROFILE),arm32)
|
||||
- CC_ARCH = -marm
|
||||
-endif
|
||||
-
|
||||
-ifeq ($(BUILD_PROFILE),armv8a)
|
||||
- CC_ARCH = -march=armv7-a -marm
|
||||
- LD_PATH = /usr/lib64:/lib64:/usr/local/lib64
|
||||
-endif
|
||||
-
|
||||
-ifeq ($(BUILD_PROFILE),aarch64)
|
||||
- CC_ARCH = -march=armv8-a
|
||||
- LD_PATH = /usr/lib:/lib:/usr/local/lib
|
||||
-endif
|
||||
-
|
||||
-
|
||||
-export CC_ARCH
|
||||
-export LD_ARCH
|
||||
-export LD_PATH
|
||||
|
||||
@@ -15,15 +15,15 @@ diff --git a/scripts/make/tools.mk b/scripts/make/tools.mk
|
||||
index 0d67881b..18ba73fb 100644
|
||||
--- a/scripts/make/tools.mk
|
||||
+++ b/scripts/make/tools.mk
|
||||
@@ -22,7 +22,7 @@ export LD ?= $(TOOL_LD)
|
||||
export MAKE_OPTS = -s
|
||||
export CFLAGS += $(CC_ARCH) -std=c++98 -fdata-sections -pthread -ffunction-sections -fno-exceptions -fno-asynchronous-unwind-tables -Wall -pipe -fno-rtti $(CC_FLAGS) -DLSP_MAIN_VERSION=\"$(VERSION)\" -DLSP_INSTALL_PREFIX=\"$(PREFIX)\"
|
||||
export CXXFLAGS += $(CC_ARCH) -std=c++98 -fdata-sections -pthread -ffunction-sections -fno-exceptions -fno-asynchronous-unwind-tables -Wall -pipe -fno-rtti $(CC_FLAGS) -DLSP_MAIN_VERSION=\"$(VERSION)\" -DLSP_INSTALL_PREFIX=\"$(PREFIX)\"
|
||||
-export SO_FLAGS = $(CC_ARCH) $(FLAG_RELRO) -Wl,--gc-sections -shared -Llibrary -lc -fPIC
|
||||
+export SO_FLAGS = $(CC_ARCH) $(FLAG_RELRO) -Wl,--gc-sections -shared -Llibrary -lc -fPIC $(LDFLAGS)
|
||||
export MERGE_FLAGS = $(LD_ARCH) -r
|
||||
export EXE_TEST_FLAGS = $(LDFLAGS) $(CC_ARCH)
|
||||
export EXE_FLAGS = $(LDFLAGS) $(CC_ARCH) $(FLAG_RELRO) -Wl,--gc-sections
|
||||
@@ -27,7 +27,7 @@ LD ?= $(TOOL_LD)
|
||||
MAKE_OPTS = -s
|
||||
CFLAGS += $(CC_ARCH) $(FLAG_CTUNE) $(CC_FLAGS) $(FLAG_VERSION)
|
||||
CXXFLAGS += $(CC_ARCH) $(FLAG_CTUNE) $(CC_FLAGS) $(FLAG_VERSION)
|
||||
-SO_FLAGS = $(CC_ARCH) $(FLAG_RELRO) -Wl,--gc-sections -shared -Llibrary -lc -fPIC
|
||||
+SO_FLAGS = $(CC_ARCH) $(FLAG_RELRO) -Wl,--gc-sections -shared -Llibrary -lc -fPIC $(LDFLAGS)
|
||||
MERGE_FLAGS = $(LD_ARCH) -r
|
||||
EXE_TEST_FLAGS = $(LDFLAGS) $(CC_ARCH)
|
||||
EXE_FLAGS = $(LDFLAGS) $(CC_ARCH) $(FLAG_RELRO) -Wl,--gc-sections
|
||||
--
|
||||
2.21.0
|
||||
|
||||
|
||||
Reference in New Issue
Block a user