diff options
| author | fftmp | 2022-10-20 01:36:47 +0400 |
|---|---|---|
| committer | fftmp | 2022-10-20 01:37:13 +0400 |
| commit | 5667b9e478c50f038dd0df6292bd054e724bf709 (patch) | |
| tree | 266fd5938954a1ba0a9fccbf5839f407313a8737 | |
| parent | a656c708c389c045d0f073ccd2326d7803c9068d (diff) | |
| download | aur-5667b9e478c50f038dd0df6292bd054e724bf709.tar.gz | |
update ship_find_apr.m4.patch. For unknown reason this patch canot be applied if I install this package from AR using pikaur, but can be applied if I use makepkg directly. Hope, that updated patch helps.
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 4 | ||||
| -rw-r--r-- | ship_find_apr.m4.patch | 26 |
3 files changed, 18 insertions, 16 deletions
@@ -1,6 +1,6 @@ pkgbase = apr-2-svn pkgdesc = Apache Portable Runtime library. This is version 2 from SVN trunk, possibly unstable. - pkgver = r1904699 + pkgver = r1904703 pkgrel = 1 url = https://apr.apache.org/ arch = x86_64 @@ -14,7 +14,7 @@ pkgbase = apr-2-svn source = omit_extra_libs.patch source = dont_override_external_buildflags sha256sums = SKIP - sha256sums = 315932ef6536fc0644c1efe770ceb3bb675c3c7103a7cbb2f02efd8be03eb752 + sha256sums = 268f65a263199901a07788a28e3e7bac74cd445dac677ca4e22a054d9e5315fd sha256sums = 12595d331b48be9e44bd843635eb4f0f500bd213e197a551a9d383a28a24641f sha256sums = 3d491d3af8fb5a75db4e085a17e5d8dcbe058bd256ef893ee779dc97fc9f8ad6 sha256sums = 5ac0bdc532479f6082d29115ac9d3ca24524fd8b97a556568755b88e5a68e3df @@ -1,7 +1,7 @@ # Maintainer: fft pkgname=apr-2-svn -pkgver=r1904699 +pkgver=r1904703 pkgrel=1 pkgdesc='Apache Portable Runtime library. This is version 2 from SVN trunk, possibly unstable.' arch=('x86_64') @@ -15,7 +15,7 @@ source=("${pkgname}::svn+https://svn.apache.org/repos/asf/apr/apr/trunk/" 'omit_extra_libs.patch' 'dont_override_external_buildflags') sha256sums=('SKIP' - '315932ef6536fc0644c1efe770ceb3bb675c3c7103a7cbb2f02efd8be03eb752' + '268f65a263199901a07788a28e3e7bac74cd445dac677ca4e22a054d9e5315fd' '12595d331b48be9e44bd843635eb4f0f500bd213e197a551a9d383a28a24641f' '3d491d3af8fb5a75db4e085a17e5d8dcbe058bd256ef893ee779dc97fc9f8ad6' '5ac0bdc532479f6082d29115ac9d3ca24524fd8b97a556568755b88e5a68e3df') diff --git a/ship_find_apr.m4.patch b/ship_find_apr.m4.patch index 03939706240d..870996a97775 100644 --- a/ship_find_apr.m4.patch +++ b/ship_find_apr.m4.patch @@ -1,25 +1,27 @@ -From: Tollef Fog Heen <tfheen@err.no> -Subject: Install a set of random build files too +From 8580c5b57a4ec1aaf6ab969eeb7f51cb7d2926e9 Mon Sep 17 00:00:00 2001 +From: fftmp <none> +Date: Thu, 20 Oct 2022 01:32:02 +0400 +Subject: [PATCH] apply patch --- - Makefile.in | 9 +++++++++ - 1 file changed, 9 insertions(+) + Makefile.in | 4 ++++ + 1 file changed, 4 insertions(+) ---- apr.orig/Makefile.in -+++ apr/Makefile.in -@@ -92,6 +92,15 @@ install: $(TARGETS) +diff --git a/Makefile.in b/Makefile.in +index 5f86b663d..a35021798 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -118,6 +118,10 @@ install: install-modules $(TARGETS) done $(INSTALL_DATA) build/apr_rules.out $(DESTDIR)$(installbuilddir)/apr_rules.mk $(INSTALL) -m 755 apr-config.out $(DESTDIR)$(bindir)/$(APR_CONFIG) -+ -+ if [ ! -d $(DESTDIR)$(installbuilddir) ]; then \ -+ $(top_srcdir)/build/mkdir.sh $(DESTDIR)$(installbuilddir); \ -+ fi + for file in find_apr.m4 apr_common.m4 install.sh gen-build.py get-version.sh ; do \ + $(LIBTOOL) --mode=install cp $(top_srcdir)/build/$$file \ + $(DESTDIR)$(installbuilddir)/$$file ; \ + done -+ @if [ $(INSTALL_SUBDIRS) != "none" ]; then \ for i in $(INSTALL_SUBDIRS); do \ ( cd $$i ; $(MAKE) DESTDIR=$(DESTDIR) install ); \ +-- +2.38.1 + |