Attachment #364408 for bug #449370





# FIXME: core should not depend on xcf
workaround_that_core_depends_on_xcf = \
	-Wl,-u,$(SYMPREFIX)xcf_init

# FIXME: core should not depend on pdb
workaround_that_core_depends_on_pdb = \
	-Wl,-u,$(SYMPREFIX)internal_procs_init		\
	-Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore

# FIXME: plug-in should not depend on pdb
workaround_that_plug_in_depends_on_pdb = \
	-Wl,-u,$(SYMPREFIX)gimp_pdb_compat_param_spec

# FIXME: file should not depend on plug-in
workaround_that_file_depends_on_plug_in = \
	-Wl,-u,$(SYMPREFIX)plug_in_icc_profile_apply_rgb	\
	-Wl,-u,$(SYMPREFIX)gimp_image_map_config_get_type

# core, vectors and gegl are on the same architectural layer, prevent
# the linker from panicing
calm_down_linker = \
	-Wl,-u,$(SYMPREFIX)gimp_vectors_undo_get_type	\
	-Wl,-u,$(SYMPREFIX)gimp_vectors_mod_undo_get_type	\
	-Wl,-u,$(SYMPREFIX)gimp_vectors_prop_undo_get_type	\
	-Wl,-u,$(SYMPREFIX)gimp_curve_map_pixels

AM_LDFLAGS = \
	$(munix)					\





# FIXME: core should not depend on xcf
workaround_that_core_depends_on_xcf = \
	-Wl,-u,$(SYMPREFIX)xcf_init


# FIXME: core should not depend on pdb
workaround_that_core_depends_on_pdb = \
	-Wl,-u,$(SYMPREFIX)internal_procs_init		\
	-Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore


# FIXME: plug-in should not depend on pdb
workaround_that_plug_in_depends_on_pdb = \
	-Wl,-u,$(SYMPREFIX)gimp_pdb_compat_param_spec


# FIXME: file should not depend on plug-in
workaround_that_file_depends_on_plug_in = \
	-Wl,-u,$(SYMPREFIX)plug_in_icc_profile_apply_rgb	\
	-Wl,-u,$(SYMPREFIX)gimp_image_map_config_get_type


# core, vectors and gegl are on the same architectural layer, prevent
# the linker from panicing
calm_down_linker = \
	-Wl,-u,$(SYMPREFIX)gimp_vectors_undo_get_type	\
	-Wl,-u,$(SYMPREFIX)gimp_vectors_mod_undo_get_type	\
	-Wl,-u,$(SYMPREFIX)gimp_vectors_prop_undo_get_type	\
	-Wl,-u,$(SYMPREFIX)gimp_curve_map_pixels

AM_LDFLAGS = \
	$(munix)					\




# We need this due to circular dependencies, see more detailed
# comments about it in app/Makefile.am
AM_LDFLAGS = \
	-Wl,-u,$(SYMPREFIX)xcf_init				\
	-Wl,-u,$(SYMPREFIX)base_init			\
	-Wl,-u,$(SYMPREFIX)internal_procs_init		\
	-Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore	\
	-Wl,-u,$(SYMPREFIX)gimp_pdb_compat_param_spec	\
	-Wl,-u,$(SYMPREFIX)gui_init				\
	-Wl,-u,$(SYMPREFIX)plug_in_icc_profile_apply_rgb	\
	-Wl,-u,$(SYMPREFIX)gimp_image_map_config_get_type	\
	-Wl,-u,$(SYMPREFIX)gimp_vectors_undo_get_type	\
	-Wl,-u,$(SYMPREFIX)gimp_vectors_mod_undo_get_type	\
	-Wl,-u,$(SYMPREFIX)gimp_vectors_prop_undo_get_type	\
	-Wl,-u,$(SYMPREFIX)actions_init			\
	-Wl,-u,$(SYMPREFIX)gimp_error_dialog_new		\
	-Wl,-u,$(SYMPREFIX)menus_save			\
	-Wl,-u,$(SYMPREFIX)gimp_tools_save			\
	-Wl,-u,$(SYMPREFIX)gimp_curve_map_pixels

# Note that we have some duplicate entries here too to work around
# circular dependencies and systems on the same architectural layer as




# We need this due to circular dependencies, see more detailed
# comments about it in app/Makefile.am
AM_LDFLAGS = \
	-Wl,-u,$(SYMPREFIX)xcf_init				\
	-Wl,-u,$(SYMPREFIX)base_init			\
	-Wl,-u,$(SYMPREFIX)internal_procs_init		\
	-Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore	\
	-Wl,-u,$(SYMPREFIX)gimp_pdb_compat_param_spec	\
	-Wl,-u,$(SYMPREFIX)gui_init				\
	-Wl,-u,$(SYMPREFIX)plug_in_icc_profile_apply_rgb	\
	-Wl,-u,$(SYMPREFIX)gimp_image_map_config_get_type	\
	-Wl,-u,$(SYMPREFIX)gimp_vectors_undo_get_type	\
	-Wl,-u,$(SYMPREFIX)gimp_vectors_mod_undo_get_type	\
	-Wl,-u,$(SYMPREFIX)gimp_vectors_prop_undo_get_type	\
	-Wl,-u,$(SYMPREFIX)actions_init			\
	-Wl,-u,$(SYMPREFIX)gimp_error_dialog_new		\
	-Wl,-u,$(SYMPREFIX)menus_save			\
	-Wl,-u,$(SYMPREFIX)gimp_tools_save			\
	-Wl,-u,$(SYMPREFIX)gimp_curve_map_pixels


# Note that we have some duplicate entries here too to work around

Lines 62-71 Link Here

(-)devel-docs/app/Makefile.am.orig (-4 / +4 lines)
62	-UGTK_DISABLE_SINGLE_INCLUDES	62	-UGTK_DISABLE_SINGLE_INCLUDES
63		63
64	GTKDOC_LIBS = \	64	GTKDOC_LIBS = \
65	-u $(SYMPREFIX)xcf_init \	65	-Wl,-u,$(SYMPREFIX)xcf_init \
66	-u $(SYMPREFIX)internal_procs_init \	66	-Wl,-u,$(SYMPREFIX)internal_procs_init \
67	-u $(SYMPREFIX)gimp_coords_mix \	67	-Wl,-u,$(SYMPREFIX)gimp_coords_mix \
68	-u $(SYMPREFIX)gimp_plug_in_manager_restore \	68	-Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore \
69	$(top_builddir)/app/app.o \	69	$(top_builddir)/app/app.o \
70	$(top_builddir)/app/batch.o \	70	$(top_builddir)/app/batch.o \
71	$(top_builddir)/app/errors.o \	71	$(top_builddir)/app/errors.o \

Lines 511-520 Link Here

(-)devel-docs/app/Makefile.in.orig (-4 / +4 lines)
511	-UGTK_DISABLE_SINGLE_INCLUDES	511	-UGTK_DISABLE_SINGLE_INCLUDES
512		512
513	GTKDOC_LIBS = \	513	GTKDOC_LIBS = \
514	-u $(SYMPREFIX)xcf_init \	514	-Wl,-u,$(SYMPREFIX)xcf_init \
515	-u $(SYMPREFIX)internal_procs_init \	515	-Wl,-u,$(SYMPREFIX)internal_procs_init \
516	-u $(SYMPREFIX)gimp_coords_mix \	516	-Wl,-u,$(SYMPREFIX)gimp_coords_mix \
517	-u $(SYMPREFIX)gimp_plug_in_manager_restore \	517	-Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore \
518	$(top_builddir)/app/app.o \	518	$(top_builddir)/app/app.o \
519	$(top_builddir)/app/batch.o \	519	$(top_builddir)/app/batch.o \
520	$(top_builddir)/app/errors.o \	520	$(top_builddir)/app/errors.o \

Return to bug 449370

Lines 1221-1242 Link Here

(-)app/tests/Makefile.in.orig (-16 / +16 lines)
1221	# We need this due to circular dependencies, see more detailed	1221	# We need this due to circular dependencies, see more detailed
1222	# comments about it in app/Makefile.am	1222	# comments about it in app/Makefile.am
1223	AM_LDFLAGS = \	1223	AM_LDFLAGS = \
1224	-u $(SYMPREFIX)xcf_init \	1224	-Wl,-u,$(SYMPREFIX)xcf_init \
1225	-u $(SYMPREFIX)base_init \	1225	-Wl,-u,$(SYMPREFIX)base_init \
1226	-u $(SYMPREFIX)internal_procs_init \	1226	-Wl,-u,$(SYMPREFIX)internal_procs_init \
1227	-u $(SYMPREFIX)gimp_plug_in_manager_restore \	1227	-Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore \
1228	-u $(SYMPREFIX)gimp_pdb_compat_param_spec \	1228	-Wl,-u,$(SYMPREFIX)gimp_pdb_compat_param_spec \
1229	-u $(SYMPREFIX)gui_init \	1229	-Wl,-u,$(SYMPREFIX)gui_init \
1230	-u $(SYMPREFIX)plug_in_icc_profile_apply_rgb \	1230	-Wl,-u,$(SYMPREFIX)plug_in_icc_profile_apply_rgb \
1231	-u $(SYMPREFIX)gimp_image_map_config_get_type \	1231	-Wl,-u,$(SYMPREFIX)gimp_image_map_config_get_type \
1232	-u $(SYMPREFIX)gimp_vectors_undo_get_type \	1232	-Wl,-u,$(SYMPREFIX)gimp_vectors_undo_get_type \
1233	-u $(SYMPREFIX)gimp_vectors_mod_undo_get_type \	1233	-Wl,-u,$(SYMPREFIX)gimp_vectors_mod_undo_get_type \
1234	-u $(SYMPREFIX)gimp_vectors_prop_undo_get_type \	1234	-Wl,-u,$(SYMPREFIX)gimp_vectors_prop_undo_get_type \
1235	-u $(SYMPREFIX)actions_init \	1235	-Wl,-u,$(SYMPREFIX)actions_init \
1236	-u $(SYMPREFIX)gimp_error_dialog_new \	1236	-Wl,-u,$(SYMPREFIX)gimp_error_dialog_new \
1237	-u $(SYMPREFIX)menus_save \	1237	-Wl,-u,$(SYMPREFIX)menus_save \
1238	-u $(SYMPREFIX)gimp_tools_save \	1238	-Wl,-u,$(SYMPREFIX)gimp_tools_save \
1239	-u $(SYMPREFIX)gimp_curve_map_pixels	1239	-Wl,-u,$(SYMPREFIX)gimp_curve_map_pixels
1240		1240
1241		1241
1242	# Note that we have some duplicate entries here too to work around	1242	# Note that we have some duplicate entries here too to work around

Lines 120-148 Link Here

(-)app/Makefile.am.orig (-10 / +10 lines)
120		120
121	# FIXME: core should not depend on xcf	121	# FIXME: core should not depend on xcf
122	workaround_that_core_depends_on_xcf = \	122	workaround_that_core_depends_on_xcf = \
123	-u $(SYMPREFIX)xcf_init	123	-Wl,-u,$(SYMPREFIX)xcf_init
124		124
125	# FIXME: core should not depend on pdb	125	# FIXME: core should not depend on pdb
126	workaround_that_core_depends_on_pdb = \	126	workaround_that_core_depends_on_pdb = \
127	-u $(SYMPREFIX)internal_procs_init \	127	-Wl,-u,$(SYMPREFIX)internal_procs_init \
128	-u $(SYMPREFIX)gimp_plug_in_manager_restore	128	-Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore
129		129
130	# FIXME: plug-in should not depend on pdb	130	# FIXME: plug-in should not depend on pdb
131	workaround_that_plug_in_depends_on_pdb = \	131	workaround_that_plug_in_depends_on_pdb = \
132	-u $(SYMPREFIX)gimp_pdb_compat_param_spec	132	-Wl,-u,$(SYMPREFIX)gimp_pdb_compat_param_spec
133		133
134	# FIXME: file should not depend on plug-in	134	# FIXME: file should not depend on plug-in
135	workaround_that_file_depends_on_plug_in = \	135	workaround_that_file_depends_on_plug_in = \
136	-u $(SYMPREFIX)plug_in_icc_profile_apply_rgb \	136	-Wl,-u,$(SYMPREFIX)plug_in_icc_profile_apply_rgb \
137	-u $(SYMPREFIX)gimp_image_map_config_get_type	137	-Wl,-u,$(SYMPREFIX)gimp_image_map_config_get_type
138		138
139	# core, vectors and gegl are on the same architectural layer, prevent	139	# core, vectors and gegl are on the same architectural layer, prevent
140	# the linker from panicing	140	# the linker from panicing
141	calm_down_linker = \	141	calm_down_linker = \
142	-u $(SYMPREFIX)gimp_vectors_undo_get_type \	142	-Wl,-u,$(SYMPREFIX)gimp_vectors_undo_get_type \
143	-u $(SYMPREFIX)gimp_vectors_mod_undo_get_type \	143	-Wl,-u,$(SYMPREFIX)gimp_vectors_mod_undo_get_type \
144	-u $(SYMPREFIX)gimp_vectors_prop_undo_get_type \	144	-Wl,-u,$(SYMPREFIX)gimp_vectors_prop_undo_get_type \
145	-u $(SYMPREFIX)gimp_curve_map_pixels	145	-Wl,-u,$(SYMPREFIX)gimp_curve_map_pixels
146		146
147	AM_LDFLAGS = \	147	AM_LDFLAGS = \
148	$(munix) \	148	$(munix) \

Lines 702-734 Link Here

(-)app/Makefile.in.orig (-10 / +10 lines)
702		702
703	# FIXME: core should not depend on xcf	703	# FIXME: core should not depend on xcf
704	workaround_that_core_depends_on_xcf = \	704	workaround_that_core_depends_on_xcf = \
705	-u $(SYMPREFIX)xcf_init	705	-Wl,-u,$(SYMPREFIX)xcf_init
706		706
707		707
708	# FIXME: core should not depend on pdb	708	# FIXME: core should not depend on pdb
709	workaround_that_core_depends_on_pdb = \	709	workaround_that_core_depends_on_pdb = \
710	-u $(SYMPREFIX)internal_procs_init \	710	-Wl,-u,$(SYMPREFIX)internal_procs_init \
711	-u $(SYMPREFIX)gimp_plug_in_manager_restore	711	-Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore
712		712
713		713
714	# FIXME: plug-in should not depend on pdb	714	# FIXME: plug-in should not depend on pdb
715	workaround_that_plug_in_depends_on_pdb = \	715	workaround_that_plug_in_depends_on_pdb = \
716	-u $(SYMPREFIX)gimp_pdb_compat_param_spec	716	-Wl,-u,$(SYMPREFIX)gimp_pdb_compat_param_spec
717		717
718		718
719	# FIXME: file should not depend on plug-in	719	# FIXME: file should not depend on plug-in
720	workaround_that_file_depends_on_plug_in = \	720	workaround_that_file_depends_on_plug_in = \
721	-u $(SYMPREFIX)plug_in_icc_profile_apply_rgb \	721	-Wl,-u,$(SYMPREFIX)plug_in_icc_profile_apply_rgb \
722	-u $(SYMPREFIX)gimp_image_map_config_get_type	722	-Wl,-u,$(SYMPREFIX)gimp_image_map_config_get_type
723		723
724		724
725	# core, vectors and gegl are on the same architectural layer, prevent	725	# core, vectors and gegl are on the same architectural layer, prevent
726	# the linker from panicing	726	# the linker from panicing
727	calm_down_linker = \	727	calm_down_linker = \
728	-u $(SYMPREFIX)gimp_vectors_undo_get_type \	728	-Wl,-u,$(SYMPREFIX)gimp_vectors_undo_get_type \
729	-u $(SYMPREFIX)gimp_vectors_mod_undo_get_type \	729	-Wl,-u,$(SYMPREFIX)gimp_vectors_mod_undo_get_type \
730	-u $(SYMPREFIX)gimp_vectors_prop_undo_get_type \	730	-Wl,-u,$(SYMPREFIX)gimp_vectors_prop_undo_get_type \
731	-u $(SYMPREFIX)gimp_curve_map_pixels	731	-Wl,-u,$(SYMPREFIX)gimp_curve_map_pixels
732		732
733	AM_LDFLAGS = \	733	AM_LDFLAGS = \
734	$(munix) \	734	$(munix) \

Lines 63-84 Link Here

(-)app/tests/Makefile.am.orig (-16 / +16 lines)
63	# We need this due to circular dependencies, see more detailed	63	# We need this due to circular dependencies, see more detailed
64	# comments about it in app/Makefile.am	64	# comments about it in app/Makefile.am
65	AM_LDFLAGS = \	65	AM_LDFLAGS = \
66	-u $(SYMPREFIX)xcf_init \	66	-Wl,-u,$(SYMPREFIX)xcf_init \
67	-u $(SYMPREFIX)base_init \	67	-Wl,-u,$(SYMPREFIX)base_init \
68	-u $(SYMPREFIX)internal_procs_init \	68	-Wl,-u,$(SYMPREFIX)internal_procs_init \
69	-u $(SYMPREFIX)gimp_plug_in_manager_restore \	69	-Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore \
70	-u $(SYMPREFIX)gimp_pdb_compat_param_spec \	70	-Wl,-u,$(SYMPREFIX)gimp_pdb_compat_param_spec \
71	-u $(SYMPREFIX)gui_init \	71	-Wl,-u,$(SYMPREFIX)gui_init \
72	-u $(SYMPREFIX)plug_in_icc_profile_apply_rgb \	72	-Wl,-u,$(SYMPREFIX)plug_in_icc_profile_apply_rgb \
73	-u $(SYMPREFIX)gimp_image_map_config_get_type \	73	-Wl,-u,$(SYMPREFIX)gimp_image_map_config_get_type \
74	-u $(SYMPREFIX)gimp_vectors_undo_get_type \	74	-Wl,-u,$(SYMPREFIX)gimp_vectors_undo_get_type \
75	-u $(SYMPREFIX)gimp_vectors_mod_undo_get_type \	75	-Wl,-u,$(SYMPREFIX)gimp_vectors_mod_undo_get_type \
76	-u $(SYMPREFIX)gimp_vectors_prop_undo_get_type \	76	-Wl,-u,$(SYMPREFIX)gimp_vectors_prop_undo_get_type \
77	-u $(SYMPREFIX)actions_init \	77	-Wl,-u,$(SYMPREFIX)actions_init \
78	-u $(SYMPREFIX)gimp_error_dialog_new \	78	-Wl,-u,$(SYMPREFIX)gimp_error_dialog_new \
79	-u $(SYMPREFIX)menus_save \	79	-Wl,-u,$(SYMPREFIX)menus_save \
80	-u $(SYMPREFIX)gimp_tools_save \	80	-Wl,-u,$(SYMPREFIX)gimp_tools_save \
81	-u $(SYMPREFIX)gimp_curve_map_pixels	81	-Wl,-u,$(SYMPREFIX)gimp_curve_map_pixels
82		82
83	# Note that we have some duplicate entries here too to work around	83	# Note that we have some duplicate entries here too to work around
84	# circular dependencies and systems on the same architectural layer as	84	# circular dependencies and systems on the same architectural layer as