| 1 |
hasufell 14/01/25 18:54:55 |
| 2 |
|
| 3 |
Added: gimp-2.8.10-clang.patch |
| 4 |
Log: |
| 5 |
fix build with clang wrt #449370 |
| 6 |
|
| 7 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key E73C35B3) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 media-gfx/gimp/files/gimp-2.8.10-clang.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gimp/files/gimp-2.8.10-clang.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gimp/files/gimp-2.8.10-clang.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: gimp-2.8.10-clang.patch |
| 16 |
=================================================================== |
| 17 |
--- app/Makefile.am |
| 18 |
+++ app/Makefile.am |
| 19 |
@@ -120,29 +120,29 @@ |
| 20 |
|
| 21 |
# FIXME: core should not depend on xcf |
| 22 |
workaround_that_core_depends_on_xcf = \ |
| 23 |
- -u $(SYMPREFIX)xcf_init |
| 24 |
+ -Wl,-u,$(SYMPREFIX)xcf_init |
| 25 |
|
| 26 |
# FIXME: core should not depend on pdb |
| 27 |
workaround_that_core_depends_on_pdb = \ |
| 28 |
- -u $(SYMPREFIX)internal_procs_init \ |
| 29 |
- -u $(SYMPREFIX)gimp_plug_in_manager_restore |
| 30 |
+ -Wl,-u,$(SYMPREFIX)internal_procs_init \ |
| 31 |
+ -Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore |
| 32 |
|
| 33 |
# FIXME: plug-in should not depend on pdb |
| 34 |
workaround_that_plug_in_depends_on_pdb = \ |
| 35 |
- -u $(SYMPREFIX)gimp_pdb_compat_param_spec |
| 36 |
+ -Wl,-u,$(SYMPREFIX)gimp_pdb_compat_param_spec |
| 37 |
|
| 38 |
# FIXME: file should not depend on plug-in |
| 39 |
workaround_that_file_depends_on_plug_in = \ |
| 40 |
- -u $(SYMPREFIX)plug_in_icc_profile_apply_rgb \ |
| 41 |
- -u $(SYMPREFIX)gimp_image_map_config_get_type |
| 42 |
+ -Wl,-u,$(SYMPREFIX)plug_in_icc_profile_apply_rgb \ |
| 43 |
+ -Wl,-u,$(SYMPREFIX)gimp_image_map_config_get_type |
| 44 |
|
| 45 |
# core, vectors and gegl are on the same architectural layer, prevent |
| 46 |
# the linker from panicing |
| 47 |
calm_down_linker = \ |
| 48 |
- -u $(SYMPREFIX)gimp_vectors_undo_get_type \ |
| 49 |
- -u $(SYMPREFIX)gimp_vectors_mod_undo_get_type \ |
| 50 |
- -u $(SYMPREFIX)gimp_vectors_prop_undo_get_type \ |
| 51 |
- -u $(SYMPREFIX)gimp_curve_map_pixels |
| 52 |
+ -Wl,-u,$(SYMPREFIX)gimp_vectors_undo_get_type \ |
| 53 |
+ -Wl,-u,$(SYMPREFIX)gimp_vectors_mod_undo_get_type \ |
| 54 |
+ -Wl,-u,$(SYMPREFIX)gimp_vectors_prop_undo_get_type \ |
| 55 |
+ -Wl,-u,$(SYMPREFIX)gimp_curve_map_pixels |
| 56 |
|
| 57 |
AM_LDFLAGS = \ |
| 58 |
$(munix) \ |
| 59 |
--- app/Makefile.in |
| 60 |
+++ app/Makefile.in |
| 61 |
@@ -702,33 +702,33 @@ |
| 62 |
|
| 63 |
# FIXME: core should not depend on xcf |
| 64 |
workaround_that_core_depends_on_xcf = \ |
| 65 |
- -u $(SYMPREFIX)xcf_init |
| 66 |
+ -Wl,-u,$(SYMPREFIX)xcf_init |
| 67 |
|
| 68 |
|
| 69 |
# FIXME: core should not depend on pdb |
| 70 |
workaround_that_core_depends_on_pdb = \ |
| 71 |
- -u $(SYMPREFIX)internal_procs_init \ |
| 72 |
- -u $(SYMPREFIX)gimp_plug_in_manager_restore |
| 73 |
+ -Wl,-u,$(SYMPREFIX)internal_procs_init \ |
| 74 |
+ -Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore |
| 75 |
|
| 76 |
|
| 77 |
# FIXME: plug-in should not depend on pdb |
| 78 |
workaround_that_plug_in_depends_on_pdb = \ |
| 79 |
- -u $(SYMPREFIX)gimp_pdb_compat_param_spec |
| 80 |
+ -Wl,-u,$(SYMPREFIX)gimp_pdb_compat_param_spec |
| 81 |
|
| 82 |
|
| 83 |
# FIXME: file should not depend on plug-in |
| 84 |
workaround_that_file_depends_on_plug_in = \ |
| 85 |
- -u $(SYMPREFIX)plug_in_icc_profile_apply_rgb \ |
| 86 |
- -u $(SYMPREFIX)gimp_image_map_config_get_type |
| 87 |
+ -Wl,-u,$(SYMPREFIX)plug_in_icc_profile_apply_rgb \ |
| 88 |
+ -Wl,-u,$(SYMPREFIX)gimp_image_map_config_get_type |
| 89 |
|
| 90 |
|
| 91 |
# core, vectors and gegl are on the same architectural layer, prevent |
| 92 |
# the linker from panicing |
| 93 |
calm_down_linker = \ |
| 94 |
- -u $(SYMPREFIX)gimp_vectors_undo_get_type \ |
| 95 |
- -u $(SYMPREFIX)gimp_vectors_mod_undo_get_type \ |
| 96 |
- -u $(SYMPREFIX)gimp_vectors_prop_undo_get_type \ |
| 97 |
- -u $(SYMPREFIX)gimp_curve_map_pixels |
| 98 |
+ -Wl,-u,$(SYMPREFIX)gimp_vectors_undo_get_type \ |
| 99 |
+ -Wl,-u,$(SYMPREFIX)gimp_vectors_mod_undo_get_type \ |
| 100 |
+ -Wl,-u,$(SYMPREFIX)gimp_vectors_prop_undo_get_type \ |
| 101 |
+ -Wl,-u,$(SYMPREFIX)gimp_curve_map_pixels |
| 102 |
|
| 103 |
AM_LDFLAGS = \ |
| 104 |
$(munix) \ |
| 105 |
--- app/tests/Makefile.am |
| 106 |
+++ app/tests/Makefile.am |
| 107 |
@@ -63,22 +63,22 @@ |
| 108 |
# We need this due to circular dependencies, see more detailed |
| 109 |
# comments about it in app/Makefile.am |
| 110 |
AM_LDFLAGS = \ |
| 111 |
- -u $(SYMPREFIX)xcf_init \ |
| 112 |
- -u $(SYMPREFIX)base_init \ |
| 113 |
- -u $(SYMPREFIX)internal_procs_init \ |
| 114 |
- -u $(SYMPREFIX)gimp_plug_in_manager_restore \ |
| 115 |
- -u $(SYMPREFIX)gimp_pdb_compat_param_spec \ |
| 116 |
- -u $(SYMPREFIX)gui_init \ |
| 117 |
- -u $(SYMPREFIX)plug_in_icc_profile_apply_rgb \ |
| 118 |
- -u $(SYMPREFIX)gimp_image_map_config_get_type \ |
| 119 |
- -u $(SYMPREFIX)gimp_vectors_undo_get_type \ |
| 120 |
- -u $(SYMPREFIX)gimp_vectors_mod_undo_get_type \ |
| 121 |
- -u $(SYMPREFIX)gimp_vectors_prop_undo_get_type \ |
| 122 |
- -u $(SYMPREFIX)actions_init \ |
| 123 |
- -u $(SYMPREFIX)gimp_error_dialog_new \ |
| 124 |
- -u $(SYMPREFIX)menus_save \ |
| 125 |
- -u $(SYMPREFIX)gimp_tools_save \ |
| 126 |
- -u $(SYMPREFIX)gimp_curve_map_pixels |
| 127 |
+ -Wl,-u,$(SYMPREFIX)xcf_init \ |
| 128 |
+ -Wl,-u,$(SYMPREFIX)base_init \ |
| 129 |
+ -Wl,-u,$(SYMPREFIX)internal_procs_init \ |
| 130 |
+ -Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore \ |
| 131 |
+ -Wl,-u,$(SYMPREFIX)gimp_pdb_compat_param_spec \ |
| 132 |
+ -Wl,-u,$(SYMPREFIX)gui_init \ |
| 133 |
+ -Wl,-u,$(SYMPREFIX)plug_in_icc_profile_apply_rgb \ |
| 134 |
+ -Wl,-u,$(SYMPREFIX)gimp_image_map_config_get_type \ |
| 135 |
+ -Wl,-u,$(SYMPREFIX)gimp_vectors_undo_get_type \ |
| 136 |
+ -Wl,-u,$(SYMPREFIX)gimp_vectors_mod_undo_get_type \ |
| 137 |
+ -Wl,-u,$(SYMPREFIX)gimp_vectors_prop_undo_get_type \ |
| 138 |
+ -Wl,-u,$(SYMPREFIX)actions_init \ |
| 139 |
+ -Wl,-u,$(SYMPREFIX)gimp_error_dialog_new \ |
| 140 |
+ -Wl,-u,$(SYMPREFIX)menus_save \ |
| 141 |
+ -Wl,-u,$(SYMPREFIX)gimp_tools_save \ |
| 142 |
+ -Wl,-u,$(SYMPREFIX)gimp_curve_map_pixels |
| 143 |
|
| 144 |
# Note that we have some duplicate entries here too to work around |
| 145 |
# circular dependencies and systems on the same architectural layer as |
| 146 |
--- app/tests/Makefile.in |
| 147 |
+++ app/tests/Makefile.in |
| 148 |
@@ -1221,22 +1221,22 @@ |
| 149 |
# We need this due to circular dependencies, see more detailed |
| 150 |
# comments about it in app/Makefile.am |
| 151 |
AM_LDFLAGS = \ |
| 152 |
- -u $(SYMPREFIX)xcf_init \ |
| 153 |
- -u $(SYMPREFIX)base_init \ |
| 154 |
- -u $(SYMPREFIX)internal_procs_init \ |
| 155 |
- -u $(SYMPREFIX)gimp_plug_in_manager_restore \ |
| 156 |
- -u $(SYMPREFIX)gimp_pdb_compat_param_spec \ |
| 157 |
- -u $(SYMPREFIX)gui_init \ |
| 158 |
- -u $(SYMPREFIX)plug_in_icc_profile_apply_rgb \ |
| 159 |
- -u $(SYMPREFIX)gimp_image_map_config_get_type \ |
| 160 |
- -u $(SYMPREFIX)gimp_vectors_undo_get_type \ |
| 161 |
- -u $(SYMPREFIX)gimp_vectors_mod_undo_get_type \ |
| 162 |
- -u $(SYMPREFIX)gimp_vectors_prop_undo_get_type \ |
| 163 |
- -u $(SYMPREFIX)actions_init \ |
| 164 |
- -u $(SYMPREFIX)gimp_error_dialog_new \ |
| 165 |
- -u $(SYMPREFIX)menus_save \ |
| 166 |
- -u $(SYMPREFIX)gimp_tools_save \ |
| 167 |
- -u $(SYMPREFIX)gimp_curve_map_pixels |
| 168 |
+ -Wl,-u,$(SYMPREFIX)xcf_init \ |
| 169 |
+ -Wl,-u,$(SYMPREFIX)base_init \ |
| 170 |
+ -Wl,-u,$(SYMPREFIX)internal_procs_init \ |
| 171 |
+ -Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore \ |
| 172 |
+ -Wl,-u,$(SYMPREFIX)gimp_pdb_compat_param_spec \ |
| 173 |
+ -Wl,-u,$(SYMPREFIX)gui_init \ |
| 174 |
+ -Wl,-u,$(SYMPREFIX)plug_in_icc_profile_apply_rgb \ |
| 175 |
+ -Wl,-u,$(SYMPREFIX)gimp_image_map_config_get_type \ |
| 176 |
+ -Wl,-u,$(SYMPREFIX)gimp_vectors_undo_get_type \ |
| 177 |
+ -Wl,-u,$(SYMPREFIX)gimp_vectors_mod_undo_get_type \ |
| 178 |
+ -Wl,-u,$(SYMPREFIX)gimp_vectors_prop_undo_get_type \ |
| 179 |
+ -Wl,-u,$(SYMPREFIX)actions_init \ |
| 180 |
+ -Wl,-u,$(SYMPREFIX)gimp_error_dialog_new \ |
| 181 |
+ -Wl,-u,$(SYMPREFIX)menus_save \ |
| 182 |
+ -Wl,-u,$(SYMPREFIX)gimp_tools_save \ |
| 183 |
+ -Wl,-u,$(SYMPREFIX)gimp_curve_map_pixels |
| 184 |
|
| 185 |
|
| 186 |
# Note that we have some duplicate entries here too to work around |
| 187 |
--- devel-docs/app/Makefile.am |
| 188 |
+++ devel-docs/app/Makefile.am |
| 189 |
@@ -62,10 +62,10 @@ |
| 190 |
-UGTK_DISABLE_SINGLE_INCLUDES |
| 191 |
|
| 192 |
GTKDOC_LIBS = \ |
| 193 |
- -u $(SYMPREFIX)xcf_init \ |
| 194 |
- -u $(SYMPREFIX)internal_procs_init \ |
| 195 |
- -u $(SYMPREFIX)gimp_coords_mix \ |
| 196 |
- -u $(SYMPREFIX)gimp_plug_in_manager_restore \ |
| 197 |
+ -Wl,-u,$(SYMPREFIX)xcf_init \ |
| 198 |
+ -Wl,-u,$(SYMPREFIX)internal_procs_init \ |
| 199 |
+ -Wl,-u,$(SYMPREFIX)gimp_coords_mix \ |
| 200 |
+ -Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore \ |
| 201 |
$(top_builddir)/app/app.o \ |
| 202 |
$(top_builddir)/app/batch.o \ |
| 203 |
$(top_builddir)/app/errors.o \ |
| 204 |
--- devel-docs/app/Makefile.in |
| 205 |
+++ devel-docs/app/Makefile.in |
| 206 |
@@ -511,10 +511,10 @@ |
| 207 |
-UGTK_DISABLE_SINGLE_INCLUDES |
| 208 |
|
| 209 |
GTKDOC_LIBS = \ |
| 210 |
- -u $(SYMPREFIX)xcf_init \ |
| 211 |
- -u $(SYMPREFIX)internal_procs_init \ |
| 212 |
- -u $(SYMPREFIX)gimp_coords_mix \ |
| 213 |
- -u $(SYMPREFIX)gimp_plug_in_manager_restore \ |
| 214 |
+ -Wl,-u,$(SYMPREFIX)xcf_init \ |
| 215 |
+ -Wl,-u,$(SYMPREFIX)internal_procs_init \ |
| 216 |
+ -Wl,-u,$(SYMPREFIX)gimp_coords_mix \ |
| 217 |
+ -Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore \ |
| 218 |
$(top_builddir)/app/app.o \ |
| 219 |
$(top_builddir)/app/batch.o \ |
| 220 |
$(top_builddir)/app/errors.o \ |
Archives