[oe-commits] org.oe.dev classpath: fix config.rpath, autotools and ecj -d
woglinde2 commit
oe at amethyst.openembedded.net
Mon Sep 1 18:27:38 UTC 2008
classpath: fix config.rpath, autotools and ecj -d
* add ecj_java_dir.patch for issuse when ecj is not cable to
to create directory-structure with parameter -d
* add autotools.patch for m4 stuff
* copy config.rpath always from /usr/share/gettext, so no crude hacks are
needed anymore
* bump PR on all recipes
Author: woglinde2 at openembedded.org
Branch: org.openembedded.dev
Revision: ae58c86232faa6dff1def818171d1a4540ab26c1
ViewMTN: http://monotone.openembedded.org/revision/info/ae58c86232faa6dff1def818171d1a4540ab26c1
Files:
1
packages/classpath/classpath-0.97.2
packages/classpath/classpath-minimal-0.97.2
packages/classpath/classpath-native-0.97.2
packages/classpath/classpath-0.97.2/autotools.patch
packages/classpath/classpath-minimal-0.97.2/autotools.patch
packages/classpath/classpath-native-0.97.2/autotools.patch
packages/classpath/files/autotools.patch
packages/classpath/files/ecj_java_dir.patch
packages/classpath/classpath-initial_0.93.bb
packages/classpath/classpath-minimal_0.96.1.bb
packages/classpath/classpath-minimal_0.97.2.bb
packages/classpath/classpath-native.inc
packages/classpath/classpath-native_0.96.1.bb
packages/classpath/classpath-native_0.97.2.bb
packages/classpath/classpath.inc
packages/classpath/classpath_0.95.bb
packages/classpath/classpath_0.96.1.bb
packages/classpath/classpath_0.97.2.bb
Diffs:
#
# mt diff -r60b9cfce5902437605c7610712a1a0989a59ab2a -rae58c86232faa6dff1def818171d1a4540ab26c1
#
#
#
# add_dir "packages/classpath/classpath-0.97.2"
#
# add_dir "packages/classpath/classpath-minimal-0.97.2"
#
# add_dir "packages/classpath/classpath-native-0.97.2"
#
# add_file "packages/classpath/classpath-0.97.2/autotools.patch"
# content [15a07b0bb24cef4fd53371e4bf6d37b9fe655d44]
#
# add_file "packages/classpath/classpath-minimal-0.97.2/autotools.patch"
# content [15a07b0bb24cef4fd53371e4bf6d37b9fe655d44]
#
# add_file "packages/classpath/classpath-native-0.97.2/autotools.patch"
# content [15a07b0bb24cef4fd53371e4bf6d37b9fe655d44]
#
# add_file "packages/classpath/files/autotools.patch"
# content [992d914461d1639cf26021da1a05d3889e8f25b6]
#
# add_file "packages/classpath/files/ecj_java_dir.patch"
# content [797a3f28ec57649f6c15ab1a601f3d34484c808b]
#
# patch "packages/classpath/classpath-initial_0.93.bb"
# from [e8d4723f96ff6828015eafcabc845d6122cf304f]
# to [8e5311ec2a9fe2eecc4f821562324c1111234546]
#
# patch "packages/classpath/classpath-minimal_0.96.1.bb"
# from [02423279a40cc9c5bde83b965533ab39526ab11a]
# to [d55baccb486b6381ad4f5968cd875bdeea15a250]
#
# patch "packages/classpath/classpath-minimal_0.97.2.bb"
# from [2f6c505ff2139a8cc6f85c6a8cfe7a4114e0b604]
# to [cc6670b99fd590bf0ad74fa09447b184313fc008]
#
# patch "packages/classpath/classpath-native.inc"
# from [0c60c8b764cd8fe867f13f94edec0cc00fdb43cc]
# to [cc6647a50c259d7a2de00755eaefd255de19c59a]
#
# patch "packages/classpath/classpath-native_0.96.1.bb"
# from [ffc871c9e7df81665b6682029ed081d535b07521]
# to [4b74f1ab80dbc04e928cbbf70be40ea38d942787]
#
# patch "packages/classpath/classpath-native_0.97.2.bb"
# from [84d70815005e590915c97516174edfb0a1f8afd9]
# to [a757f77768377156889b4b9e0147b2d651b9d4fd]
#
# patch "packages/classpath/classpath.inc"
# from [ec953cce26d7aeec31b06aa3dbce43c70686a735]
# to [c37a46c7988cea5252490a1d2cdd68c0866d5197]
#
# patch "packages/classpath/classpath_0.95.bb"
# from [eda6d3cac12670b78a50f4ed467945e8d94251b5]
# to [75c0e3b3c7f438afb1ce8a2ad49ef924a222087e]
#
# patch "packages/classpath/classpath_0.96.1.bb"
# from [bbcb9594be6e39c9de041c9161493fdcca794c2b]
# to [b9d896ae81de0565a58112c9701c2efff4fc4fe7]
#
# patch "packages/classpath/classpath_0.97.2.bb"
# from [950979b9546b09b411c3a41c14bf06b8450bd8bd]
# to [d8ccab26ac79ea713973f6b5f066aba811994ccb]
#
============================================================
--- packages/classpath/classpath-0.97.2/autotools.patch 15a07b0bb24cef4fd53371e4bf6d37b9fe655d44
+++ packages/classpath/classpath-0.97.2/autotools.patch 15a07b0bb24cef4fd53371e4bf6d37b9fe655d44
@@ -0,0 +1,26 @@
+Index: classpath-0.97.2/configure.ac
+===================================================================
+--- classpath-0.97.2.orig/configure.ac 2008-06-06 02:58:57.000000000 +0200
++++ classpath-0.97.2/configure.ac 2008-08-02 00:58:16.537364104 +0200
+@@ -41,6 +41,8 @@
+ AC_CONFIG_HEADERS([include/config.h])
+ AC_PREFIX_DEFAULT(/usr/local/classpath)
+
++AC_CONFIG_MACRO_DIR([m4])
++
+ dnl -----------------------------------------------------------
+ dnl Enable collections.jar (disabled by default)
+ dnl -----------------------------------------------------------
+Index: classpath-0.97.2/Makefile.am
+===================================================================
+--- classpath-0.97.2.orig/Makefile.am 2008-06-01 20:47:05.000000000 +0200
++++ classpath-0.97.2/Makefile.am 2008-08-02 00:58:39.004023720 +0200
+@@ -5,7 +5,7 @@
+ DIST_SUBDIRS = lib doc external include native resource scripts tools examples
+
+ # Allow users to pass site-specific flags to autoreconf via an env var.
+-ACLOCAL_AMFLAGS = -I m4 ${LOCAL_AUTORECONF_FLAGS}
++ACLOCAL_AMFLAGS = -I m4 --install ${LOCAL_AUTORECONF_FLAGS}
+
+ native: lib
+
============================================================
--- packages/classpath/classpath-minimal-0.97.2/autotools.patch 15a07b0bb24cef4fd53371e4bf6d37b9fe655d44
+++ packages/classpath/classpath-minimal-0.97.2/autotools.patch 15a07b0bb24cef4fd53371e4bf6d37b9fe655d44
@@ -0,0 +1,26 @@
+Index: classpath-0.97.2/configure.ac
+===================================================================
+--- classpath-0.97.2.orig/configure.ac 2008-06-06 02:58:57.000000000 +0200
++++ classpath-0.97.2/configure.ac 2008-08-02 00:58:16.537364104 +0200
+@@ -41,6 +41,8 @@
+ AC_CONFIG_HEADERS([include/config.h])
+ AC_PREFIX_DEFAULT(/usr/local/classpath)
+
++AC_CONFIG_MACRO_DIR([m4])
++
+ dnl -----------------------------------------------------------
+ dnl Enable collections.jar (disabled by default)
+ dnl -----------------------------------------------------------
+Index: classpath-0.97.2/Makefile.am
+===================================================================
+--- classpath-0.97.2.orig/Makefile.am 2008-06-01 20:47:05.000000000 +0200
++++ classpath-0.97.2/Makefile.am 2008-08-02 00:58:39.004023720 +0200
+@@ -5,7 +5,7 @@
+ DIST_SUBDIRS = lib doc external include native resource scripts tools examples
+
+ # Allow users to pass site-specific flags to autoreconf via an env var.
+-ACLOCAL_AMFLAGS = -I m4 ${LOCAL_AUTORECONF_FLAGS}
++ACLOCAL_AMFLAGS = -I m4 --install ${LOCAL_AUTORECONF_FLAGS}
+
+ native: lib
+
============================================================
--- packages/classpath/classpath-native-0.97.2/autotools.patch 15a07b0bb24cef4fd53371e4bf6d37b9fe655d44
+++ packages/classpath/classpath-native-0.97.2/autotools.patch 15a07b0bb24cef4fd53371e4bf6d37b9fe655d44
@@ -0,0 +1,26 @@
+Index: classpath-0.97.2/configure.ac
+===================================================================
+--- classpath-0.97.2.orig/configure.ac 2008-06-06 02:58:57.000000000 +0200
++++ classpath-0.97.2/configure.ac 2008-08-02 00:58:16.537364104 +0200
+@@ -41,6 +41,8 @@
+ AC_CONFIG_HEADERS([include/config.h])
+ AC_PREFIX_DEFAULT(/usr/local/classpath)
+
++AC_CONFIG_MACRO_DIR([m4])
++
+ dnl -----------------------------------------------------------
+ dnl Enable collections.jar (disabled by default)
+ dnl -----------------------------------------------------------
+Index: classpath-0.97.2/Makefile.am
+===================================================================
+--- classpath-0.97.2.orig/Makefile.am 2008-06-01 20:47:05.000000000 +0200
++++ classpath-0.97.2/Makefile.am 2008-08-02 00:58:39.004023720 +0200
+@@ -5,7 +5,7 @@
+ DIST_SUBDIRS = lib doc external include native resource scripts tools examples
+
+ # Allow users to pass site-specific flags to autoreconf via an env var.
+-ACLOCAL_AMFLAGS = -I m4 ${LOCAL_AUTORECONF_FLAGS}
++ACLOCAL_AMFLAGS = -I m4 --install ${LOCAL_AUTORECONF_FLAGS}
+
+ native: lib
+
============================================================
--- packages/classpath/files/autotools.patch 992d914461d1639cf26021da1a05d3889e8f25b6
+++ packages/classpath/files/autotools.patch 992d914461d1639cf26021da1a05d3889e8f25b6
@@ -0,0 +1,37 @@
+Index: classpath-0.93/configure.ac
+===================================================================
+--- classpath-0.93.orig/configure.ac 2006-12-08 20:22:50.000000000 +0100
++++ classpath-0.93/configure.ac 2008-08-25 22:07:40.711946598 +0200
+@@ -41,6 +41,11 @@
+ AC_CONFIG_HEADERS([include/config.h])
+ AC_PREFIX_DEFAULT(/usr/local/classpath)
+
++AC_CONFIG_MACRO_DIR([m4])
++
++
++AM_ICONV_LINK
++
+ dnl -----------------------------------------------------------
+ dnl Enable collections.jar (disabled by default)
+ dnl -----------------------------------------------------------
+@@ -312,6 +317,7 @@
+ dnl AC_PROG_AWK
+ AC_PROG_CC
+ AC_PROG_CPP
++AM_PROG_CC_C_O
+
+ # Handle -Werror default case.
+ if test "$ENABLE_WERROR" = default; then
+Index: classpath-0.93/Makefile.am
+===================================================================
+--- classpath-0.93.orig/Makefile.am 2006-02-08 08:35:30.000000000 +0100
++++ classpath-0.93/Makefile.am 2008-08-24 21:45:42.405241264 +0200
+@@ -4,7 +4,7 @@
+ SUBDIRS = lib doc external include native resource scripts tools $(EXAMPLESDIR)
+ DIST_SUBDIRS = lib doc external include native resource scripts tools examples
+
+-ACLOCAL_AMFLAGS = -I m4
++ACLOCAL_AMFLAGS = -I m4 --install
+
+ native: lib
+
============================================================
--- packages/classpath/files/ecj_java_dir.patch 797a3f28ec57649f6c15ab1a601f3d34484c808b
+++ packages/classpath/files/ecj_java_dir.patch 797a3f28ec57649f6c15ab1a601f3d34484c808b
@@ -0,0 +1,34 @@
+Index: classpath-0.97.2/lib/gen-classlist.sh.in
+===================================================================
+--- classpath-0.97.2.orig/lib/gen-classlist.sh.in 2008-06-02 03:37:29.000000000 +0200
++++ classpath-0.97.2/lib/gen-classlist.sh.in 2008-08-01 00:00:58.055208770 +0200
+@@ -148,4 +148,7 @@
+ done
+ fi
+
++# hack for javac that uses -d and do not make the directories
++awk -F " " '{print $1}' classes.1 | uniq | awk -F " " '{system("mkdir -p " $0)}'
++
+ exit 0
+Index: classpath-0.97.2/tools/Makefile.am
+===================================================================
+--- classpath-0.97.2.orig/tools/Makefile.am 2008-06-02 04:01:47.000000000 +0200
++++ classpath-0.97.2/tools/Makefile.am 2008-08-01 00:11:18.531985989 +0200
+@@ -180,6 +180,8 @@
+ mkdir classes asm
+ ## Compile ASM separately as it is latin-1 encoded.
+ find $(srcdir)/external/asm -name '*.java' -print > asm.lst
++ awk -F "/" '{OFS=FS;gsub("/"$$2"/"$$3,"",$$0);gsub("/"$$NF,"",$$0); print $$0}' asm.lst | \
++ sort | uniq | awk -F " " '{system("mkdir -p asm/" $$0)}'
+ AC=`echo $(JCOMPILER) | sed -e 's/UTF-8/ISO-8859-1/g'`; \
+ $$AC -g -d asm @asm.lst
+ find $(srcdir)/gnu/classpath/tools \
+@@ -189,6 +191,8 @@
+ $(srcdir)/com/sun/tools/javah \
+ $(srcdir)/sun/rmi/rmic \
+ -name '*.java' -print > classes.lst
++ awk -F "/" '{OFS=FS;gsub("/"$$NF,"",$$0); print $$0}' classes.lst | \
++ sort | uniq | awk -F " " '{system("mkdir -p classes/" $$0)}'
+ $(JCOMPILER) -g -d classes @classes.lst
+ cat classes.lst asm.lst > all-classes.lst
+ ## Copy over tools resource files.
============================================================
--- packages/classpath/classpath-initial_0.93.bb e8d4723f96ff6828015eafcabc845d6122cf304f
+++ packages/classpath/classpath-initial_0.93.bb 8e5311ec2a9fe2eecc4f821562324c1111234546
@@ -5,10 +5,12 @@ DESCRIPTION="Java1.4-compatible GNU Clas
DESCRIPTION="Java1.4-compatible GNU Classpath variant that is used as bootclasspath for jikes-native."
-PR = "r2"
+PR = "r3"
-DEPENDS = "zip-native fastjar-native jikes-native"
+DEPENDS = "zip-native fastjar-native jikes-native gettext-native"
+SRC_URI += "file://autotools.patch;patch=1"
+
EXTRA_OECONF = "\
--with-jikes=jikes \
--with-fastjar=fastjar \
============================================================
--- packages/classpath/classpath-minimal_0.96.1.bb 02423279a40cc9c5bde83b965533ab39526ab11a
+++ packages/classpath/classpath-minimal_0.96.1.bb d55baccb486b6381ad4f5968cd875bdeea15a250
@@ -1,6 +1,6 @@ require classpath.inc
require classpath.inc
-PR = "r6"
+PR = "r7"
SRC_URI += "\
file://gjar-prefix-patch.diff;patch=1;pnum=0 \
============================================================
--- packages/classpath/classpath-minimal_0.97.2.bb 2f6c505ff2139a8cc6f85c6a8cfe7a4114e0b604
+++ packages/classpath/classpath-minimal_0.97.2.bb cc6670b99fd590bf0ad74fa09447b184313fc008
@@ -4,9 +4,11 @@ SRC_URI += "\
file://netif_16.patch;patch=1;pnum=0 \
file://SimpleName.diff;patch=1;pnum=0 \
file://javanet-local.patch;patch=1;pnum=0 \
+ file://ecj_java_dir.patch;patch=1 \
+ file://autotools.patch;patch=1 \
"
-PR = "r0"
+PR = "r1"
PROVIDES = "${PN} classpath"
============================================================
--- packages/classpath/classpath-native.inc 0c60c8b764cd8fe867f13f94edec0cc00fdb43cc
+++ packages/classpath/classpath-native.inc cc6647a50c259d7a2de00755eaefd255de19c59a
@@ -5,11 +5,18 @@ SRC_URI = "${GNU_MIRROR}/classpath/class
S = "${WORKDIR}/classpath-${PV}"
SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz"
+
DEPENDS = "ecj-initial fastjar-native zip-native gettext-native"
inherit autotools native
+
+do_configure_prepend () {
+
+ cp ${STAGING_DATADIR_NATIVE}/gettext/config.rpath ${S}
+}
+
export JAVAC="${STAGING_BINDIR_NATIVE}/ecj-initial"
# Note: the --with-ecj options seems redundant but is
@@ -29,14 +36,7 @@ EXTRA_OECONF = "\
--includedir=${STAGING_INCDIR}/classpath \
--with-vm=java \
"
-# hack to get config.rpath in, it comes from gettext
-do_configure_prepend () {
- ${@['','cp ${STAGING_DATADIR}/automake-1.10/config.rpath ${S}'][bb.data.getVar('PREFERRED_VERSION_automake-native',d,1) == '1.10']}
-
-}
-
do_stage() {
oe_runmake install
}
-
============================================================
--- packages/classpath/classpath-native_0.96.1.bb ffc871c9e7df81665b6682029ed081d535b07521
+++ packages/classpath/classpath-native_0.96.1.bb 4b74f1ab80dbc04e928cbbf70be40ea38d942787
@@ -1,6 +1,6 @@ require classpath-native.inc
require classpath-native.inc
-PR = "r3"
+PR = "r4"
SRC_URI += "\
file://gjar-prefix-patch.diff;patch=1;pnum=0 \
============================================================
--- packages/classpath/classpath-native_0.97.2.bb 84d70815005e590915c97516174edfb0a1f8afd9
+++ packages/classpath/classpath-native_0.97.2.bb a757f77768377156889b4b9e0147b2d651b9d4fd
@@ -10,5 +10,7 @@ SRC_URI += "\
file://SimpleName.diff;patch=1;pnum=0 \
file://javanet-local.patch;patch=1;pnum=0 \
file://sun-security-getproperty_0.96.1.patch;patch=1;pnum=0 \
+ file://ecj_java_dir.patch;patch=1 \
+ file://autotools.patch;patch=1 \
"
============================================================
--- packages/classpath/classpath.inc ec953cce26d7aeec31b06aa3dbce43c70686a735
+++ packages/classpath/classpath.inc c37a46c7988cea5252490a1d2cdd68c0866d5197
@@ -17,6 +17,7 @@ SRC_URI = "${GNU_MIRROR}/classpath/class
RPROVIDES_${PN}-gtk = "${PBN}-awt"
SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz"
+
S = "${WORKDIR}/${PBN}-${PV}"
@@ -30,21 +31,19 @@ inherit autotools
inherit autotools
-# hack to get config.rpath in, it comes from gettext
do_configure_prepend () {
- ${@['','cp ${STAGING_DATADIR_NATIVE}/automake-1.10/config.rpath ${S}'][bb.data.getVar('PREFERRED_VERSION_automake-native',d,1) == '1.10']}
-
+ cp ${STAGING_DATADIR_NATIVE}/gettext/config.rpath ${S}
}
do_stage() {
install -d ${STAGING_INCDIR}/classpath
install -m 0644 include/jni* ${STAGING_INCDIR}/classpath
- install -m 0644 include/jni_md.h ${STAGING_INCDIR}/classpath/
+ install -m 0644 include/jni_md.h ${STAGING_INCDIR}/classpath/
- install -d ${STAGING_DATADIR}/classpath
- install -m 0644 lib/glibj.zip ${STAGING_DATADIR}/classpath
+ install -d ${STAGING_DATADIR}/classpath
+ install -m 0644 lib/glibj.zip ${STAGING_DATADIR}/classpath
}
do_install() {
============================================================
--- packages/classpath/classpath_0.95.bb eda6d3cac12670b78a50f4ed467945e8d94251b5
+++ packages/classpath/classpath_0.95.bb 75c0e3b3c7f438afb1ce8a2ad49ef924a222087e
@@ -6,7 +6,7 @@ SRC_URI += "\
file://javanet-local.patch;patch=1;pnum=0 \
"
-PR = "r4"
+PR = "r5"
DEPENDS += "gtk+ gconf libxtst"
============================================================
--- packages/classpath/classpath_0.96.1.bb bbcb9594be6e39c9de041c9161493fdcca794c2b
+++ packages/classpath/classpath_0.96.1.bb b9d896ae81de0565a58112c9701c2efff4fc4fe7
@@ -6,7 +6,7 @@ SRC_URI += "\
file://javanet-local.patch;patch=1;pnum=0 \
"
-PR = "r6"
+PR = "r7"
DEPENDS += "gtk+ gconf libxtst"
@@ -20,5 +20,3 @@ EXTRA_OECONF += "\
--enable-local-sockets \
--with-vm=java \
"
-
-
============================================================
--- packages/classpath/classpath_0.97.2.bb 950979b9546b09b411c3a41c14bf06b8450bd8bd
+++ packages/classpath/classpath_0.97.2.bb d8ccab26ac79ea713973f6b5f066aba811994ccb
@@ -4,9 +4,11 @@ SRC_URI += "\
file://netif_16.patch;patch=1;pnum=0 \
file://SimpleName.diff;patch=1;pnum=0 \
file://javanet-local.patch;patch=1;pnum=0 \
+ file://ecj_java_dir.patch;patch=1 \
+ file://autotools.patch;patch=1 \
"
-PR = "r1"
+PR = "r2"
DEPENDS += "gtk+ gconf libxtst"
More information about the Openembedded-commits
mailing list