From patchwork Sun May 22 21:04:56 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [1/3] icedtea6-native: convert spaces to tabulators Date: Sun, 22 May 2011 21:04:56 -0000 From: Paul Menzel X-Patchwork-Id: 4617 Message-Id: <1306098296.5994.89.camel@mattotaupa> To: openembedded-devel@lists.openembedded.org Date: Sun, 22 May 2011 21:56:18 +0200 Tabulators are mostly used in the recipes so the few spaces are converted to tabulators to unify the style. The format guidelines in the style guide [1] recommend to use spaces though. [1] http://openembedded.org/index.php/Styleguide#Format_Guidelines Signed-off-by: Paul Menzel --- recipes/icedtea/icedtea6-native.inc | 44 ++++++++++++++-------------- recipes/icedtea/icedtea6-native_1.7.10.bb | 2 +- recipes/icedtea/icedtea6-native_1.7.5.bb | 2 +- recipes/icedtea/icedtea6-native_1.8.bb | 8 ++-- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/recipes/icedtea/icedtea6-native.inc b/recipes/icedtea/icedtea6-native.inc index 06da7c0..968bd4b 100644 --- a/recipes/icedtea/icedtea6-native.inc +++ b/recipes/icedtea/icedtea6-native.inc @@ -7,9 +7,9 @@ DEPENDS = "virtual/javac-native classpath-tools-native \ virtual/java-native classpath-native \ xalan-j-native xerces-j-native rhino-native \ ant-native \ - libx11-native xproto-native libxt-native libxext-native \ + libx11-native xproto-native libxt-native libxext-native \ freetype-native zlib-native giflib-native jpeg-native \ - zip-native \ + zip-native \ " inherit native java autotools @@ -29,7 +29,7 @@ EXTRA_OECONF = "\ --disable-docs \ --disable-pulse-java \ --disable-plugin \ - --disable-npplugin \ + --disable-npplugin \ --disable-xrender \ \ --with-ecj=${STAGING_BINDIR_NATIVE}/ecj-bootstrap \ @@ -56,19 +56,19 @@ JDK_INSTALL_DIR = "${D}/${libdir_jvm}/${JDK_DIR}" do_configure_prepend() { - case "${TARGET_ARCH}" in - x86_64) - libarch=amd64 - ;; - i386|i486|i586|i686) - libarch=x86 - ;; - *) - arch=${TARGET_ARCH} - libarch=${TARGET_ARCH} - ;; - esac - + case "${TARGET_ARCH}" in + x86_64) + libarch=amd64 + ;; + i386|i486|i586|i686) + libarch=x86 + ;; + *) + arch=${TARGET_ARCH} + libarch=${TARGET_ARCH} + ;; + esac + chmod -R ug+w ${WORKDIR}/openjdk-src-dir (cd ${WORKDIR}/openjdk-src-dir && sh ${S}/fsg.sh) @@ -132,13 +132,13 @@ do_compile() { ;; esac - echo "libarch ist ${libarch}" + echo "libarch ist ${libarch}" - install -d openjdk-ecj/control/build/linux-$arch/hotspot/import/jre/lib - if [ $libarch != $arch ]; then - # Something is strange with the directoy naming. OpenJDK uses both variants. - ln -sf $libarch openjdk-ecj/control/build/linux-$arch/hotspot/import/jre/lib/$arch - fi + install -d openjdk-ecj/control/build/linux-$arch/hotspot/import/jre/lib + if [ $libarch != $arch ]; then + # Something is strange with the directoy naming. OpenJDK uses both variants. + ln -sf $libarch openjdk-ecj/control/build/linux-$arch/hotspot/import/jre/lib/$arch + fi # First build hotspot to get a libjvm.so diff --git a/recipes/icedtea/icedtea6-native_1.7.10.bb b/recipes/icedtea/icedtea6-native_1.7.10.bb index 77c6232..136a2b8 100644 --- a/recipes/icedtea/icedtea6-native_1.7.10.bb +++ b/recipes/icedtea/icedtea6-native_1.7.10.bb @@ -9,7 +9,7 @@ SRC_URI = "\ file://icedtea-fix-jar-path.patch \ file://build-hacks-native.patch \ file://icedtea-sane-x86-arch-name.patch \ - file://icedtea-javac-in.patch \ + file://icedtea-javac-in.patch \ ${ICEDTEA_PATCHES} \ " SRC_URI[ojdk.md5sum] = "078fe0ab744c98694decc77f2456c560" diff --git a/recipes/icedtea/icedtea6-native_1.7.5.bb b/recipes/icedtea/icedtea6-native_1.7.5.bb index 373d1c4..a101f99 100644 --- a/recipes/icedtea/icedtea6-native_1.7.5.bb +++ b/recipes/icedtea/icedtea6-native_1.7.5.bb @@ -9,7 +9,7 @@ SRC_URI = "\ file://icedtea-fix-jar-path.patch \ file://build-hacks-native.patch \ file://icedtea-sane-x86-arch-name.patch \ - file://icedtea-javac-in.patch \ + file://icedtea-javac-in.patch \ ${ICEDTEA_PATCHES} \ " SRC_URI[ojdk.md5sum] = "078fe0ab744c98694decc77f2456c560" diff --git a/recipes/icedtea/icedtea6-native_1.8.bb b/recipes/icedtea/icedtea6-native_1.8.bb index 67c2632..629b95f 100644 --- a/recipes/icedtea/icedtea6-native_1.8.bb +++ b/recipes/icedtea/icedtea6-native_1.8.bb @@ -39,9 +39,9 @@ ICEDTEA_PATCHES = "\ file://icedtea-ecj-disable-compilation.patch;apply=no \ file://icedtea-ecj-fix-freetype.patch;apply=no \ file://icedtea-ecj-fix-zlib.patch;apply=no \ - file://icedtea-hotspot-make-arch-sane-for-x86.patch;apply=no \ - file://icedtea-jdk-sane-x86-arch.patch;apply=no \ - file://icedtea-unbreak-float.patch;apply=no \ + file://icedtea-hotspot-make-arch-sane-for-x86.patch;apply=no \ + file://icedtea-jdk-sane-x86-arch.patch;apply=no \ + file://icedtea-unbreak-float.patch;apply=no \ " export DISTRIBUTION_PATCHES = "\ @@ -49,7 +49,7 @@ export DISTRIBUTION_PATCHES = "\ patches/icedtea-ecj-fix-freetype.patch \ patches/icedtea-ecj-fix-zlib.patch \ patches/icedtea-hotspot-make-arch-sane-for-x86.patch \ - patches/icedtea-jdk-sane-x86-arch.patch \ + patches/icedtea-jdk-sane-x86-arch.patch \ patches/icedtea-unbreak-float.patch \ "