aballier 15/06/25 08:03:44 Modified: werror.patch Log: Patch Makefile and not Makefile.in otherwise this triggers a rebuild of Makefile that needs htmlc to be installed first, bug #553172 Signed-off-by: Alexis Ballier <[email protected]> (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Revision Changes Path 1.2 app-text/htmlc/files/werror.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/htmlc/files/werror.patch?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/htmlc/files/werror.patch?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/htmlc/files/werror.patch?r1=1.1&r2=1.2 Index: werror.patch =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-text/htmlc/files/werror.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- werror.patch 18 Jun 2015 08:45:33 -0000 1.1 +++ werror.patch 25 Jun 2015 08:03:44 -0000 1.2 @@ -1,13 +1,18 @@ -Index: htmlc-2.6.0/config/Makefile.in +Dont build with -Werror like switches. +Need to patch Makefile and *NOT* Makefile.in since otherwise this triggers a +rebuild of the Makefile which needs htmlc to be installed first. +https://bugs.gentoo.org/show_bug.cgi?id=553172 + +Index: htmlc-2.6.0/config/Makefile =================================================================== ---- htmlc-2.6.0.orig/config/Makefile.in -+++ htmlc-2.6.0/config/Makefile.in -@@ -36,7 +36,7 @@ MANDIR = \$(PREFIXINSTALLDIR)/man/man\$( +--- htmlc-2.6.0.orig/config/Makefile ++++ htmlc-2.6.0/config/Makefile +@@ -40,7 +40,7 @@ MANDIR = $(PREFIXINSTALLDIR)/man/man$(MA # The Caml compilers (those defaults should be OK) - CAMLDEP = \$(OCAML_COMMAND_SEARCH_PATH)ocamldep + CAMLDEP = $(OCAML_COMMAND_SEARCH_PATH)ocamldep -CAML_FLAGS = -w A -warn-error A #-safe-string +CAML_FLAGS = -w A #-safe-string - CAMLBYT_FLAGS = \$(CAML_FLAGS) -g -annot - CAMLBYT = \$(OCAML_COMMAND_SEARCH_PATH)ocamlc \$(CAMLBYT_FLAGS) - CAMLBIN_FLAGS = \$(CAML_FLAGS) -inline 10000 + CAMLBYT_FLAGS = $(CAML_FLAGS) -g -annot + CAMLBYT = $(OCAML_COMMAND_SEARCH_PATH)ocamlc $(CAMLBYT_FLAGS) + CAMLBIN_FLAGS = $(CAML_FLAGS) -inline 10000
