diff options
| author |   Romain Perier <mrpouet@gentoo.org> | 2009-08-19 15:24:34 +0000 |
|---|---|---|
| committer | Romain Perier <mrpouet@gentoo.org> | 2009-08-19 15:24:34 +0000 |
| commit | 909378b058ca3af25c7bc296279b437d5327429d (patch) | |
| tree | 5847fa54c6e268fe1a1729ce84ded3a2c353da2e /dev-ml/ocamlgsl/files/ocaml-3.11.patch | |
| parent | sys-cluster/globus-build: Even more cleanup, useflags dont seem to be used fo... (diff) | |
| download | sunrise-909378b058ca3af25c7bc296279b437d5327429d.tar.gz sunrise-909378b058ca3af25c7bc296279b437d5327429d.tar.bz2 sunrise-909378b058ca3af25c7bc296279b437d5327429d.zip | |
dev-ml/ocamlgsl: Add ~amd64 into KEYWORDS, Unquote RDEPEND, Drop -j1 to emake, Fix patch, give ${CFLAGS} to emake which is used by ocamlc with -ccopt option
svn path=/sunrise/; revision=9068
Diffstat (limited to 'dev-ml/ocamlgsl/files/ocaml-3.11.patch')
| -rw-r--r-- | dev-ml/ocamlgsl/files/ocaml-3.11.patch | 29 |
1 files changed, 24 insertions, 5 deletions
diff --git a/dev-ml/ocamlgsl/files/ocaml-3.11.patch b/dev-ml/ocamlgsl/files/ocaml-3.11.patch index dbfc69ca3..52627ac24 100644 --- a/dev-ml/ocamlgsl/files/ocaml-3.11.patch +++ b/dev-ml/ocamlgsl/files/ocaml-3.11.patch @@ -1,12 +1,31 @@ -diff -urN ocamlgsl-0.6.0-orig/Makefile ocamlgsl-0.6.0/Makefile ---- ocamlgsl-0.6.0-orig/Makefile 2009-08-12 23:20:21.000000000 -0400 -+++ ocamlgsl-0.6.0/Makefile 2009-08-12 23:19:37.000000000 -0400 -@@ -94,7 +94,7 @@ + Makefile | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index ae12602..dd68657 100644 +--- a/Makefile ++++ b/Makefile +@@ -16,12 +16,12 @@ OCPP := ocpp + FORT := fort + AWK := gawk + +-MNOCYGWIN ?= $(shell $(OCAMLC) -verbose foo.c 2>&1 | $(AWK) "NR==1 { print \$$3 }") ++MNOCYGWIN ?= $(shell $(OCAMLC) -verbose foo.c 2>&1 | $(AWK) 'NR==1 { print $3 }') + ifeq ($(MNOCYGWIN),-mnocygwin) + OCAML_BACKEND := mingw + endif + +-OCAML_BACKEND ?= $(shell $(OCAMLC) -verbose foo.c 2>&1 | $(AWK) "NR==1 { print \$$2 }") ++OCAML_BACKEND ?= $(shell $(OCAMLC) -verbose foo.c 2>&1 | $(AWK) 'NR==1 { print $2 }') + OCAML_VERSION ?= $(shell $(OCAMLC) -version) + + OCAMLBCFLAGS := -g +@@ -94,7 +94,7 @@ SRC := wrappers.h gsl_misc.ml io.h \ ifeq ($(OCAML_BACKEND),cl) include msvc.mak else -ifeq ($(OCAML_BACKEND),gcc) -+ifeq (,$(findstring $(OCAML_BACKEND),gcc)) ++ifneq (,$(findstring gcc,$(OCAML_BACKEND))) include gcc.mak else include mingw.mak |