Advertisement
Guest User

Untitled

a guest
Oct 29th, 2014
154
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Bash 2.44 KB | None | 0 0
  1. diff -Naur java8-openjdk/PKGBUILD java8-openjdk_arm/PKGBUILD
  2. --- java8-openjdk/PKGBUILD  2014-10-29 18:59:57.319088735 +0100
  3. +++ java8-openjdk_arm/PKGBUILD  2014-10-29 18:52:58.669813215 +0100
  4. @@ -7,7 +7,7 @@
  5.  #   icedtea-web-java8
  6.  #   add policytool desktop files
  7.  
  8. -pkgname=('jre8-openjdk-headless' 'jre8-openjdk' 'jdk8-openjdk' 'openjdk8-src' 'openjdk8-doc')
  9. +pkgname=('jre8-openjdk-headless' 'jre8-openjdk' 'jdk8-openjdk' 'openjdk8-src')
  10.  pkgbase=java8-openjdk
  11.  _java_ver=8
  12.  _jdk_update=25
  13. @@ -19,7 +19,8 @@
  14.  url='http://openjdk.java.net/'
  15.  license=('custom')
  16.  makedepends=('jdk7-openjdk' 'ccache' 'cpio' 'unzip' 'zip'
  17. -             'libxrender' 'libxtst' 'fontconfig' 'libcups' 'alsa-lib')
  18. +             'libxrender' 'libxtst' 'fontconfig' 'libcups' 'alsa-lib'
  19. +             'procps-ng' 'inetutils')
  20.  _url_src=http://hg.openjdk.java.net/jdk8u/jdk8u
  21.  source=(jdk8u-${_repo_ver}.tar.gz::${_url_src}/archive/${_repo_ver}.tar.gz
  22.          corba-${_repo_ver}.tar.gz::${_url_src}/corba/archive/${_repo_ver}.tar.gz
  23. @@ -46,6 +47,7 @@
  24.  case "${CARCH}" in
  25.    'x86_64') _JARCH=amd64 ; _DOC_ARCH=x86_64 ;;
  26.    'i686'  ) _JARCH=i386  ; _DOC_ARCH=x86    ;;
  27. +  'arm' | 'armv6h' | 'armv7h') _JARCH=arm   ;;
  28.  esac
  29.  
  30.  _jdkname=openjdk8
  31. @@ -77,6 +79,8 @@
  32.  build() {
  33.    cd "${srcdir}/jdk8u-${_repo_ver}"
  34.  
  35. +  CFLAGS=$(echo ${CFLAGS} | sed -e 's/-D_FORTIFY_SOURCE=2//') && CXXFLAGS="${CFLAGS}"
  36. +
  37.    unset JAVA_HOME
  38.    # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1346
  39.    export MAKEFLAGS=${MAKEFLAGS/-j*}
  40. @@ -88,7 +92,10 @@
  41.      --with-build-number="b${_jdk_build}" \
  42.      --with-milestone="fcs" \
  43.      --enable-unlimited-crypto \
  44. -    --with-zlib=system
  45. +    --with-zlib=system \
  46. +    --disable-docs \
  47. +    --with-jvm-variants=zero
  48. +    #--with-jvm-variants=zeroshark
  49.  
  50.      # TODO OpenJDK does not want last version of giflib (add 'giflib' as dependency once fixed)
  51.      #--with-giflib=system \
  52. @@ -100,8 +107,6 @@
  53.    # These help to debug builds:
  54.    #LOG=trace HOTSPOT_BUILD_JOBS=1
  55.  
  56. -  make docs
  57. -
  58.    # FIXME sadly 'DESTDIR' is not used here!
  59.    make install
  60.  
  61. @@ -283,11 +288,3 @@
  62.  
  63.    install -D "${srcdir}/${_imgdir}/src.zip" "${pkgdir}${_jvmdir}/src.zip"
  64.  }
  65. -
  66. -package_openjdk8-doc() {
  67. -  pkgdesc='OpenJDK Java 8 documentation'
  68. -
  69. -  install -d -m 755 "${pkgdir}/usr/share/doc/${pkgbase}/"
  70. -  cp -r "${srcdir}"/jdk8u-${_repo_ver}/build/linux-${_DOC_ARCH}-normal-server-release/docs/* \
  71. -    "${pkgdir}/usr/share/doc/${pkgbase}/"
  72. -}
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement