classpath: harmonise -native and -initial-native recipes
PATCH 1/1 classpath: harmonise -native and -initial-native recipes
From: André Draszik <[email protected]>
removing lots of code-duplication
Signed-off-by André Draszik <[email protected]>
--- .../classpath/classpath-initial-native_0.93.bb | 54 ++++++++++------------ recipes-core/classpath/classpath-native.inc | 25 +++++----- recipes-core/classpath/classpath-native_0.99.bb | 31 ++++++------- 3 files changed, 51 insertions(+), 59 deletions(-)
recipes-core/classpath/classpath-initial-native_0.93.bb +25 -29
@@ -4,7 +4,6 @@ require classpath-native.inc DESCRIPTION="Java1.4-compatible GNU Classpath variant that is used as bootclasspath for jikes-native." -LIC_FILES_CHKSUM = "file://COPYING;md5=af0004801732bc4b20d90f351cf80510" DEPENDS += "jikes-native" PR = "${INC_PR}.2"
@@ -13,38 +12,35 @@ SRC_URI += " \ file://autotools.patch \ file://miscompilation.patch \ " +SRC_URI[md5sum] = "ffa9e9cac31c5acbf0ea9eff9efa923d" +SRC_URI[sha256sum] = "df2d093612abd23fe67e9409d89bb2a8e79b1664fe2b2da40e1c8ed693e32945" -EXTRA_OECONF = " \ - --with-jikes=jikes \ - --with-fastjar=fastjar \ - --with-glibj \ - --disable-Werror \ - --disable-local-sockets \ - --disable-alsa \ - --disable-gconf-peer \ - --disable-gtk-peer \ - --disable-plugin \ - --disable-dssi \ - --disable-examples \ - --with-glibj-dir=${STAGING_DATADIR_NATIVE}/classpath-initial \ - --with-native-libdir=${STAGING_LIBDIR_NATIVE}/classpath-initial \ - --includedir=${STAGING_INCDIR_NATIVE}/classpath-initial \ - --with-vm=java \ - " +EXTRA_OECONF += "\ + --with-jikes=jikes \ + --with-fastjar=fastjar \ + --disable-local-sockets \ + --with-glibj-dir=${STAGING_DATADIR_NATIVE}/classpath-initial \ + --with-native-libdir=${STAGING_LIBDIR_NATIVE}/classpath-initial \ + --includedir=${STAGING_INCDIR_NATIVE}/classpath-initial \ + --with-vm=java \ +" # Ensure tools.zip is not installed at same path as classpath-native EXTRA_OEMAKE += "pkgdatadir=${STAGING_DATADIR_NATIVE}/classpath-initial" -# remove files clashing with classpath-native in sysroot do_install_append() { - - for i in gappletviewer gjarsigner gkeytool gjar gnative2ascii gserialver grmiregistry gtnameserv gorbd grmid - do - rm ${D}${bindir}/${i} - done - rm ${D}${libdir}/logging.properties - rm ${D}${libdir}/security/classpath.security + # remove files clashing with classpath-native in sysroot + rm \ + ${D}${bindir}/gappletviewer \ + ${D}${bindir}/gjarsigner \ + ${D}${bindir}/gkeytool \ + ${D}${bindir}/gjar \ + ${D}${bindir}/gnative2ascii \ + ${D}${bindir}/gserialver \ + ${D}${bindir}/grmiregistry \ + ${D}${bindir}/gtnameserv \ + ${D}${bindir}/gorbd \ + ${D}${bindir}/grmid \ + ${D}${libdir}/logging.properties \ + ${D}${libdir}/security/classpath.security } -SRC_URI[md5sum] = "ffa9e9cac31c5acbf0ea9eff9efa923d" -SRC_URI[sha256sum] = "df2d093612abd23fe67e9409d89bb2a8e79b1664fe2b2da40e1c8ed693e32945" -
recipes-core/classpath/classpath-native.inc +11 -14
@@ -1,6 +1,7 @@ SUMMARY = "GNU Classpath standard Java libraries - For native Java-dependent programs" HOMEPAGE = "http://www.gnu.org/software/classpath/" LICENSE = "GPL-2.0 & SAX-PD" +LIC_FILES_CHKSUM = "file://COPYING;md5=af0004801732bc4b20d90f351cf80510" DEPENDS = "fastjar-native zip-native"
@@ -14,17 +15,13 @@ export JAVA="${STAGING_BINDIR_NATIVE}/java-initial" export JAVAC="${STAGING_BINDIR_NATIVE}/ecj-initial" export JAVACFLAGS="-nowarn" -EXTRA_OECONF = " \ - --with-glibj \ - --enable-local-sockets \ - --disable-Werror \ - --disable-alsa \ - --disable-gconf-peer \ - --disable-gtk-peer \ - --disable-plugin \ - --disable-dssi \ - --disable-gjdoc \ - --disable-examples \ - --enable-tools \ - --includedir=${STAGING_INCDIR}/classpath \ - " +EXTRA_OECONF = "\ + --with-glibj \ + --disable-Werror \ + --disable-alsa \ + --disable-gconf-peer \ + --disable-gtk-peer \ + --disable-plugin \ + --disable-dssi \ + --disable-examples \ +"
recipes-core/classpath/classpath-native_0.99.bb +15 -16
@@ -1,6 +1,5 @@ require classpath-native.inc -LIC_FILES_CHKSUM = "file://COPYING;md5=af0004801732bc4b20d90f351cf80510" DEPENDS += "classpath-initial-native ecj-initial-native virtual/java-initial-native" PR = "${INC_PR}.0"
@@ -12,21 +11,21 @@ SRC_URI += " \ file://miscompilation.patch \ file://toolwrapper-exithook.patch \ " - -# tools using java-initial rather than java sed it out -do_compile_append () { - - COMMANDS="gappletviewer gjarsigner gkeytool \ - gjar gnative2ascii gserialver grmiregistry \ - gtnameserv gorbd grmid grmic gjavah \ - " - - for i in ${COMMANDS}; - do - sed -i -e "s/java-initial/java/g" tools/${i} - done -} - SRC_URI[md5sum] = "0ae1571249172acd82488724a3b8acb4" SRC_URI[sha256sum] = "f929297f8ae9b613a1a167e231566861893260651d913ad9b6c11933895fecc8" +EXTRA_OECONF += "\ + --enable-local-sockets \ + --disable-gjdoc \ + --enable-tools \ + --includedir=${STAGING_INCDIR}/classpath \ +" + +do_compile_append () { + # tools using java-initial rather than java sed it out + cd tools + sed -e "s/java-initial/java/g" \ + -i gappletviewer gjarsigner gkeytool \ + gjar gnative2ascii gserialver grmiregistry \ + gtnameserv gorbd grmid grmic gjavah +}
Signature · 1 line
2.16.2
Quoted 5 lines · André Draszik
From: André Draszik <[email protected]>
removing lots of code-duplication
Signed-off-by André Draszik <[email protected]>
Tested-by Richard Leitner <[email protected]>
Quoted 171 lines
--- .../classpath/classpath-initial-native_0.93.bb | 54 ++++++++++------------ recipes-core/classpath/classpath-native.inc | 25 +++++----- recipes-core/classpath/classpath-native_0.99.bb | 31 ++++++------- 3 files changed, 51 insertions(+), 59 deletions(-)recipes-core/classpath/classpath-initial-native_0.93.bb +25
-29@@ -4,7 +4,6 @@ require classpath-native.inc DESCRIPTION="Java1.4-compatible GNU Classpath variant that is used as bootclasspath for jikes-native." -LIC_FILES_CHKSUM = "file://COPYING;md5=af0004801732bc4b20d90f351cf80510" DEPENDS += "jikes-native" PR = "${INC_PR}.2"@@ -13,38 +12,35 @@ SRC_URI += " \ file://autotools.patch \ file://miscompilation.patch \ " +SRC_URI[md5sum] = "ffa9e9cac31c5acbf0ea9eff9efa923d" +SRC_URI[sha256sum] = "df2d093612abd23fe67e9409d89bb2a8e79b1664fe2b2da40e1c8ed693e32945" -EXTRA_OECONF = " \ - --with-jikes=jikes \ - --with-fastjar=fastjar \ - --with-glibj \ - --disable-Werror \ - --disable-local-sockets \ - --disable-alsa \ - --disable-gconf-peer \ - --disable-gtk-peer \ - --disable-plugin \ - --disable-dssi \ - --disable-examples \ - --with-glibj-dir=${STAGING_DATADIR_NATIVE}/classpath-initial \ - --with-native-libdir=${STAGING_LIBDIR_NATIVE}/classpath-initial \ - --includedir=${STAGING_INCDIR_NATIVE}/classpath-initial \ - --with-vm=java \ - " +EXTRA_OECONF += "\ + --with-jikes=jikes \ + --with-fastjar=fastjar \ + --disable-local-sockets \ + --with-glibj-dir=${STAGING_DATADIR_NATIVE}/classpath-initial \ + --with-native-libdir=${STAGING_LIBDIR_NATIVE}/classpath-initial \ + --includedir=${STAGING_INCDIR_NATIVE}/classpath-initial \ + --with-vm=java \ +" # Ensure tools.zip is not installed at same path as classpath-native EXTRA_OEMAKE += "pkgdatadir=${STAGING_DATADIR_NATIVE}/classpath-initial" -# remove files clashing with classpath-native in sysroot do_install_append() { - - for i in gappletviewer gjarsigner gkeytool gjar gnative2ascii gserialver grmiregistry gtnameserv gorbd grmid - do - rm ${D}${bindir}/${i} - done - rm ${D}${libdir}/logging.properties - rm ${D}${libdir}/security/classpath.security + # remove files clashing with classpath-native in sysroot + rm \ + ${D}${bindir}/gappletviewer \ + ${D}${bindir}/gjarsigner \ + ${D}${bindir}/gkeytool \ + ${D}${bindir}/gjar \ + ${D}${bindir}/gnative2ascii \ + ${D}${bindir}/gserialver \ + ${D}${bindir}/grmiregistry \ + ${D}${bindir}/gtnameserv \ + ${D}${bindir}/gorbd \ + ${D}${bindir}/grmid \ + ${D}${libdir}/logging.properties \ + ${D}${libdir}/security/classpath.security } -SRC_URI[md5sum] = "ffa9e9cac31c5acbf0ea9eff9efa923d" -SRC_URI[sha256sum] = "df2d093612abd23fe67e9409d89bb2a8e79b1664fe2b2da40e1c8ed693e32945" -recipes-core/classpath/classpath-native.inc +11
-14@@ -1,6 +1,7 @@ SUMMARY = "GNU Classpath standard Java libraries - For native Java-dependent programs" HOMEPAGE = "http://www.gnu.org/software/classpath/" LICENSE = "GPL-2.0 & SAX-PD" +LIC_FILES_CHKSUM = "file://COPYING;md5=af0004801732bc4b20d90f351cf80510" DEPENDS = "fastjar-native zip-native"@@ -14,17 +15,13 @@ export JAVA="${STAGING_BINDIR_NATIVE}/java-initial" export JAVAC="${STAGING_BINDIR_NATIVE}/ecj-initial" export JAVACFLAGS="-nowarn" -EXTRA_OECONF = " \ - --with-glibj \ - --enable-local-sockets \ - --disable-Werror \ - --disable-alsa \ - --disable-gconf-peer \ - --disable-gtk-peer \ - --disable-plugin \ - --disable-dssi \ - --disable-gjdoc \ - --disable-examples \ - --enable-tools \ - --includedir=${STAGING_INCDIR}/classpath \ - " +EXTRA_OECONF = "\ + --with-glibj \ + --disable-Werror \ + --disable-alsa \ + --disable-gconf-peer \ + --disable-gtk-peer \ + --disable-plugin \ + --disable-dssi \ + --disable-examples \ +"recipes-core/classpath/classpath-native_0.99.bb +15
-16@@ -1,6 +1,5 @@ require classpath-native.inc -LIC_FILES_CHKSUM = "file://COPYING;md5=af0004801732bc4b20d90f351cf80510" DEPENDS += "classpath-initial-native ecj-initial-native virtual/java-initial-native" PR = "${INC_PR}.0"@@ -12,21 +11,21 @@ SRC_URI += " \ file://miscompilation.patch \ file://toolwrapper-exithook.patch \ " - -# tools using java-initial rather than java sed it out -do_compile_append () { - - COMMANDS="gappletviewer gjarsigner gkeytool \ - gjar gnative2ascii gserialver grmiregistry \ - gtnameserv gorbd grmid grmic gjavah \ - " - - for i in ${COMMANDS}; - do - sed -i -e "s/java-initial/java/g" tools/${i} - done -} - SRC_URI[md5sum] = "0ae1571249172acd82488724a3b8acb4" SRC_URI[sha256sum] = "f929297f8ae9b613a1a167e231566861893260651d913ad9b6c11933895fecc8" +EXTRA_OECONF += "\ + --enable-local-sockets \ + --disable-gjdoc \ + --enable-tools \ + --includedir=${STAGING_INCDIR}/classpath \ +" + +do_compile_append () { + # tools using java-initial rather than java sed it out + cd tools + sed -e "s/java-initial/java/g" \ + -i gappletviewer gjarsigner gkeytool \ + gjar gnative2ascii gserialver grmiregistry \ + gtnameserv gorbd grmid grmic gjavah +}
Hi,
this is a note to let you know that I've just added this patch to the master-next branch of the meta-java repository at
git://git.yoctoproject.org/meta-java
As soon as it has gone through some more testing it will likely be merged to the master branch.
If you have any questions, please let me know.
regards;Richard.L
Quoted 176 lines · André Draszik
From: André Draszik <[email protected]>
removing lots of code-duplication
Signed-off-by André Draszik <[email protected]>--- .../classpath/classpath-initial-native_0.93.bb | 54 ++++++++++------------ recipes-core/classpath/classpath-native.inc | 25 +++++----- recipes-core/classpath/classpath-native_0.99.bb | 31 ++++++------- 3 files changed, 51 insertions(+), 59 deletions(-)recipes-core/classpath/classpath-initial-native_0.93.bb +25
-29@@ -4,7 +4,6 @@ require classpath-native.inc DESCRIPTION="Java1.4-compatible GNU Classpath variant that is used as bootclasspath for jikes-native." -LIC_FILES_CHKSUM = "file://COPYING;md5=af0004801732bc4b20d90f351cf80510" DEPENDS += "jikes-native" PR = "${INC_PR}.2"@@ -13,38 +12,35 @@ SRC_URI += " \ file://autotools.patch \ file://miscompilation.patch \ " +SRC_URI[md5sum] = "ffa9e9cac31c5acbf0ea9eff9efa923d" +SRC_URI[sha256sum] = "df2d093612abd23fe67e9409d89bb2a8e79b1664fe2b2da40e1c8ed693e32945" -EXTRA_OECONF = " \ - --with-jikes=jikes \ - --with-fastjar=fastjar \ - --with-glibj \ - --disable-Werror \ - --disable-local-sockets \ - --disable-alsa \ - --disable-gconf-peer \ - --disable-gtk-peer \ - --disable-plugin \ - --disable-dssi \ - --disable-examples \ - --with-glibj-dir=${STAGING_DATADIR_NATIVE}/classpath-initial \ - --with-native-libdir=${STAGING_LIBDIR_NATIVE}/classpath-initial \ - --includedir=${STAGING_INCDIR_NATIVE}/classpath-initial \ - --with-vm=java \ - " +EXTRA_OECONF += "\ + --with-jikes=jikes \ + --with-fastjar=fastjar \ + --disable-local-sockets \ + --with-glibj-dir=${STAGING_DATADIR_NATIVE}/classpath-initial \ + --with-native-libdir=${STAGING_LIBDIR_NATIVE}/classpath-initial \ + --includedir=${STAGING_INCDIR_NATIVE}/classpath-initial \ + --with-vm=java \ +" # Ensure tools.zip is not installed at same path as classpath-native EXTRA_OEMAKE += "pkgdatadir=${STAGING_DATADIR_NATIVE}/classpath-initial" -# remove files clashing with classpath-native in sysroot do_install_append() { - - for i in gappletviewer gjarsigner gkeytool gjar gnative2ascii gserialver grmiregistry gtnameserv gorbd grmid - do - rm ${D}${bindir}/${i} - done - rm ${D}${libdir}/logging.properties - rm ${D}${libdir}/security/classpath.security + # remove files clashing with classpath-native in sysroot + rm \ + ${D}${bindir}/gappletviewer \ + ${D}${bindir}/gjarsigner \ + ${D}${bindir}/gkeytool \ + ${D}${bindir}/gjar \ + ${D}${bindir}/gnative2ascii \ + ${D}${bindir}/gserialver \ + ${D}${bindir}/grmiregistry \ + ${D}${bindir}/gtnameserv \ + ${D}${bindir}/gorbd \ + ${D}${bindir}/grmid \ + ${D}${libdir}/logging.properties \ + ${D}${libdir}/security/classpath.security } -SRC_URI[md5sum] = "ffa9e9cac31c5acbf0ea9eff9efa923d" -SRC_URI[sha256sum] = "df2d093612abd23fe67e9409d89bb2a8e79b1664fe2b2da40e1c8ed693e32945" -recipes-core/classpath/classpath-native.inc +11
-14@@ -1,6 +1,7 @@ SUMMARY = "GNU Classpath standard Java libraries - For native Java-dependent programs" HOMEPAGE = "http://www.gnu.org/software/classpath/" LICENSE = "GPL-2.0 & SAX-PD" +LIC_FILES_CHKSUM = "file://COPYING;md5=af0004801732bc4b20d90f351cf80510" DEPENDS = "fastjar-native zip-native"@@ -14,17 +15,13 @@ export JAVA="${STAGING_BINDIR_NATIVE}/java-initial" export JAVAC="${STAGING_BINDIR_NATIVE}/ecj-initial" export JAVACFLAGS="-nowarn" -EXTRA_OECONF = " \ - --with-glibj \ - --enable-local-sockets \ - --disable-Werror \ - --disable-alsa \ - --disable-gconf-peer \ - --disable-gtk-peer \ - --disable-plugin \ - --disable-dssi \ - --disable-gjdoc \ - --disable-examples \ - --enable-tools \ - --includedir=${STAGING_INCDIR}/classpath \ - " +EXTRA_OECONF = "\ + --with-glibj \ + --disable-Werror \ + --disable-alsa \ + --disable-gconf-peer \ + --disable-gtk-peer \ + --disable-plugin \ + --disable-dssi \ + --disable-examples \ +"recipes-core/classpath/classpath-native_0.99.bb +15
-16@@ -1,6 +1,5 @@ require classpath-native.inc -LIC_FILES_CHKSUM = "file://COPYING;md5=af0004801732bc4b20d90f351cf80510" DEPENDS += "classpath-initial-native ecj-initial-native virtual/java-initial-native" PR = "${INC_PR}.0"@@ -12,21 +11,21 @@ SRC_URI += " \ file://miscompilation.patch \ file://toolwrapper-exithook.patch \ " - -# tools using java-initial rather than java sed it out -do_compile_append () { - - COMMANDS="gappletviewer gjarsigner gkeytool \ - gjar gnative2ascii gserialver grmiregistry \ - gtnameserv gorbd grmid grmic gjavah \ - " - - for i in ${COMMANDS}; - do - sed -i -e "s/java-initial/java/g" tools/${i} - done -} - SRC_URI[md5sum] = "0ae1571249172acd82488724a3b8acb4" SRC_URI[sha256sum] = "f929297f8ae9b613a1a167e231566861893260651d913ad9b6c11933895fecc8" +EXTRA_OECONF += "\ + --enable-local-sockets \ + --disable-gjdoc \ + --enable-tools \ + --includedir=${STAGING_INCDIR}/classpath \ +" + +do_compile_append () { + # tools using java-initial rather than java sed it out + cd tools + sed -e "s/java-initial/java/g" \ + -i gappletviewer gjarsigner gkeytool \ + gjar gnative2ascii gserialver grmiregistry \ + gtnameserv gorbd grmid grmic gjavah +}