Date: Thursday, February 14, 2019 @ 05:48:06 Author: svenstaro Revision: 432171
upgpkg: zeroc-ice 3.7.2-1 Modified: zeroc-ice/trunk/PKGBUILD ----------+ PKGBUILD | 32 +++++++++++--------------------- 1 file changed, 11 insertions(+), 21 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-02-14 02:34:00 UTC (rev 432170) +++ PKGBUILD 2019-02-14 05:48:06 UTC (rev 432171) @@ -5,13 +5,13 @@ pkgname=(zeroc-ice zeroc-ice-java) pkgbase=(zeroc-ice) -pkgver=3.7.1 +pkgver=3.7.2 pkgrel=1 pkgdesc="An object-oriented middleware that provides RPC functionality" arch=(x86_64) url="https://zeroc.com"; license=(GPL custom:ice) -makedepends=(bzip2 gradle 'java-environment=8' gcc7) +makedepends=(bzip2 gradle java-environment) depends=(mcpp lmdb) source=( "ice-${pkgver}.tar.gz::https://github.com/zeroc-ice/ice/archive/v${pkgver}.tar.gz"; @@ -18,8 +18,8 @@ "ice-packaging-${pkgver}.tar.gz::https://github.com/zeroc-ice/ice-packaging/archive/v${pkgver}.tar.gz"; zeroc-ice.sysusers ) -sha256sums=('b1526ab9ba80a3d5f314dacf22674dff005efb9866774903d0efca5a0fab326d' - '92530c87b12471df0cae98a7329039fa42902a9d7909eb32915fdc866b419e8a' +sha256sums=('e329a24abf94a4772a58a0fe61af4e707743a272c854552eef3d7833099f40f9' + '4a1aa0bfe3b2ec8ca9b834cbf3b1300fc48e25ccffe82a7a1b6d2f46644ba0bc' '5fdbb1ed753e84e6b49c529e171af848e74a8890fe485dfe1d2bbec3c198dd90') _make_args=( @@ -32,9 +32,7 @@ build() { cd ${srcdir}/ice-${pkgver} - export CC=gcc-7 - export CXX=g++-7 - GRADLE=gradle make srcs -j$(nproc) "${_make_args[@]}" "LANGUAGES=cpp java" + make "${_make_args[@]}" "LANGUAGES=cpp java" } package_zeroc-ice() { @@ -51,10 +49,8 @@ rm -f ${pkgdir}/usr/share/Ice-${pkgver}/LICENSE rm -f ${pkgdir}/usr/share/Ice-${pkgver}/ICE_LICENSE - if [ $CARCH = "x86_64" ]; then - rm -df ${pkgdir}/usr/lib/ - mv ${pkgdir}/usr/lib64/ ${pkgdir}/usr/lib/ - fi + rm -df ${pkgdir}/usr/lib/ + mv ${pkgdir}/usr/lib64/ ${pkgdir}/usr/lib/ install -Dm644 ${srcdir}/ice-packaging-${pkgver}/ice/rpm/glacier2router.conf ${pkgdir}/etc/glacier2router.conf install -Dm644 ${srcdir}/ice-packaging-${pkgver}/ice/rpm/icegridnode.conf ${pkgdir}/etc/icegridnode.conf @@ -77,16 +73,10 @@ makedepends=(gradle 'java-environment=8') depends=(zeroc-ice java-environment) - for d in ${srcdir}/ice-${pkgver}/java ${srcdir}/ice-${pkgver}/java-compat; do - cd $d - gradle \ - --gradle-user-home=/tmp/zeroc-ice-java \ - --no-daemon \ - -PdbHome=/usr/share/java/berkeleydb \ - -Pprefix=${pkgdir}/usr/share/java/zeroc-ice install + cd ${srcdir}/ice-${pkgver} - done + export GRADLE_USER_HOME=/tmp + make install "${_make_args[@]}" DESTDIR="${pkgdir}" "LANGUAGES=java" - mv ${pkgdir}/usr/share/java/zeroc-ice/lib/* ${pkgdir}/usr/share/java/zeroc-ice/ - rmdir ${pkgdir}/usr/share/java/zeroc-ice/lib + rm -rf "${pkgdir}"/usr/share/ice }
