From 0b929107afb9ef2af56007fd0bf1383dd6bcb4e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ulc?= Date: Fri, 20 Oct 2023 09:50:32 +0200 Subject: [PATCH] media-plugins/calf: updated live patches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miroslav Šulc --- media-plugins/calf/calf-9999.ebuild | 1 - .../files/calf-9999-fix-build-with-lld.patch | 27 +++++-------------- 2 files changed, 7 insertions(+), 21 deletions(-) diff --git a/media-plugins/calf/calf-9999.ebuild b/media-plugins/calf/calf-9999.ebuild index f17d2973cb019..644ca320f2ee8 100644 --- a/media-plugins/calf/calf-9999.ebuild +++ b/media-plugins/calf/calf-9999.ebuild @@ -47,7 +47,6 @@ PATCHES=( "${FILESDIR}/${PN}-0.90.1-htmldir.patch" "${FILESDIR}/${PN}-0.90.1-desktop.patch" "${FILESDIR}/${PN}-9999-fix-build-with-lld.patch" - "${FILESDIR}/${PN}-0.90.3-replace-std-bind2nd.patch" ) src_prepare() { diff --git a/media-plugins/calf/files/calf-9999-fix-build-with-lld.patch b/media-plugins/calf/files/calf-9999-fix-build-with-lld.patch index 816da77f7d0db..acd196f6edd2e 100644 --- a/media-plugins/calf/files/calf-9999-fix-build-with-lld.patch +++ b/media-plugins/calf/files/calf-9999-fix-build-with-lld.patch @@ -1,26 +1,13 @@ -From https://github.com/calf-studio-gear/calf/pull/332/commits/bdaaa92dd82e2425e4683b9d496370c5880e3b3e Mon Sep 17 00:00:00 2001 -From: Violet Purcell -Date: Thu, 21 Sep 2023 19:08:39 -0400 -Subject: [PATCH] Fix build with LLD - -LLVM's LLD handles the -retain-symbols-file option (used by --export-symbols-regex in libtool) differently from GNU ld, causing -undefined references during link. This commit removes the --export-symbols-regex option from libcalf_la_LDFLAGS since by default -libtool exports all symbols anyway, so it should not be necessary. - -Signed-off-by: Violet Purcell +diff --git a/src/Makefile.am b/src/Makefile.am +index 6f11628b..0e775bef 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -42,7 +42,7 @@ libcalf_la_LIBADD = $(FLUIDSYNTH_DEPS_LIBS) $(GLIB_DEPS_LIBS) +@@ -53,7 +53,7 @@ libcalflv2gui_la_SOURCES = gui.cpp gui_config.cpp gui_controls.cpp ctl_curve.cpp if USE_DEBUG - libcalf_la_LDFLAGS = -rpath $(pkglibdir) -avoid-version -module -lexpat -disable-static + libcalflv2gui_la_LDFLAGS = -rpath $(lv2dir) -avoid-version -module -lexpat $(GUI_DEPS_LIBS) -disable-static -Wl,-z,nodelete else --libcalf_la_LDFLAGS = -rpath $(pkglibdir) -avoid-version -module -lexpat -disable-static -export-symbols-regex "lv2_descriptor" -+libcalf_la_LDFLAGS = -rpath $(pkglibdir) -avoid-version -module -lexpat -disable-static +-libcalflv2gui_la_LDFLAGS = -rpath $(lv2dir) -avoid-version -module -lexpat -export-symbols-regex "lv2ui_descriptor" $(GUI_DEPS_LIBS) -disable-static -Wl,-z,nodelete ++libcalflv2gui_la_LDFLAGS = -rpath $(lv2dir) -avoid-version -module -lexpat $(GUI_DEPS_LIBS) -disable-static -Wl,-z,nodelete + endif endif - if USE_LV2_GUI --- -2.42.0 -