1

[alpine-aports] [PATCH] main/apr-util: re-add mysql support

Stefan Schwarz
Details
Message ID
<20181004130854.10198-1-ssz@netzmarkt.de>
Sender timestamp
1538658534
DKIM signature
missing
Download raw message
Patch: +5 -3
was removed in commit 3f7f81, builds without any issue
---
 main/apr-util/APKBUILD | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/main/apr-util/APKBUILD b/main/apr-util/APKBUILD
index e19783c316..98d72700f2 100644
--- a/main/apr-util/APKBUILD
+++ b/main/apr-util/APKBUILD
@@ -1,17 +1,17 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=apr-util
 pkgver=1.6.1
-pkgrel=2
+pkgrel=3
 pkgdesc="The Apache Portable Runtime Utility Library"
 url="http://apr.apache.org/"
 arch="all"
 license="Apache-2.0"
 depends=
-subpackages="$pkgname-dev $pkgname-dbm_db $pkgname-dbd_pgsql
+subpackages="$pkgname-dev $pkgname-dbm_db $pkgname-dbd_pgsql $pkgname-dbd_mysql
 	$pkgname-dbd_sqlite3 $pkgname-ldap"
 
 depends_dev="expat-dev apr-dev openldap-dev sqlite-dev postgresql-dev
-	db-dev libressl-dev"
+	db-dev libressl-dev mariadb-dev"
 makedepends="$depends_dev bash chrpath libressl"
 source="http://www.apache.org/dist/apr/$pkgname-$pkgver.tar.bz2"
 builddir="$srcdir/$pkgname-$pkgver"
@@ -25,6 +25,7 @@ build() {
 		--with-apr=/usr \
 		--with-ldap \
 		--with-pgsql \
+                --with-mysql \
 		--with-sqlite3 \
 		--with-berkeley-db \
 		--with-crypto \
@@ -46,6 +47,7 @@ _mv_mod() {
 	pkgdesc="The Apache Portable Runtime Utility Library - $2 driver"
 	depends=
 	local _moddir="usr/lib/apr-util-1"
+	ls "$pkgdir"/$_moddir
 	mkdir -p "$subpkgdir"/$_moddir
 	mv "$pkgdir"/$_moddir/apr_$1*.so "$subpkgdir"/$_moddir/
 }
-- 
2.19.0



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---
Natanael Copa
Details
Message ID
<20181004160908.7692364c@ncopa-desktop.copa.dup.pw>
In-Reply-To
<20181004130854.10198-1-ssz@netzmarkt.de> (view parent)
Sender timestamp
1538662148
DKIM signature
missing
Download raw message
Hi,

Thank you for sending this. Please see comments below.


On Thu,  4 Oct 2018 15:08:54 +0200
Stefan Schwarz <ssz@netzmarkt.de> wrote:

> was removed in commit 3f7f81, builds without any issue
> ---
>  main/apr-util/APKBUILD | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/main/apr-util/APKBUILD b/main/apr-util/APKBUILD
> index e19783c316..98d72700f2 100644
> --- a/main/apr-util/APKBUILD
> +++ b/main/apr-util/APKBUILD
> @@ -1,17 +1,17 @@
>  # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
>  pkgname=apr-util
>  pkgver=1.6.1
> -pkgrel=2
> +pkgrel=3
>  pkgdesc="The Apache Portable Runtime Utility Library"
>  url="http://apr.apache.org/"
>  arch="all"
>  license="Apache-2.0"
>  depends=
> -subpackages="$pkgname-dev $pkgname-dbm_db $pkgname-dbd_pgsql
> +subpackages="$pkgname-dev $pkgname-dbm_db $pkgname-dbd_pgsql $pkgname-dbd_mysql
>  	$pkgname-dbd_sqlite3 $pkgname-ldap"
>  
>  depends_dev="expat-dev apr-dev openldap-dev sqlite-dev postgresql-dev
> -	db-dev libressl-dev"
> +	db-dev libressl-dev mariadb-dev"
>  makedepends="$depends_dev bash chrpath libressl"
>  source="http://www.apache.org/dist/apr/$pkgname-$pkgver.tar.bz2"
>  builddir="$srcdir/$pkgname-$pkgver"
> @@ -25,6 +25,7 @@ build() {
>  		--with-apr=/usr \
>  		--with-ldap \
>  		--with-pgsql \
> +                --with-mysql \

Looks like space instead of tabs here.


>  		--with-sqlite3 \
>  		--with-berkeley-db \
>  		--with-crypto \
> @@ -46,6 +47,7 @@ _mv_mod() {
>  	pkgdesc="The Apache Portable Runtime Utility Library - $2 driver"
>  	depends=
>  	local _moddir="usr/lib/apr-util-1"
> +	ls "$pkgdir"/$_moddir

I suppose this is not needed either.

>  	mkdir -p "$subpkgdir"/$_moddir
>  	mv "$pkgdir"/$_moddir/apr_$1*.so "$subpkgdir"/$_moddir/
>  }


I think I just commit and fix the two issues above.

Thank you!

-nc


---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---