Github messages for voidlinux
 help / color / Atom feed
* [PR PATCH] apr and reverse-depends cross flags
@ 2020-05-21 14:56 sgn
  2020-05-21 15:24 ` [PR PATCH] [Updated] " sgn
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: sgn @ 2020-05-21 14:56 UTC (permalink / raw)
  To: ml


[-- Attachment #1: Type: text/plain, Size: 671 bytes --]

There is a new pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages apr-reverse-depends-cross-flags
https://github.com/void-linux/void-packages/pull/22167

apr and reverse-depends cross flags
- remove cross cruft from `*-config` and `*.pc`
- correct cross flags for reverse dependencies if they're built fail.
- other reverse deps are being tested:
    - [x] serf
    - [ ] log4cxx
    - [ ] anjuta
    - [ ] kdevelop
    - [ ] subversion
    - [ ] subversion-kwallet-auth

`libreoffice` isn't able cross-compile yet.

A patch file from https://github.com/void-linux/void-packages/pull/22167.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-apr-reverse-depends-cross-flags-22167.patch --]
[-- Type: text/x-diff, Size: 4088 bytes --]

From 81a700c2792d4050896a973749af315406e1c012 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 21 May 2020 19:59:58 +0700
Subject: [PATCH 1/3] apr: remove $XBPS_CROSS_BASE cruft

---
 srcpkgs/apr/template | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apr/template b/srcpkgs/apr/template
index aef1aae62b9..f2dc1241668 100644
--- a/srcpkgs/apr/template
+++ b/srcpkgs/apr/template
@@ -1,7 +1,7 @@
 # Template file for 'apr'
 pkgname=apr
 version=1.7.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-installbuilddir=/usr/share/apr-1/build"
 makedepends="expat-devel libuuid-devel"
@@ -42,6 +42,14 @@ pre_build() {
 	fi
 }
 
+post_install() {
+	if [ "$CROSS_BUILD" ]; then
+		vsed -i -e "s,$XBPS_CROSS_BASE,,g" \
+			"$DESTDIR/usr/bin/apr-1-config" \
+			"$DESTDIR/usr/share/apr-1/build/apr_rules.mk"
+	fi
+}
+
 apr-devel_package() {
 	depends="libtool libuuid-devel apr>=${version}_${revision}"
 	short_desc+=" - development files"
@@ -53,6 +61,6 @@ apr-devel_package() {
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.exp"
 		vmove usr/lib/pkgconfig
-		ln -sf /usr/bin/libtool ${PKGDESTDIR}/usr/share/apr-1/build/libtool
+		ln -sf ../../../bin/libtool "$PKGDESTDIR/usr/share/apr-1/build/"
 	}
 }

From 3d19b5ec329af669f3c85947ec18cfdbdf6c2f96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 21 May 2020 20:50:36 +0700
Subject: [PATCH 2/3] apr-util: use wrapped apr-1-config

---
 srcpkgs/apr-util/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index dc1fb35b9a9..13436a674d4 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -4,7 +4,7 @@ version=1.6.1
 revision=8
 build_style=gnu-configure
 configure_args="
- --with-apr=${XBPS_CROSS_BASE}/usr/bin/apr-1-config --with-pgsql --with-ldap
+ --with-pgsql --with-ldap
  --with-expat=${XBPS_CROSS_BASE}/usr --with-gdbm=${XBPS_CROSS_BASE}/usr
  --with-sqlite3=${XBPS_CROSS_BASE}/usr --with-mysql=${XBPS_CROSS_BASE}/usr
  --with-berkeley-db=${XBPS_CROSS_BASE}/usr --with-odbc=${XBPS_CROSS_BASE}/usr
@@ -28,6 +28,11 @@ fi
 pre_configure() {
 	sed -i configure \
 		-e "s;^\(  APR_BUILD_DIR=\).*$;\1${XBPS_CROSS_BASE}/usr/share/apr-1/build;"
+	if [ "$CROSS_BUILD" ]; then
+		configure_args+=" --with-apr=${XBPS_WRAPPERDIR}/apr-1-config"
+	else
+		configure_args+=" --with-apr=/usr/bin/apr-1-config"
+	fi
 }
 
 post_configure() {

From de8e4476342553e7bf3e512b7b3adeca5a344433 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 21 May 2020 21:46:17 +0700
Subject: [PATCH 3/3] apache: correct cross flags

Following change in apr.
---
 srcpkgs/apache/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index cc118562468..fcd6675e987 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -20,9 +20,7 @@ configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
  --enable-dav-lock --enable-vhost-alias --enable-imagemap --enable-so
  --enable-rewrite --enable-layout=XBPS --sysconfdir=/etc/${pkgname}
  --enable-mpms-shared=all --with-pcre=${XBPS_CROSS_BASE}/usr
- --with-z=${XBPS_CROSS_BASE}/usr
- --with-apr=${XBPS_CROSS_BASE}/usr/bin/apr-1-config
- --with-apr-util=${XBPS_CROSS_BASE}/usr/bin/apu-1-config"
+ --with-z=${XBPS_CROSS_BASE}/usr"
 conf_files="
 	/etc/${pkgname}/extra/*.conf
 	/etc/${pkgname}/httpd.conf
@@ -64,6 +62,13 @@ pre_configure() {
 		-i docs/conf/httpd.conf.in
 
 	cat ${FILESDIR}/xbps.layout >> config.layout
+	if [ "$CROSS_BUILD" ]; then
+		configure_args+=" --with-apr=$XBPS_WRAPPERDIR/apr-1-config
+		 --with-apr-util=$XBPS_WRAPPERDIR/apu-1-config"
+	else
+		configure_args+=" --with-apr=/usr/bin/apr-1-config
+		 --with-apr-util=/usr/bin/apu-1-config"
+	fi
 }
 
 post_configure() {

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PR PATCH] [Updated] apr and reverse-depends cross flags
  2020-05-21 14:56 [PR PATCH] apr and reverse-depends cross flags sgn
@ 2020-05-21 15:24 ` sgn
  2020-05-21 15:24 ` sgn
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 5+ messages in thread
From: sgn @ 2020-05-21 15:24 UTC (permalink / raw)
  To: ml


[-- Attachment #1: Type: text/plain, Size: 696 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages apr-reverse-depends-cross-flags
https://github.com/void-linux/void-packages/pull/22167

apr and reverse-depends cross flags
- remove cross cruft from `*-config` and `*.pc`
- correct cross flags for reverse dependencies if they're built fail.
- other reverse deps are being tested:
    - [x] serf
    - [x] log4cxx
    - [x] anjuta
    - [ ] kdevelop
    - [ ] subversion
    - [ ] subversion-kwallet-auth
    - [x] apache


`libreoffice` isn't able cross-compile yet.

A patch file from https://github.com/void-linux/void-packages/pull/22167.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-apr-reverse-depends-cross-flags-22167.patch --]
[-- Type: text/x-diff, Size: 6193 bytes --]

From 81a700c2792d4050896a973749af315406e1c012 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 21 May 2020 19:59:58 +0700
Subject: [PATCH 1/5] apr: remove $XBPS_CROSS_BASE cruft

---
 srcpkgs/apr/template | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apr/template b/srcpkgs/apr/template
index aef1aae62b9..f2dc1241668 100644
--- a/srcpkgs/apr/template
+++ b/srcpkgs/apr/template
@@ -1,7 +1,7 @@
 # Template file for 'apr'
 pkgname=apr
 version=1.7.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-installbuilddir=/usr/share/apr-1/build"
 makedepends="expat-devel libuuid-devel"
@@ -42,6 +42,14 @@ pre_build() {
 	fi
 }
 
+post_install() {
+	if [ "$CROSS_BUILD" ]; then
+		vsed -i -e "s,$XBPS_CROSS_BASE,,g" \
+			"$DESTDIR/usr/bin/apr-1-config" \
+			"$DESTDIR/usr/share/apr-1/build/apr_rules.mk"
+	fi
+}
+
 apr-devel_package() {
 	depends="libtool libuuid-devel apr>=${version}_${revision}"
 	short_desc+=" - development files"
@@ -53,6 +61,6 @@ apr-devel_package() {
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.exp"
 		vmove usr/lib/pkgconfig
-		ln -sf /usr/bin/libtool ${PKGDESTDIR}/usr/share/apr-1/build/libtool
+		ln -sf ../../../bin/libtool "$PKGDESTDIR/usr/share/apr-1/build/"
 	}
 }

From 3d19b5ec329af669f3c85947ec18cfdbdf6c2f96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 21 May 2020 20:50:36 +0700
Subject: [PATCH 2/5] apr-util: use wrapped apr-1-config

---
 srcpkgs/apr-util/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index dc1fb35b9a9..13436a674d4 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -4,7 +4,7 @@ version=1.6.1
 revision=8
 build_style=gnu-configure
 configure_args="
- --with-apr=${XBPS_CROSS_BASE}/usr/bin/apr-1-config --with-pgsql --with-ldap
+ --with-pgsql --with-ldap
  --with-expat=${XBPS_CROSS_BASE}/usr --with-gdbm=${XBPS_CROSS_BASE}/usr
  --with-sqlite3=${XBPS_CROSS_BASE}/usr --with-mysql=${XBPS_CROSS_BASE}/usr
  --with-berkeley-db=${XBPS_CROSS_BASE}/usr --with-odbc=${XBPS_CROSS_BASE}/usr
@@ -28,6 +28,11 @@ fi
 pre_configure() {
 	sed -i configure \
 		-e "s;^\(  APR_BUILD_DIR=\).*$;\1${XBPS_CROSS_BASE}/usr/share/apr-1/build;"
+	if [ "$CROSS_BUILD" ]; then
+		configure_args+=" --with-apr=${XBPS_WRAPPERDIR}/apr-1-config"
+	else
+		configure_args+=" --with-apr=/usr/bin/apr-1-config"
+	fi
 }
 
 post_configure() {

From de8e4476342553e7bf3e512b7b3adeca5a344433 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 21 May 2020 21:46:17 +0700
Subject: [PATCH 3/5] apache: correct cross flags

Following change in apr.
---
 srcpkgs/apache/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index cc118562468..fcd6675e987 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -20,9 +20,7 @@ configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
  --enable-dav-lock --enable-vhost-alias --enable-imagemap --enable-so
  --enable-rewrite --enable-layout=XBPS --sysconfdir=/etc/${pkgname}
  --enable-mpms-shared=all --with-pcre=${XBPS_CROSS_BASE}/usr
- --with-z=${XBPS_CROSS_BASE}/usr
- --with-apr=${XBPS_CROSS_BASE}/usr/bin/apr-1-config
- --with-apr-util=${XBPS_CROSS_BASE}/usr/bin/apu-1-config"
+ --with-z=${XBPS_CROSS_BASE}/usr"
 conf_files="
 	/etc/${pkgname}/extra/*.conf
 	/etc/${pkgname}/httpd.conf
@@ -64,6 +62,13 @@ pre_configure() {
 		-i docs/conf/httpd.conf.in
 
 	cat ${FILESDIR}/xbps.layout >> config.layout
+	if [ "$CROSS_BUILD" ]; then
+		configure_args+=" --with-apr=$XBPS_WRAPPERDIR/apr-1-config
+		 --with-apr-util=$XBPS_WRAPPERDIR/apu-1-config"
+	else
+		configure_args+=" --with-apr=/usr/bin/apr-1-config
+		 --with-apr-util=/usr/bin/apu-1-config"
+	fi
 }
 
 post_configure() {

From 0bf91cb42e9e0f80cf246281820b5d815256f3e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 21 May 2020 22:21:39 +0700
Subject: [PATCH 4/5] subversion: correct cross following change in apr

---
 srcpkgs/subversion/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/subversion/template b/srcpkgs/subversion/template
index b52bdb5f801..873690d594b 100644
--- a/srcpkgs/subversion/template
+++ b/srcpkgs/subversion/template
@@ -42,8 +42,8 @@ pre_configure() {
 
 		# Use apr-1-config and apu-1-config wrappers
 		vsed -i config_vars.mk \
-			-e "s;/usr/bin/\(ap.-1-config\);${XBPS_WRAPPERDIR}/\1;g" \
-			-e "s;-I/usr/include;-I${XBPS_CROSS_BASE}/usr/include;g"
+			-e "/^APR_CONFIG/ s;=.*;= ${XBPS_WRAPPERDIR}/apr-1-config;" \
+			-e "s;\([I ]\)/usr/include;\1${XBPS_CROSS_BASE}/usr/include;g"
 
 		export PERL5LIB=${XBPS_STATEDIR}/perlprefix/${XBPS_TARGET_MACHINE}-linux
 		mkdir -p $PERL5LIB

From f3158cd20b6d3e348a34399cc39346c39a6b5521 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 21 May 2020 22:21:39 +0700
Subject: [PATCH 5/5] subversion-kwallet-auth: correct cross following change
 in apr

---
 srcpkgs/subversion-kwallet-auth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/subversion-kwallet-auth/template b/srcpkgs/subversion-kwallet-auth/template
index 35417b57648..e442fec25b0 100644
--- a/srcpkgs/subversion-kwallet-auth/template
+++ b/srcpkgs/subversion-kwallet-auth/template
@@ -44,8 +44,8 @@ pre_configure() {
 
 		# Use apr-1-config and apu-1-config wrappers
 		vsed -i config_vars.mk \
-			-e "s;/usr/bin/\(ap.-1-config\);${XBPS_WRAPPERDIR}/\1;g" \
-			-e "s;-I/usr/include;-I${XBPS_CROSS_BASE}/usr/include;g"
+			-e "/^APR_CONFIG/ s;=.*;= ${XBPS_WRAPPERDIR}/apr-1-config;" \
+			-e "s;\([I ]\)/usr/include;\1${XBPS_CROSS_BASE}/usr/include;g"
 
 		export PERL5LIB=${XBPS_STATEDIR}/perlprefix/${XBPS_TARGET_MACHINE}-linux
 		mkdir -p $PERL5LIB

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: apr and reverse-depends cross flags
  2020-05-21 14:56 [PR PATCH] apr and reverse-depends cross flags sgn
  2020-05-21 15:24 ` [PR PATCH] [Updated] " sgn
@ 2020-05-21 15:24 ` sgn
  2020-05-21 23:54 ` [PR PATCH] [Updated] " sgn
  2020-05-22  6:18 ` [PR PATCH] [Merged]: " sgn
  3 siblings, 0 replies; 5+ messages in thread
From: sgn @ 2020-05-21 15:24 UTC (permalink / raw)
  To: ml


[-- Attachment #1: Type: text/plain, Size: 181 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/22167#issuecomment-632148074

Comment:
@Chocimier because this touches `subversion`

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PR PATCH] [Updated] apr and reverse-depends cross flags
  2020-05-21 14:56 [PR PATCH] apr and reverse-depends cross flags sgn
  2020-05-21 15:24 ` [PR PATCH] [Updated] " sgn
  2020-05-21 15:24 ` sgn
@ 2020-05-21 23:54 ` sgn
  2020-05-22  6:18 ` [PR PATCH] [Merged]: " sgn
  3 siblings, 0 replies; 5+ messages in thread
From: sgn @ 2020-05-21 23:54 UTC (permalink / raw)
  To: ml


[-- Attachment #1: Type: text/plain, Size: 696 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages apr-reverse-depends-cross-flags
https://github.com/void-linux/void-packages/pull/22167

apr and reverse-depends cross flags
- remove cross cruft from `*-config` and `*.pc`
- correct cross flags for reverse dependencies if they're built fail.
- other reverse deps are being tested:
    - [x] serf
    - [x] log4cxx
    - [x] anjuta
    - [x] kdevelop
    - [x] subversion
    - [x] subversion-kwallet-auth
    - [x] apache


`libreoffice` isn't able cross-compile yet.

A patch file from https://github.com/void-linux/void-packages/pull/22167.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-apr-reverse-depends-cross-flags-22167.patch --]
[-- Type: text/x-diff, Size: 6327 bytes --]

From 14456d02a7ff6bcc3a8024318483f12d27972289 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 21 May 2020 19:59:58 +0700
Subject: [PATCH 1/5] apr: remove $XBPS_CROSS_BASE cruft

---
 srcpkgs/apr/template | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apr/template b/srcpkgs/apr/template
index aef1aae62b9..f2dc1241668 100644
--- a/srcpkgs/apr/template
+++ b/srcpkgs/apr/template
@@ -1,7 +1,7 @@
 # Template file for 'apr'
 pkgname=apr
 version=1.7.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-installbuilddir=/usr/share/apr-1/build"
 makedepends="expat-devel libuuid-devel"
@@ -42,6 +42,14 @@ pre_build() {
 	fi
 }
 
+post_install() {
+	if [ "$CROSS_BUILD" ]; then
+		vsed -i -e "s,$XBPS_CROSS_BASE,,g" \
+			"$DESTDIR/usr/bin/apr-1-config" \
+			"$DESTDIR/usr/share/apr-1/build/apr_rules.mk"
+	fi
+}
+
 apr-devel_package() {
 	depends="libtool libuuid-devel apr>=${version}_${revision}"
 	short_desc+=" - development files"
@@ -53,6 +61,6 @@ apr-devel_package() {
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.exp"
 		vmove usr/lib/pkgconfig
-		ln -sf /usr/bin/libtool ${PKGDESTDIR}/usr/share/apr-1/build/libtool
+		ln -sf ../../../bin/libtool "$PKGDESTDIR/usr/share/apr-1/build/"
 	}
 }

From f94ebfcc7369d8f75db004255399ec7d7774c53d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 21 May 2020 20:50:36 +0700
Subject: [PATCH 2/5] apr-util: use wrapped apr-1-config

---
 srcpkgs/apr-util/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index dc1fb35b9a9..13436a674d4 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -4,7 +4,7 @@ version=1.6.1
 revision=8
 build_style=gnu-configure
 configure_args="
- --with-apr=${XBPS_CROSS_BASE}/usr/bin/apr-1-config --with-pgsql --with-ldap
+ --with-pgsql --with-ldap
  --with-expat=${XBPS_CROSS_BASE}/usr --with-gdbm=${XBPS_CROSS_BASE}/usr
  --with-sqlite3=${XBPS_CROSS_BASE}/usr --with-mysql=${XBPS_CROSS_BASE}/usr
  --with-berkeley-db=${XBPS_CROSS_BASE}/usr --with-odbc=${XBPS_CROSS_BASE}/usr
@@ -28,6 +28,11 @@ fi
 pre_configure() {
 	sed -i configure \
 		-e "s;^\(  APR_BUILD_DIR=\).*$;\1${XBPS_CROSS_BASE}/usr/share/apr-1/build;"
+	if [ "$CROSS_BUILD" ]; then
+		configure_args+=" --with-apr=${XBPS_WRAPPERDIR}/apr-1-config"
+	else
+		configure_args+=" --with-apr=/usr/bin/apr-1-config"
+	fi
 }
 
 post_configure() {

From fab7557a4d095c1df9723f57a903f964f9d1b967 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 21 May 2020 21:46:17 +0700
Subject: [PATCH 3/5] apache: correct cross flags

Following change in apr.
---
 srcpkgs/apache/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index cc118562468..fcd6675e987 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -20,9 +20,7 @@ configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
  --enable-dav-lock --enable-vhost-alias --enable-imagemap --enable-so
  --enable-rewrite --enable-layout=XBPS --sysconfdir=/etc/${pkgname}
  --enable-mpms-shared=all --with-pcre=${XBPS_CROSS_BASE}/usr
- --with-z=${XBPS_CROSS_BASE}/usr
- --with-apr=${XBPS_CROSS_BASE}/usr/bin/apr-1-config
- --with-apr-util=${XBPS_CROSS_BASE}/usr/bin/apu-1-config"
+ --with-z=${XBPS_CROSS_BASE}/usr"
 conf_files="
 	/etc/${pkgname}/extra/*.conf
 	/etc/${pkgname}/httpd.conf
@@ -64,6 +62,13 @@ pre_configure() {
 		-i docs/conf/httpd.conf.in
 
 	cat ${FILESDIR}/xbps.layout >> config.layout
+	if [ "$CROSS_BUILD" ]; then
+		configure_args+=" --with-apr=$XBPS_WRAPPERDIR/apr-1-config
+		 --with-apr-util=$XBPS_WRAPPERDIR/apu-1-config"
+	else
+		configure_args+=" --with-apr=/usr/bin/apr-1-config
+		 --with-apr-util=/usr/bin/apu-1-config"
+	fi
 }
 
 post_configure() {

From 8e04f004bd2db4605904b8143ddc152a995ee1db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 21 May 2020 22:21:39 +0700
Subject: [PATCH 4/5] subversion: correct cross following change in apr

---
 srcpkgs/subversion/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/subversion/template b/srcpkgs/subversion/template
index b52bdb5f801..5dbabc056ca 100644
--- a/srcpkgs/subversion/template
+++ b/srcpkgs/subversion/template
@@ -42,8 +42,9 @@ pre_configure() {
 
 		# Use apr-1-config and apu-1-config wrappers
 		vsed -i config_vars.mk \
-			-e "s;/usr/bin/\(ap.-1-config\);${XBPS_WRAPPERDIR}/\1;g" \
-			-e "s;-I/usr/include;-I${XBPS_CROSS_BASE}/usr/include;g"
+			-e "/^APR_CONFIG/ s;=.*;= ${XBPS_WRAPPERDIR}/apr-1-config;" \
+			-e "/^APU_CONFIG/ s;=.*;= ${XBPS_WRAPPERDIR}/apu-1-config;" \
+			-e "s;\([I ]\)/usr/include;\1${XBPS_CROSS_BASE}/usr/include;g"
 
 		export PERL5LIB=${XBPS_STATEDIR}/perlprefix/${XBPS_TARGET_MACHINE}-linux
 		mkdir -p $PERL5LIB

From 961da01edaa781a7c73aa9ba05dfd52e0c471805 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 21 May 2020 22:21:39 +0700
Subject: [PATCH 5/5] subversion-kwallet-auth: correct cross following change
 in apr

---
 srcpkgs/subversion-kwallet-auth/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/subversion-kwallet-auth/template b/srcpkgs/subversion-kwallet-auth/template
index 35417b57648..e727ef2d02f 100644
--- a/srcpkgs/subversion-kwallet-auth/template
+++ b/srcpkgs/subversion-kwallet-auth/template
@@ -44,8 +44,9 @@ pre_configure() {
 
 		# Use apr-1-config and apu-1-config wrappers
 		vsed -i config_vars.mk \
-			-e "s;/usr/bin/\(ap.-1-config\);${XBPS_WRAPPERDIR}/\1;g" \
-			-e "s;-I/usr/include;-I${XBPS_CROSS_BASE}/usr/include;g"
+			-e "/^APR_CONFIG/ s;=.*;= ${XBPS_WRAPPERDIR}/apr-1-config;" \
+			-e "/^APU_CONFIG/ s;=.*;= ${XBPS_WRAPPERDIR}/apu-1-config;" \
+			-e "s;\([I ]\)/usr/include;\1${XBPS_CROSS_BASE}/usr/include;g"
 
 		export PERL5LIB=${XBPS_STATEDIR}/perlprefix/${XBPS_TARGET_MACHINE}-linux
 		mkdir -p $PERL5LIB

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PR PATCH] [Merged]: apr and reverse-depends cross flags
  2020-05-21 14:56 [PR PATCH] apr and reverse-depends cross flags sgn
                   ` (2 preceding siblings ...)
  2020-05-21 23:54 ` [PR PATCH] [Updated] " sgn
@ 2020-05-22  6:18 ` sgn
  3 siblings, 0 replies; 5+ messages in thread
From: sgn @ 2020-05-22  6:18 UTC (permalink / raw)
  To: ml


[-- Attachment #1: Type: text/plain, Size: 524 bytes --]

There's a merged pull request on the void-packages repository

apr and reverse-depends cross flags
https://github.com/void-linux/void-packages/pull/22167

Description:
- remove cross cruft from `*-config` and `*.pc`
- correct cross flags for reverse dependencies if they're built fail.
- other reverse deps are being tested:
    - [x] serf
    - [x] log4cxx
    - [x] anjuta
    - [x] kdevelop
    - [x] subversion
    - [x] subversion-kwallet-auth
    - [x] apache


`libreoffice` isn't able cross-compile yet.

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, back to index

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-21 14:56 [PR PATCH] apr and reverse-depends cross flags sgn
2020-05-21 15:24 ` [PR PATCH] [Updated] " sgn
2020-05-21 15:24 ` sgn
2020-05-21 23:54 ` [PR PATCH] [Updated] " sgn
2020-05-22  6:18 ` [PR PATCH] [Merged]: " sgn

Github messages for voidlinux

Archives are clonable: git clone --mirror http://inbox.vuxu.org/voidlinux-github

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://inbox.vuxu.org/vuxu.github.voidlinux


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git