d885cb58c8
gcc-compiled libcalf.so was crashing due to mix of gcc- and base-provided libc++.so and libstdc++.so
PR: 258051
Original patch submitted by: Florian Walpen <dev@submerge.ch>
(cherry picked from commit 866b394fc6)
36 lines
2.3 KiB
Plaintext
36 lines
2.3 KiB
Plaintext
--- src/Makefile.am.orig 2021-06-25 19:25:29 UTC
|
|
+++ src/Makefile.am
|
|
@@ -40,9 +40,9 @@ calfbenchmark_LDADD = libcalf.la
|
|
libcalf_la_SOURCES = audio_fx.cpp analyzer.cpp lv2wrap.cpp metadata.cpp modules_tools.cpp modules_delay.cpp modules_comp.cpp modules_limit.cpp modules_dist.cpp modules_filter.cpp modules_mod.cpp modules_pitch.cpp fluidsynth.cpp giface.cpp monosynth.cpp organ.cpp osctl.cpp plugin.cpp preset.cpp synth.cpp utils.cpp wavetable.cpp modmatrix.cpp
|
|
libcalf_la_LIBADD = $(FLUIDSYNTH_DEPS_LIBS) $(GLIB_DEPS_LIBS)
|
|
if USE_DEBUG
|
|
-libcalf_la_LDFLAGS = -rpath $(pkglibdir) -avoid-version -module -lexpat -disable-static
|
|
+libcalf_la_LDFLAGS = -rpath $(pkglibdir) -avoid-version -lexpat -disable-static
|
|
else
|
|
-libcalf_la_LDFLAGS = -rpath $(pkglibdir) -avoid-version -module -lexpat -disable-static -export-symbols-regex "lv2_descriptor"
|
|
+libcalf_la_LDFLAGS = -rpath $(pkglibdir) -avoid-version -lexpat -disable-static
|
|
endif
|
|
|
|
if USE_LV2_GUI
|
|
@@ -55,9 +55,9 @@ pkglib_LTLIBRARIES += libcalflv2gui.la
|
|
libcalflv2gui_la_SOURCES = gui.cpp gui_config.cpp gui_controls.cpp ctl_curve.cpp ctl_keyboard.cpp ctl_knob.cpp ctl_led.cpp ctl_tube.cpp ctl_vumeter.cpp ctl_frame.cpp ctl_fader.cpp ctl_buttons.cpp ctl_notebook.cpp ctl_meterscale.cpp ctl_combobox.cpp ctl_tuner.cpp ctl_phasegraph.cpp ctl_pattern.cpp metadata.cpp giface.cpp plugin_gui_window.cpp preset.cpp preset_gui.cpp lv2gui.cpp osctl.cpp utils.cpp ctl_linegraph.cpp drawingutils.cpp
|
|
|
|
if USE_DEBUG
|
|
-libcalflv2gui_la_LDFLAGS = -rpath $(lv2dir) -avoid-version -module -lexpat $(GUI_DEPS_LIBS) -disable-static -Wl,-z,nodelete
|
|
+libcalflv2gui_la_LDFLAGS = -rpath $(lv2dir) -avoid-version -lexpat $(GUI_DEPS_LIBS) -disable-static -Wl,-z,nodelete
|
|
else
|
|
-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 -lexpat -export-symbols-regex "lv2ui_descriptor" $(GUI_DEPS_LIBS) -disable-static -Wl,-z,nodelete
|
|
endif
|
|
endif
|
|
|
|
@@ -79,7 +79,7 @@ if USE_GUI
|
|
endif
|
|
if USE_LV2
|
|
install -d -m 755 $(DESTDIR)$(lv2dir)
|
|
- ln -sf $(pkglibdir)/calf.so $(DESTDIR)$(lv2dir)/calf.so
|
|
+ ln -sf $(pkglibdir)/libcalf.so $(DESTDIR)$(lv2dir)/calf.so
|
|
rm -f $(DESTDIR)$(lv2dir)/*.ttl
|
|
$(top_builddir)/src/calfmakerdf -m ttl -p $(DESTDIR)$(lv2dir)/ -d $(DESTDIR)$(pkgdatadir)/
|
|
if USE_SORDI
|