1 |
nerdboy 08/10/16 06:02:44 |
2 |
|
3 |
Modified: ChangeLog astyle-1.22.ebuild |
4 |
Log: |
5 |
Updated to fix borked JAVA_HOME and CFLAGS |
6 |
(Portage version: 2.2_rc11/cvs/Linux 2.6.26.5 x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.27 dev-util/astyle/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/astyle/ChangeLog?rev=1.27&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/astyle/ChangeLog?rev=1.27&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/astyle/ChangeLog?r1=1.26&r2=1.27 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/astyle/ChangeLog,v |
18 |
retrieving revision 1.26 |
19 |
retrieving revision 1.27 |
20 |
diff -u -r1.26 -r1.27 |
21 |
--- ChangeLog 10 Sep 2008 13:06:01 -0000 1.26 |
22 |
+++ ChangeLog 16 Oct 2008 06:02:44 -0000 1.27 |
23 |
@@ -1,6 +1,11 @@ |
24 |
# ChangeLog for dev-util/astyle |
25 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-util/astyle/ChangeLog,v 1.26 2008/09/10 13:06:01 fmccor Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/astyle/ChangeLog,v 1.27 2008/10/16 06:02:44 nerdboy Exp $ |
28 |
+ |
29 |
+ 28 Sep 2008; Steve Arnold <nerdboy@g.o> astyle-1.22.ebuild, |
30 |
+ +filers/astyle-1.22-Makefile.patch, -files/astyle-1.22-strip.patch: |
31 |
+ Updated to fix borked JAVA_HOME and CFLAGS; requires a 1.6 JDK now... |
32 |
+ Tested on amd64 with Sun JDK. |
33 |
|
34 |
10 Sep 2008; Ferris McCormick <fmccor@g.o> astyle-1.21.ebuild: |
35 |
Sparc stable --- Bug #220739 --- seems to work fine. |
36 |
@@ -34,7 +39,7 @@ |
37 |
Dropped ppc-macos keyword, see you in prefix |
38 |
|
39 |
14 Nov 2007; Robin H. Johnson <robbat2@g.o> astyle-1.21.ebuild: |
40 |
- Fix $Header: /var/cvsroot/gentoo-x86/dev-util/astyle/ChangeLog,v 1.26 2008/09/10 13:06:01 fmccor Exp $ string. |
41 |
+ Fix $Header: /var/cvsroot/gentoo-x86/dev-util/astyle/ChangeLog,v 1.27 2008/10/16 06:02:44 nerdboy Exp $ string. |
42 |
|
43 |
*astyle-1.21 (07 Oct 2007) |
44 |
|
45 |
|
46 |
|
47 |
|
48 |
1.4 dev-util/astyle/astyle-1.22.ebuild |
49 |
|
50 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/astyle/astyle-1.22.ebuild?rev=1.4&view=markup |
51 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/astyle/astyle-1.22.ebuild?rev=1.4&content-type=text/plain |
52 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/astyle/astyle-1.22.ebuild?r1=1.3&r2=1.4 |
53 |
|
54 |
Index: astyle-1.22.ebuild |
55 |
=================================================================== |
56 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/astyle/astyle-1.22.ebuild,v |
57 |
retrieving revision 1.3 |
58 |
retrieving revision 1.4 |
59 |
diff -u -r1.3 -r1.4 |
60 |
--- astyle-1.22.ebuild 30 May 2008 18:53:54 -0000 1.3 |
61 |
+++ astyle-1.22.ebuild 16 Oct 2008 06:02:44 -0000 1.4 |
62 |
@@ -1,8 +1,8 @@ |
63 |
# Copyright 1999-2008 Gentoo Foundation |
64 |
# Distributed under the terms of the GNU General Public License v2 |
65 |
-# $Header: /var/cvsroot/gentoo-x86/dev-util/astyle/astyle-1.22.ebuild,v 1.3 2008/05/30 18:53:54 corsair Exp $ |
66 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/astyle/astyle-1.22.ebuild,v 1.4 2008/10/16 06:02:44 nerdboy Exp $ |
67 |
|
68 |
-inherit eutils java-pkg-opt-2 |
69 |
+inherit eutils java-pkg-2 java-pkg-opt-2 toolchain-funcs |
70 |
|
71 |
DESCRIPTION="Artistic Style is a reindenter and reformatter of C++, C and Java source code" |
72 |
HOMEPAGE="http://astyle.sourceforge.net/" |
73 |
@@ -14,29 +14,35 @@ |
74 |
|
75 |
IUSE="debug java libs" |
76 |
|
77 |
-RDEPEND="java? ( >=virtual/jre-1.5 )" |
78 |
+RDEPEND="java? ( >=virtual/jre-1.6 )" |
79 |
|
80 |
-DEPEND="java? ( >=virtual/jre-1.5 )" |
81 |
+DEPEND="java? ( >=virtual/jre-1.6 )" |
82 |
|
83 |
S=${WORKDIR}/${PN} |
84 |
|
85 |
pkg_setup() { |
86 |
- use java && java-pkg-2_pkg_setup |
87 |
+ if use java ; then |
88 |
+ java-pkg-2_pkg_setup |
89 |
|
90 |
- if use x86; then |
91 |
- jvmarch=i386 |
92 |
- else |
93 |
- jvmarch=${ARCH} |
94 |
+ if use x86; then |
95 |
+ jvmarch=i386 |
96 |
+ else |
97 |
+ jvmarch=${ARCH} |
98 |
+ fi |
99 |
fi |
100 |
} |
101 |
|
102 |
src_unpack() { |
103 |
unpack ${A} |
104 |
cd "${S}" |
105 |
- epatch "${FILESDIR}"/${P}-strip.patch |
106 |
# Add basic soname to make QA happy... |
107 |
sed -i -e "s:-shared:-shared -Wl,-soname,\$@ :g" buildgcc/Makefile |
108 |
- use java && setup-jvm-opts |
109 |
+ # Fix JAVA_HOME |
110 |
+ sed -i -e \ |
111 |
+ "s:/usr/lib/jvm/java-6-sun-1.6.0.00:$(java-config --jdk-home):g" \ |
112 |
+ buildgcc/Makefile || die "sed failed" |
113 |
+ # respect CFLAGS, remove strip and other hard-coded crap |
114 |
+ epatch "${FILESDIR}"/${P}-Makefile.patch |
115 |
} |
116 |
|
117 |
src_compile() { |
118 |
@@ -45,7 +51,7 @@ |
119 |
local build_targets="all" |
120 |
use java && build_targets="${build_targets} javaall" |
121 |
|
122 |
- emake ${build_targets} || die "build failed" |
123 |
+ emake CXX="$(tc-getCXX)" ${build_targets} || die "build failed" |
124 |
} |
125 |
|
126 |
src_install() { |
127 |
@@ -54,7 +60,6 @@ |
128 |
newlib.a bin/libastyled.a libastyle.a \ |
129 |
|| die "install debug static lib failed" |
130 |
if use libs ; then |
131 |
- # shared lib got a soname patch |
132 |
newlib.so bin/libastyled.so libastyle.so \ |
133 |
|| die "install debug shared lib failed" |
134 |
if use java ; then |
135 |
@@ -80,25 +85,3 @@ |
136 |
dohtml doc/*.html |
137 |
} |
138 |
|
139 |
-setup-jvm-opts() { |
140 |
- # Figure out correct boot classpath |
141 |
- # stolen from eclipse-sdk ebuild |
142 |
- local bp="$(java-config --jdk-home)/jre/lib" |
143 |
- local bootclasspath=$(java-config --runtime) |
144 |
- if java-config --java-version | grep -q IBM ; then |
145 |
- # IBM JDK |
146 |
- JAVA_LIB_DIR="$(java-config --jdk-home)/jre/bin" |
147 |
- else |
148 |
- # Sun derived JDKs (Blackdown, Sun) |
149 |
- JAVA_LIB_DIR="$(java-config --jdk-home)/jre/lib/${jvmarch}" |
150 |
- fi |
151 |
- |
152 |
- einfo "Using bootclasspath ${bootclasspath}" |
153 |
- einfo "Using JVM library path ${JAVA_LIB_DIR}" |
154 |
- |
155 |
- if [[ ! -f ${JAVA_LIB_DIR}/libawt.so ]] ; then |
156 |
- die "Could not find libawt.so native library" |
157 |
- fi |
158 |
- |
159 |
- export AWT_LIB_PATH=${JAVA_LIB_DIR} |
160 |
-} |