| 1 |
commit: 2d2bdbe30102051df11a309541b172115cfa7f55 |
| 2 |
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu May 14 20:30:13 2020 +0000 |
| 4 |
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu May 14 20:30:13 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d2bdbe3 |
| 7 |
|
| 8 |
dev-ml/lablgtk: uses CFLAGS and fix -fno-common |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/721952 |
| 11 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
| 12 |
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> |
| 13 |
|
| 14 |
dev-ml/lablgtk/files/lablgtk-2.18.10-cflags.patch | 97 +++++++++++++++++++++++ |
| 15 |
dev-ml/lablgtk/lablgtk-2.18.10.ebuild | 8 +- |
| 16 |
2 files changed, 103 insertions(+), 2 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-ml/lablgtk/files/lablgtk-2.18.10-cflags.patch b/dev-ml/lablgtk/files/lablgtk-2.18.10-cflags.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..9cbc94a8a03 |
| 21 |
--- /dev/null |
| 22 |
+++ b/dev-ml/lablgtk/files/lablgtk-2.18.10-cflags.patch |
| 23 |
@@ -0,0 +1,97 @@ |
| 24 |
+--- a/src/Makefile 2020-05-14 22:01:09.565870733 +0200 |
| 25 |
++++ b/src/Makefile 2020-05-14 22:06:49.081621996 +0200 |
| 26 |
+@@ -18,6 +18,7 @@ |
| 27 |
+ |
| 28 |
+ include $(CONFIG) |
| 29 |
+ #GTKCFLAGS += -Werror -Wno-error=deprecated-declarations |
| 30 |
++CFLAGS= |
| 31 |
+ |
| 32 |
+ TARGETS = varcc$(XE) lablgtktop$(XE) lablgtk2$(XB) gdk_pixbuf_mlsource$(XE) \ |
| 33 |
+ $(THINITOBJS) build.ml |
| 34 |
+@@ -45,14 +46,13 @@ |
| 35 |
+ |
| 36 |
+ ifdef DEBUG |
| 37 |
+ COMPILER += -warn-error A-52 |
| 38 |
+-CFLAGS = -g $(GTKCFLAGS) |
| 39 |
++OCAMLCFLAGS = $(GTKCFLAGS) |
| 40 |
+ CUSTOM = -custom |
| 41 |
+ #MLLINK += -cclib -lcamlrund |
| 42 |
+ MLBYTEFLAGS = -g -dtypes |
| 43 |
+ else |
| 44 |
+-CFLAGS = -DG_DISABLE_ASSERT -DG_DISABLE_CAST_CHECKS $(GTKCFLAGS) |
| 45 |
++OCAMLCFLAGS = -DG_DISABLE_ASSERT -DG_DISABLE_CAST_CHECKS $(GTKCFLAGS) |
| 46 |
+ ifneq ($(TOOLCHAIN),msvc) |
| 47 |
+-CFLAGS += -O |
| 48 |
+ endif |
| 49 |
+ endif |
| 50 |
+ |
| 51 |
+@@ -65,9 +65,9 @@ |
| 52 |
+ THLINK = unix.cma threads.cma |
| 53 |
+ |
| 54 |
+ ifdef USE_CC |
| 55 |
+-CCOMPILER = $(CC) -c -I"$(LIBDIR)" $(CFLAGS) |
| 56 |
++CCOMPILER = $(CC) -c -I"$(LIBDIR)" $(OCAMLCFLAGS) $(CFLAGS) |
| 57 |
+ else |
| 58 |
+-CCOMPILER = $(CAMLC) -c -ccopt '$(CFLAGS)' -verbose |
| 59 |
++CCOMPILER = $(CAMLC) -c -ccopt '$(OCAMLCFLAGS) $(CFLAGS)' -verbose |
| 60 |
+ endif |
| 61 |
+ |
| 62 |
+ ifdef USE_GL |
| 63 |
+@@ -123,7 +123,7 @@ |
| 64 |
+ CLIBS += liblablrsvg$(XA) |
| 65 |
+ RSVGMLOBJS = rsvg.cmo |
| 66 |
+ RSVGCOBJS = ml_rsvg$(XO) |
| 67 |
+-$(RSVGCOBJS) : CFLAGS+=$(HAVE_SVGZ) |
| 68 |
++$(RSVGCOBJS) : OCAMLCFLAGS+=$(HAVE_SVGZ) |
| 69 |
+ endif |
| 70 |
+ |
| 71 |
+ ifdef USE_GTKSPELL |
| 72 |
+@@ -140,7 +140,7 @@ |
| 73 |
+ opt:: lablgtksourceview.cmxs |
| 74 |
+ endif |
| 75 |
+ |
| 76 |
+-ml_gtksourceview.o: CFLAGS=$(GTKSOURCEVIEWCFLAGS) |
| 77 |
++ml_gtksourceview.o: OCAMLCFLAGS=$(GTKSOURCEVIEWCFLAGS) |
| 78 |
+ GTKSOURCEVIEWMLOBJS = gtkSourceView.cmo gSourceView.cmo |
| 79 |
+ GTKSOURCEVIEWCOBJS = ml_gtksourceview$(XO) |
| 80 |
+ ml_gtksourceview.c: pango_tags.h |
| 81 |
+@@ -179,7 +179,7 @@ |
| 82 |
+ endif |
| 83 |
+ |
| 84 |
+ ifdef USE_GTKQUARTZ |
| 85 |
+-CFLAGS += -DHAS_GTKQUARTZ |
| 86 |
++OCAMLCFLAGS += -DHAS_GTKQUARTZ |
| 87 |
+ endif |
| 88 |
+ # Rules |
| 89 |
+ .SUFFIXES: .ml .mli .cmo .cmi .cmx .cmxs .cmxa .c $(XO) .d$(XO) .var .h .opt .def .ml4 |
| 90 |
+@@ -188,7 +188,7 @@ |
| 91 |
+ .cpp$(XO): |
| 92 |
+ $(CCOMPILER) $< |
| 93 |
+ .c.d$(XO): |
| 94 |
+- $(CAMLC) -c -ccopt '-MT -DCAML_DLL -Fo$@ $(CFLAGS)' $< |
| 95 |
++ $(CAMLC) -c -ccopt '-MT -DCAML_DLL -Fo$@ $(OCAMLCFLAGS) $(CFLAGS)' $< |
| 96 |
+ .ml.cmo: |
| 97 |
+ $(COMPILER) $(PRINCIPAL) $< |
| 98 |
+ .mli.cmi: |
| 99 |
+--- a/src/ml_gdk.h 2020-05-14 22:19:59.045394874 +0200 |
| 100 |
++++ b/src/ml_gdk.h 2020-05-14 22:20:06.694277819 +0200 |
| 101 |
+@@ -102,7 +102,7 @@ |
| 102 |
+ CAMLexport int OptFlags_GdkModifier_val (value); |
| 103 |
+ CAMLexport int Flags_GdkModifier_val (value); |
| 104 |
+ CAMLexport int Flags_Event_mask_val (value); |
| 105 |
+-CAMLexport lookup_info *ml_table_extension_events; |
| 106 |
++extern lookup_info *ml_table_extension_events; |
| 107 |
+ #define Extension_events_val(key) ml_lookup_to_c(ml_table_extension_events,key) |
| 108 |
+ |
| 109 |
+ #define GdkDragContext_val(val) check_cast(GDK_DRAG_CONTEXT,val) |
| 110 |
+--- a/src/ml_gdk.c 2020-05-14 22:21:39.244861128 +0200 |
| 111 |
++++ b/src/ml_gdk.c 2020-05-14 22:21:57.571580518 +0200 |
| 112 |
+@@ -55,6 +55,8 @@ |
| 113 |
+ #define GDK_WINDOW_TYPE_HINT_DOCK GDK_WINDOW_TYPE_HINT_NORMAL |
| 114 |
+ #endif |
| 115 |
+ |
| 116 |
++lookup_info *ml_table_extension_events; |
| 117 |
++ |
| 118 |
+ CAMLprim void ml_raise_gdk (const char *errmsg) |
| 119 |
+ { |
| 120 |
+ static const value * exn = NULL; |
| 121 |
|
| 122 |
diff --git a/dev-ml/lablgtk/lablgtk-2.18.10.ebuild b/dev-ml/lablgtk/lablgtk-2.18.10.ebuild |
| 123 |
index ad3698d27a5..780d515a5e0 100644 |
| 124 |
--- a/dev-ml/lablgtk/lablgtk-2.18.10.ebuild |
| 125 |
+++ b/dev-ml/lablgtk/lablgtk-2.18.10.ebuild |
| 126 |
@@ -26,6 +26,10 @@ BDEPEND="dev-ml/findlib |
| 127 |
|
| 128 |
DOCS=( CHANGES README CHANGES.API ) |
| 129 |
|
| 130 |
+PATCHES=( |
| 131 |
+ "${FILESDIR}"/${P}-cflags.patch |
| 132 |
+) |
| 133 |
+ |
| 134 |
src_configure() { |
| 135 |
local myeconfargs=( |
| 136 |
$(use_enable debug) |
| 137 |
@@ -46,9 +50,9 @@ src_configure() { |
| 138 |
|
| 139 |
src_compile() { |
| 140 |
# parallel build crashes |
| 141 |
- emake -j1 all |
| 142 |
+ emake -j1 all CFLAGS="${CFLAGS}" |
| 143 |
if use ocamlopt; then |
| 144 |
- emake -j1 opt |
| 145 |
+ emake -j1 opt CFLAGS="${CFLAGS}" |
| 146 |
fi |
| 147 |
} |
Archives