summaryrefslogtreecommitdiff
path: root/dev-ml
diff options
context:
space:
mode:
authorRomain Perier <mrpouet@gentoo.org>2009-08-19 15:24:34 +0000
committerRomain Perier <mrpouet@gentoo.org>2009-08-19 15:24:34 +0000
commit909378b058ca3af25c7bc296279b437d5327429d (patch)
tree5847fa54c6e268fe1a1729ce84ded3a2c353da2e /dev-ml
parentsys-cluster/globus-build: Even more cleanup, useflags dont seem to be used fo... (diff)
downloadsunrise-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')
-rw-r--r--dev-ml/ocamlgsl/Manifest4
-rw-r--r--dev-ml/ocamlgsl/files/ocaml-3.11.patch29
-rw-r--r--dev-ml/ocamlgsl/ocamlgsl-0.6.0.ebuild8
3 files changed, 30 insertions, 11 deletions
diff --git a/dev-ml/ocamlgsl/Manifest b/dev-ml/ocamlgsl/Manifest
index d3a88ed04..7d965f8e5 100644
--- a/dev-ml/ocamlgsl/Manifest
+++ b/dev-ml/ocamlgsl/Manifest
@@ -1,5 +1,5 @@
-AUX ocaml-3.11.patch 381 RMD160 e86864ae4dd6ac9ff55b7eadbf05190ace72e897 SHA1 8e836cc77c7a35f54b48e38537c052c9d2652287 SHA256 35aff9d59c9ab9e60eac4b067d3923a7425d2aac4cd3f01f419a08443b74bdce
+AUX ocaml-3.11.patch 948 RMD160 6230348d7b3aea03fad9e139b062ef16824159ae SHA1 963844c2209a922c73c8c102021eecc16e439038 SHA256 e025e4bf6a0635001cbd73211417a1056ebf9361db540fb707813260e040b195
DIST ocamlgsl-0.6.0.tar.gz 274345 RMD160 f7e9db2f388694dbede5b95ed961cb6eeef1fb00 SHA1 819d2f95f44cc4c331a4aa644f8d23704477de05 SHA256 ddb9e432dc1a431cad332a8e7e6685d2facbde2fa15ecab9315741f7d11b588c
-EBUILD ocamlgsl-0.6.0.ebuild 802 RMD160 29328cef0893e753b333a7253eb0f5109d434f9d SHA1 6c3e66e78b1ea34d30a4fa31cbd464ed4849395d SHA256 12dffc71a47290b42330ce9f3c7e9a0fe789b00e786cdcf2322e6a2d40ca57fc
+EBUILD ocamlgsl-0.6.0.ebuild 812 RMD160 b8ad19eeed6edb90aca71cf2b4ff93d480a078e5 SHA1 e9829eaab27d9d85d56c38c932172b526f27382f SHA256 2c6b9c02ca44a4b52d824d3ba203ce03ba983eb9a51548fce15b4d34f4257a40
MISC ChangeLog 302 RMD160 53457bd38a4c4823263d7932a298b006dc183c3f SHA1 420609c41eed03ada1489e04005747a83f119920 SHA256 af8e5a9ddde7d56bc28455adb45d5e4c0ff8d077b19d5757451ac6e7de528c20
MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
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
diff --git a/dev-ml/ocamlgsl/ocamlgsl-0.6.0.ebuild b/dev-ml/ocamlgsl/ocamlgsl-0.6.0.ebuild
index 462aee032..7b241e779 100644
--- a/dev-ml/ocamlgsl/ocamlgsl-0.6.0.ebuild
+++ b/dev-ml/ocamlgsl/ocamlgsl-0.6.0.ebuild
@@ -12,22 +12,22 @@ SRC_URI="http://oandrieu.nerim.net/ocaml/gsl/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
IUSE="doc"
DEPEND=">=dev-lang/ocaml-3.10
>=sci-libs/gsl-1.9"
-RDEPEND="${DEPEND}"
+RDEPEND=${DEPEND}
PATCHES=( "${FILESDIR}/ocaml-3.11.patch" )
src_compile() {
- emake -j1 || die "compilation failed"
+ emake CFLAGS="${CFLAGS}" || die "emake failed"
}
src_install() {
findlib_src_preinst
- emake install-findlib -j1 || die "make install failed"
+ emake install-findlib || die "make install failed"
dodoc README NEWS NOTES || die "docs install failed"
doinfo *.info* || die "info install failed"