* [gentoo-commits] gentoo-x86 commit in dev-ml/cairo-ocaml/files: 0002-Fix-Makefile-to-avoid-recompiling-files-in-usr.patch 0001-Add-missing-libraries-used-by-the-stubs-to-CAIRO_LIB.patch 0004-no-automagic.patch 0003-Fix-FTBFS-on-bytecode-architectures.patch
@ 2012-06-18 20:01 Sebastien Fabbro (bicatali)
0 siblings, 0 replies; only message in thread
From: Sebastien Fabbro (bicatali) @ 2012-06-18 20:01 UTC (permalink / raw
To: gentoo-commits
bicatali 12/06/18 20:01:27
Added:
0002-Fix-Makefile-to-avoid-recompiling-files-in-usr.patch
0001-Add-missing-libraries-used-by-the-stubs-to-CAIRO_LIB.patch
0004-no-automagic.patch
0003-Fix-FTBFS-on-bytecode-architectures.patch
Log:
Initial import
(Portage version: 2.1.10.65/cvs/Linux x86_64)
Revision Changes Path
1.1 dev-ml/cairo-ocaml/files/0002-Fix-Makefile-to-avoid-recompiling-files-in-usr.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ml/cairo-ocaml/files/0002-Fix-Makefile-to-avoid-recompiling-files-in-usr.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ml/cairo-ocaml/files/0002-Fix-Makefile-to-avoid-recompiling-files-in-usr.patch?rev=1.1&content-type=text/plain
Index: 0002-Fix-Makefile-to-avoid-recompiling-files-in-usr.patch
===================================================================
From: Stephane Glondu <steph@glondu.net>
Date: Tue, 2 Aug 2011 15:34:21 +0200
Subject: Fix Makefile to avoid recompiling files in /usr
The "-I /path/to/lablgtk2" option should not be used when calling
ocamldep, otherwise files there are considered as possible targets by
the build system.
Signed-off-by: Stephane Glondu <steph@glondu.net>
---
src/Makefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/Makefile b/src/Makefile
index 46a62f6..c9c64b7 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -117,7 +117,7 @@ clean :
.depend : $(wildcard *.ml *.mli)
@echo "making deps"
- @$(OCAMLDEP) $(if $(LABLGTKDIR),-I $(LABLGTKDIR)) $^ > $@
+ @$(OCAMLDEP) $^ > $@
-include .depend
-include .depend_c
--
1.1 dev-ml/cairo-ocaml/files/0001-Add-missing-libraries-used-by-the-stubs-to-CAIRO_LIB.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ml/cairo-ocaml/files/0001-Add-missing-libraries-used-by-the-stubs-to-CAIRO_LIB.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ml/cairo-ocaml/files/0001-Add-missing-libraries-used-by-the-stubs-to-CAIRO_LIB.patch?rev=1.1&content-type=text/plain
Index: 0001-Add-missing-libraries-used-by-the-stubs-to-CAIRO_LIB.patch
===================================================================
From: Stephane Glondu <steph@glondu.net>
Date: Sun, 27 Feb 2011 13:31:22 +0100
Subject: Add missing libraries used by the stubs to CAIRO_LIBS
The recent changes in DSO linking highlighted this, and were
preventing ocaml-melt from building.
Signed-off-by: Stephane Glondu <steph@glondu.net>
---
configure.ac | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/configure.ac b/configure.ac
index 6c8c4e9..0cf1f11 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ AC_CONFIG_AUX_DIR(support)
AC_PROG_OCAML()
# Check for cairo
-PKG_CHECK_MODULES(CAIRO, cairo >= 1.2 freetype2)
+PKG_CHECK_MODULES(CAIRO, cairo >= 1.2 cairo-ft cairo-fc cairo-ps cairo-pdf freetype2)
# Optional GTK support (for the X11 backend)
AC_ARG_WITH(gtk,
--
1.1 dev-ml/cairo-ocaml/files/0004-no-automagic.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ml/cairo-ocaml/files/0004-no-automagic.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ml/cairo-ocaml/files/0004-no-automagic.patch?rev=1.1&content-type=text/plain
Index: 0004-no-automagic.patch
===================================================================
--- cairo-ocaml-1.2.0/configure.ac.orig 2012-06-17 20:58:38.000000000 +0100
+++ cairo-ocaml-1.2.0/configure.ac 2012-06-17 21:05:49.000000000 +0100
@@ -27,10 +27,20 @@
fi
# Optional libsvg-cairo support
-PKG_CHECK_MODULES(LIBSVG_CAIRO, libsvg-cairo, use_libsvg_cairo=yes, use_libsvg_cairo=no)
+AC_ARG_WITH(svg-cairo,
+ AS_HELP_STRING([--with-svg-cairo],[libsvg-cairo support]),
+ use_libsvg_cairo=$withval, use_libsvg_cairo=no)
+if test x$use_libsvg_cairo != xno; then
+ PKG_CHECK_MODULES(LIBSVG_CAIRO, libsvg-cairo, use_libsvg_cairo=yes, use_libsvg_cairo=no)
+fi
# Optional pango-cairo support
-PKG_CHECK_MODULES(LIBPANGOCAIRO, pangocairo, use_libpangocairo=yes, use_libpangocairo=no)
+AC_ARG_WITH(pango-cairo,
+ AS_HELP_STRING([--with-pango-cairo],[pangocairo support]),
+ use_libpangocairo=$withval, use_libpangocairo=no)
+if test x$use_libpangocairo != xno; then
+ PKG_CHECK_MODULES(LIBPANGOCAIRO, pangocairo, use_libpangocairo=yes, use_libpangocairo=no)
+ fi
echo
echo " GTK+ support: $use_gtk"
1.1 dev-ml/cairo-ocaml/files/0003-Fix-FTBFS-on-bytecode-architectures.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ml/cairo-ocaml/files/0003-Fix-FTBFS-on-bytecode-architectures.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ml/cairo-ocaml/files/0003-Fix-FTBFS-on-bytecode-architectures.patch?rev=1.1&content-type=text/plain
Index: 0003-Fix-FTBFS-on-bytecode-architectures.patch
===================================================================
From: Stephane Glondu <steph@glondu.net>
Date: Tue, 2 Aug 2011 21:35:59 +0200
Subject: Fix FTBFS on bytecode architectures
The new ocaml.m4 defines OCAMLOPT to "no" (instead of not defining
it); adapt src/Makefile accordingly.
Signed-off-by: Stephane Glondu <steph@glondu.net>
---
src/Makefile | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/Makefile b/src/Makefile
index c9c64b7..bc223c7 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -14,7 +14,11 @@ ifdef LIBPANGOCAIRO_CFLAGS
TARGETS += pangocairo
endif
-all : $(TARGETS) $(if $(OCAMLOPT),opt)
+ifneq ($(OCAMLOPT),no)
+OPT_TARGET = opt
+endif
+
+all : $(TARGETS) $(OPT_TARGET)
opt : $(addsuffix .opt,$(TARGETS))
cairo : cairo.cma libmlcairo.a
@@ -89,7 +93,7 @@ $(call mloptobjs,$(pangocairo_SRC)) : INCFLAGS=-I $(LABLGTKDIR)
install: all
mkdir -p $(DESTDIR)$(INSTALLDIR) $(DESTDIR)$(OCAMLLIB)/stublibs
install -m 644 *.mli *.cmi *.cma lib*.a $(DESTDIR)$(INSTALLDIR)
-ifdef OCAMLOPT
+ifneq ($(OCAMLOPT),no)
install -m644 *.cmxa *.a *.cmx $(DESTDIR)$(INSTALLDIR)
endif
install -m 755 dll*.so $(DESTDIR)$(INSTALLDIR)
--
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2012-06-18 20:01 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-06-18 20:01 [gentoo-commits] gentoo-x86 commit in dev-ml/cairo-ocaml/files: 0002-Fix-Makefile-to-avoid-recompiling-files-in-usr.patch 0001-Add-missing-libraries-used-by-the-stubs-to-CAIRO_LIB.patch 0004-no-automagic.patch 0003-Fix-FTBFS-on-bytecode-architectures.patch Sebastien Fabbro (bicatali)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox