[arch-commits] Commit in tomcat-native/repos/extra-x86_64 (4 files)
Maxime Gauduin
alucryd at gemini.archlinux.org
Tue Apr 26 09:09:49 UTC 2022
Date: Tuesday, April 26, 2022 @ 09:09:49
Author: alucryd
Revision: 444000
archrelease: copy trunk to extra-x86_64
Added:
tomcat-native/repos/extra-x86_64/PKGBUILD
(from rev 443999, tomcat-native/trunk/PKGBUILD)
tomcat-native/repos/extra-x86_64/tomcat-native-buildconf.patch
(from rev 443999, tomcat-native/trunk/tomcat-native-buildconf.patch)
Deleted:
tomcat-native/repos/extra-x86_64/PKGBUILD
tomcat-native/repos/extra-x86_64/tomcat-native-buildconf.patch
-------------------------------+
PKGBUILD | 118 ++++++++++++++++++++--------------------
tomcat-native-buildconf.patch | 24 ++++----
2 files changed, 71 insertions(+), 71 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-04-26 09:09:42 UTC (rev 443999)
+++ PKGBUILD 2022-04-26 09:09:49 UTC (rev 444000)
@@ -1,59 +0,0 @@
-# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
-# Contributor: Guillaume Alaux <guillaume at archlinux.org>
-# Contributor: Vitaliy Berdinskikh <ur6lad at i.ua>
-
-pkgname=tomcat-native
-pkgver=1.2.31
-pkgrel=2
-pkgdesc='Optional component for Tomcat to use certain native resources for performance, compatibility'
-arch=(x86_64)
-url=https://tomcat.apache.org/native-doc/
-license=(APACHE)
-depends=(apr)
-makedepends=(
- git
- java-environment
- python
-)
-options=(!emptydirs)
-_tag=7e16cd817767bfc1be9fd854728d97641928702f
-source=(
- git+https://github.com/apache/tomcat-native.git#tag=${_tag}
- tomcat-native-buildconf.patch
-)
-b2sums=(
- SKIP
- d3603079626b908644331c193452088ef3ce89e92c775c60b232d16d04b8c49d40106d55c76f81c87daea93d335868140df0046c7102796d92b08431ac8749a4
-)
-
-pkgver() {
- cd tomcat-native
-
- git describe --tags
-}
-
-prepare() {
- cd tomcat-native/native
-
- patch -Np2 -i ../../tomcat-native-buildconf.patch
- automake --add-missing --copy --force-missing || true
- ./buildconf \
- --with-apr=/usr/share/apr-1
-}
-
-build() {
- cd tomcat-native/native
-
- ./configure \
- --prefix=/usr \
- --with-apr=/usr/bin/apr-1-config \
- --with-java-home=/usr/lib/jvm/default \
- --with-ssl=/usr
- make
-}
-
-package() {
- make DESTDIR="${pkgdir}" -C tomcat-native/native install
-}
-
-# vim: ts=2 sw=2 et:
Copied: tomcat-native/repos/extra-x86_64/PKGBUILD (from rev 443999, tomcat-native/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-04-26 09:09:49 UTC (rev 444000)
@@ -0,0 +1,59 @@
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+# Contributor: Guillaume Alaux <guillaume at archlinux.org>
+# Contributor: Vitaliy Berdinskikh <ur6lad at i.ua>
+
+pkgname=tomcat-native
+pkgver=1.2.32
+pkgrel=1
+pkgdesc='Optional component for Tomcat to use certain native resources for performance, compatibility'
+arch=(x86_64)
+url=https://tomcat.apache.org/native-doc/
+license=(APACHE)
+depends=(apr)
+makedepends=(
+ git
+ java-environment
+ python
+)
+options=(!emptydirs)
+_tag=ee11afcb5bc3426b85525985461484222f609406
+source=(
+ git+https://github.com/apache/tomcat-native.git#tag=${_tag}
+ tomcat-native-buildconf.patch
+)
+b2sums=(
+ SKIP
+ d3603079626b908644331c193452088ef3ce89e92c775c60b232d16d04b8c49d40106d55c76f81c87daea93d335868140df0046c7102796d92b08431ac8749a4
+)
+
+pkgver() {
+ cd tomcat-native
+
+ git describe --tags
+}
+
+prepare() {
+ cd tomcat-native/native
+
+ patch -Np2 -i ../../tomcat-native-buildconf.patch
+ automake --add-missing --copy --force-missing || true
+ ./buildconf \
+ --with-apr=/usr/share/apr-1
+}
+
+build() {
+ cd tomcat-native/native
+
+ ./configure \
+ --prefix=/usr \
+ --with-apr=/usr/bin/apr-1-config \
+ --with-java-home=/usr/lib/jvm/default \
+ --with-ssl=/usr
+ make
+}
+
+package() {
+ make DESTDIR="${pkgdir}" -C tomcat-native/native install
+}
+
+# vim: ts=2 sw=2 et:
Deleted: tomcat-native-buildconf.patch
===================================================================
--- tomcat-native-buildconf.patch 2022-04-26 09:09:42 UTC (rev 443999)
+++ tomcat-native-buildconf.patch 2022-04-26 09:09:49 UTC (rev 444000)
@@ -1,12 +0,0 @@
-diff -rupN tomcat-native.orig/native/buildconf tomcat-native/native/buildconf
---- tomcat-native.orig/native/buildconf 2020-09-20 14:44:45.114714616 +0200
-+++ tomcat-native/native/buildconf 2020-09-20 14:44:58.368172703 +0200
-@@ -55,7 +55,7 @@ if [ ! -d "$apr_src_dir/build" ]; then
- fi
-
- # Remove some files, then copy them from apr source tree
--for file in apr_common.m4 find_apr.m4 install.sh config.guess config.sub
-+for file in apr_common.m4 find_apr.m4 install.sh
- do
- if [ ! -f "$apr_src_dir/build/$file" ]; then
- echo "File '$apr_src_dir/build/$file' missing - wrong apr source directory?"
Copied: tomcat-native/repos/extra-x86_64/tomcat-native-buildconf.patch (from rev 443999, tomcat-native/trunk/tomcat-native-buildconf.patch)
===================================================================
--- tomcat-native-buildconf.patch (rev 0)
+++ tomcat-native-buildconf.patch 2022-04-26 09:09:49 UTC (rev 444000)
@@ -0,0 +1,12 @@
+diff -rupN tomcat-native.orig/native/buildconf tomcat-native/native/buildconf
+--- tomcat-native.orig/native/buildconf 2020-09-20 14:44:45.114714616 +0200
++++ tomcat-native/native/buildconf 2020-09-20 14:44:58.368172703 +0200
+@@ -55,7 +55,7 @@ if [ ! -d "$apr_src_dir/build" ]; then
+ fi
+
+ # Remove some files, then copy them from apr source tree
+-for file in apr_common.m4 find_apr.m4 install.sh config.guess config.sub
++for file in apr_common.m4 find_apr.m4 install.sh
+ do
+ if [ ! -f "$apr_src_dir/build/$file" ]; then
+ echo "File '$apr_src_dir/build/$file' missing - wrong apr source directory?"
More information about the arch-commits
mailing list