diff options
| author |   James Le Cuirot <chewi@aura-online.co.uk> | 2009-04-12 10:17:26 +0000 |
|---|---|---|
| committer | James Le Cuirot <chewi@aura-online.co.uk> | 2009-04-12 10:17:26 +0000 |
| commit | 305549a6689a26f3f9cc59ece8d2d03c2576fb9a (patch) | |
| tree | d1bffc421a38eb217ca0b41eab50763f1494482f /dev-util | |
| parent | Bump to fix build rewriting and to use java_prepare instead of src_unpack. (diff) | |
| download | java-305549a6689a26f3f9cc59ece8d2d03c2576fb9a.tar.gz java-305549a6689a26f3f9cc59ece8d2d03c2576fb9a.tar.bz2 java-305549a6689a26f3f9cc59ece8d2d03c2576fb9a.zip | |
Use java_prepare. Fix makefiles to respect CC, CFLAGS and JAVACFLAGS.
svn path=/java-overlay/; revision=7692
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/jay/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-util/jay/Manifest | 4 | ||||
| -rw-r--r-- | dev-util/jay/jay-1.1.1-r1.ebuild (renamed from dev-util/jay/jay-1.1.1.ebuild) | 18 |
3 files changed, 18 insertions, 10 deletions
diff --git a/dev-util/jay/ChangeLog b/dev-util/jay/ChangeLog index 87705d0d..d4f3bbd7 100644 --- a/dev-util/jay/ChangeLog +++ b/dev-util/jay/ChangeLog @@ -1,7 +1,11 @@ -# ChangeLog for dev-java/joni +# ChangeLog for dev-util/jay # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 12 Apr 2009; James Le Cuirot <chewi@aura-online.co.uk> -jay-1.1.1.ebuild, + +jay-1.1.1-r1.ebuild: + Use java_prepare. Fix makefiles to respect CC, CFLAGS and JAVACFLAGS. + *jay-1.1.1 (22 Mar 2009) 22 Mar 2009; James Le Cuirot <chewi@aura-online.co.uk> +jay-1.1.1.ebuild: diff --git a/dev-util/jay/Manifest b/dev-util/jay/Manifest index 9d2c13de..08e4c2a2 100644 --- a/dev-util/jay/Manifest +++ b/dev-util/jay/Manifest @@ -1,4 +1,4 @@ DIST jay-1.1.1.zip 679556 RMD160 22aaa15b61300326c278b79e0b43716fa4c7c826 SHA1 0f534ac5dcb5e59fea07b84d579c4c4e7b695419 SHA256 f4da396c80578653685d287cea1e32669ebdf148cc17eed9ba88e895942bd571 -EBUILD jay-1.1.1.ebuild 972 RMD160 82a4548c21e08119c40b8f568397e57db73e8611 SHA1 13badda0a27c2949d9cbcab52b2f448c141bb2f8 SHA256 bfa61a3c412baee34e86a249c2ab1ac148f08e3bf94c1592f33705a47b70c1d5 -MISC ChangeLog 340 RMD160 0d821814df74dbb4ebf4d97998b955e3d088d7c5 SHA1 ce90e0132d0f66baa550837f21b3fd3c3600b1df SHA256 cbfa4f2113095b8195eac27a07abcf266cb44c7314a94b843e36de81e6f6921d +EBUILD jay-1.1.1-r1.ebuild 1072 RMD160 b336331a893dfe18266f68e5f442b5f3990395e9 SHA1 c1f6ed710cb1d93523e37930e558058d75b79550 SHA256 519b537feac9cb9be70b7a82526bd3cb703e8a6601531dec3e2040f0bde0a5f1 +MISC ChangeLog 512 RMD160 b042f680c3e03b54924c3706aa02886f05e489ba SHA1 f0fa6e442e60c07676bb555e4f67e803dec87603 SHA256 7e36ba914ec8f9ac1e18d162fcc65d88072a749bd376b514b5091eaf1f015670 MISC metadata.xml 159 RMD160 5259d4be0ca7b74c28e711d45a289def9aeadbd9 SHA1 c4ec40cd8f19e0d780a5133941bc50043be198cf SHA256 1c070a909e96d9d193f84ad9304d196febbe33b60a724cc4b0d20634bb82255b diff --git a/dev-util/jay/jay-1.1.1.ebuild b/dev-util/jay/jay-1.1.1-r1.ebuild index 158a9a7a..d5195a72 100644 --- a/dev-util/jay/jay-1.1.1.ebuild +++ b/dev-util/jay/jay-1.1.1-r1.ebuild @@ -3,7 +3,7 @@ # $Header: $ EAPI="2" -inherit java-pkg-2 +inherit java-pkg-2 toolchain-funcs DESCRIPTION="A LALR(1) parser generator: Berkeley yacc retargeted to C# and Java" HOMEPAGE="http://www.cs.rit.edu/~ats/projects/lp/doc/jay/package-summary.html" @@ -18,13 +18,17 @@ DEPEND=">=virtual/jdk-1.4" S="${WORKDIR}/jay" -src_unpack() { - unpack ${A} - cd "${S}" - +java_prepare() { # Fix up ugly makefiles. - sed -i -r '/^CFLAGS =/d' src/makefile || die - sed -i -r 's:^v4 =.*:v4 = ${JAVA_HOME}/bin:' yydebug/makefile || die + sed -i -r \ + -e "s:^CC\s*=.*:CC = `tc-getCC`:" \ + -e '/^CFLAGS\s*=/d' \ + src/makefile || die + + sed -i -r \ + -e 's:^v4\s*=.*:v4 = ${JAVA_HOME}/bin:' \ + -e 's:JAVAC\s*=.*:\0 ${JAVACFLAGS}:' \ + yydebug/makefile || die } src_compile() { |