| 1 |
aballier 15/06/25 08:03:44 |
| 2 |
|
| 3 |
Modified: werror.patch |
| 4 |
Log: |
| 5 |
Patch Makefile and not Makefile.in otherwise this triggers a rebuild of Makefile that needs htmlc to be installed first, bug #553172 |
| 6 |
|
| 7 |
Signed-off-by: Alexis Ballier <aballier@g.o> |
| 8 |
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 160F534A) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.2 app-text/htmlc/files/werror.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/htmlc/files/werror.patch?rev=1.2&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/htmlc/files/werror.patch?rev=1.2&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/htmlc/files/werror.patch?r1=1.1&r2=1.2 |
| 16 |
|
| 17 |
Index: werror.patch |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/app-text/htmlc/files/werror.patch,v |
| 20 |
retrieving revision 1.1 |
| 21 |
retrieving revision 1.2 |
| 22 |
diff -u -r1.1 -r1.2 |
| 23 |
--- werror.patch 18 Jun 2015 08:45:33 -0000 1.1 |
| 24 |
+++ werror.patch 25 Jun 2015 08:03:44 -0000 1.2 |
| 25 |
@@ -1,13 +1,18 @@ |
| 26 |
-Index: htmlc-2.6.0/config/Makefile.in |
| 27 |
+Dont build with -Werror like switches. |
| 28 |
+Need to patch Makefile and *NOT* Makefile.in since otherwise this triggers a |
| 29 |
+rebuild of the Makefile which needs htmlc to be installed first. |
| 30 |
+https://bugs.gentoo.org/show_bug.cgi?id=553172 |
| 31 |
+ |
| 32 |
+Index: htmlc-2.6.0/config/Makefile |
| 33 |
=================================================================== |
| 34 |
---- htmlc-2.6.0.orig/config/Makefile.in |
| 35 |
-+++ htmlc-2.6.0/config/Makefile.in |
| 36 |
-@@ -36,7 +36,7 @@ MANDIR = \$(PREFIXINSTALLDIR)/man/man\$( |
| 37 |
+--- htmlc-2.6.0.orig/config/Makefile |
| 38 |
++++ htmlc-2.6.0/config/Makefile |
| 39 |
+@@ -40,7 +40,7 @@ MANDIR = $(PREFIXINSTALLDIR)/man/man$(MA |
| 40 |
|
| 41 |
# The Caml compilers (those defaults should be OK) |
| 42 |
- CAMLDEP = \$(OCAML_COMMAND_SEARCH_PATH)ocamldep |
| 43 |
+ CAMLDEP = $(OCAML_COMMAND_SEARCH_PATH)ocamldep |
| 44 |
-CAML_FLAGS = -w A -warn-error A #-safe-string |
| 45 |
+CAML_FLAGS = -w A #-safe-string |
| 46 |
- CAMLBYT_FLAGS = \$(CAML_FLAGS) -g -annot |
| 47 |
- CAMLBYT = \$(OCAML_COMMAND_SEARCH_PATH)ocamlc \$(CAMLBYT_FLAGS) |
| 48 |
- CAMLBIN_FLAGS = \$(CAML_FLAGS) -inline 10000 |
| 49 |
+ CAMLBYT_FLAGS = $(CAML_FLAGS) -g -annot |
| 50 |
+ CAMLBYT = $(OCAML_COMMAND_SEARCH_PATH)ocamlc $(CAMLBYT_FLAGS) |
| 51 |
+ CAMLBIN_FLAGS = $(CAML_FLAGS) -inline 10000 |
Archives