* [PR PATCH] build-style/cmake: also fix -isystem for Ninja
@ 2021-02-20 5:25 sgn
2021-02-20 5:26 ` [PR PATCH] [Updated] " sgn
2021-02-20 6:09 ` [PR PATCH] [Merged]: " sgn
0 siblings, 2 replies; 3+ messages in thread
From: sgn @ 2021-02-20 5:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1686 bytes --]
There is a new pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages build-style-cmake-fix-isystem-ninja
https://github.com/void-linux/void-packages/pull/28910
build-style/cmake: also fix -isystem for Ninja
Discovered by cross-build failure of gnuradio-osmosdr.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/28910.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-build-style-cmake-fix-isystem-ninja-28910.patch --]
[-- Type: text/x-diff, Size: 1172 bytes --]
From 9fdf9f341aa11c4ccddd2ab05a0e3ad01f3bc032 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: Sat, 20 Feb 2021 12:16:56 +0700
Subject: [PATCH] build-style/cmake: also fix -isystem for Ninja
Discovered by cross-build failure of gnuradio-osmosdr.
While we're at it, fix flags.make in batch.
---
common/build-style/cmake.sh | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh
index 00ef3ff37e5..2eb512ee390 100644
--- a/common/build-style/cmake.sh
+++ b/common/build-style/cmake.sh
@@ -67,8 +67,12 @@ _EOF
CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \
cmake ${cmake_args} ${configure_args} ${wrksrc}/${build_wrksrc}
- # Replace -isystem with -I for Qt4 and Qt5 packages
- find -name flags.make -exec sed -i "{}" -e"s;-isystem;-I;g" \;
+ # Replace -isystem with -I
+ if [ "$CMAKE_GENERATOR" = "Unix Makefiles" ]; then
+ find . -name flags.make -exec sed -i -e 's/-isystem/-I/g' +
+ elif [ "$CMAKE_GENERATOR" = Ninja ]; then
+ sed -i -e 's/-isystem/-I/g' build.ninja
+ fi
}
do_build() {
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Updated] build-style/cmake: also fix -isystem for Ninja
2021-02-20 5:25 [PR PATCH] build-style/cmake: also fix -isystem for Ninja sgn
@ 2021-02-20 5:26 ` sgn
2021-02-20 6:09 ` [PR PATCH] [Merged]: " sgn
1 sibling, 0 replies; 3+ messages in thread
From: sgn @ 2021-02-20 5:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1691 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages build-style-cmake-fix-isystem-ninja
https://github.com/void-linux/void-packages/pull/28910
build-style/cmake: also fix -isystem for Ninja
Discovered by cross-build failure of gnuradio-osmosdr.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/28910.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-build-style-cmake-fix-isystem-ninja-28910.patch --]
[-- Type: text/x-diff, Size: 2130 bytes --]
From 9fdf9f341aa11c4ccddd2ab05a0e3ad01f3bc032 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: Sat, 20 Feb 2021 12:16:56 +0700
Subject: [PATCH 1/2] build-style/cmake: also fix -isystem for Ninja
Discovered by cross-build failure of gnuradio-osmosdr.
While we're at it, fix flags.make in batch.
---
common/build-style/cmake.sh | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh
index 00ef3ff37e5..2eb512ee390 100644
--- a/common/build-style/cmake.sh
+++ b/common/build-style/cmake.sh
@@ -67,8 +67,12 @@ _EOF
CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \
cmake ${cmake_args} ${configure_args} ${wrksrc}/${build_wrksrc}
- # Replace -isystem with -I for Qt4 and Qt5 packages
- find -name flags.make -exec sed -i "{}" -e"s;-isystem;-I;g" \;
+ # Replace -isystem with -I
+ if [ "$CMAKE_GENERATOR" = "Unix Makefiles" ]; then
+ find . -name flags.make -exec sed -i -e 's/-isystem/-I/g' +
+ elif [ "$CMAKE_GENERATOR" = Ninja ]; then
+ sed -i -e 's/-isystem/-I/g' build.ninja
+ fi
}
do_build() {
From 85f17abfb8ba9ee5cb5611117f034f9ab13e3faf 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: Sat, 20 Feb 2021 12:19:04 +0700
Subject: [PATCH 2/2] gqrx: fix cross build
---
srcpkgs/gqrx/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/gqrx/template b/srcpkgs/gqrx/template
index 020e90288ae..8fc8f01bbc4 100644
--- a/srcpkgs/gqrx/template
+++ b/srcpkgs/gqrx/template
@@ -5,7 +5,8 @@ revision=2
build_style=cmake
configure_args="$(vopt_if gr_audio -DLINUX_AUDIO_BACKEND=Gr-audio)
$(vopt_if portaudio -DLINUX_AUDIO_BACKEND=Portaudio)"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config qt5-qmake qt5-host-tools python3
+ gnuradio"
makedepends="boost-devel gnuradio-devel gnuradio-osmosdr-devel
pulseaudio-devel qt5-svg-devel log4cpp-devel mpir-devel volk-devel
fftw-devel python3-devel alsa-lib-devel jack-devel gmpxx-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Merged]: build-style/cmake: also fix -isystem for Ninja
2021-02-20 5:25 [PR PATCH] build-style/cmake: also fix -isystem for Ninja sgn
2021-02-20 5:26 ` [PR PATCH] [Updated] " sgn
@ 2021-02-20 6:09 ` sgn
1 sibling, 0 replies; 3+ messages in thread
From: sgn @ 2021-02-20 6:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1515 bytes --]
There's a merged pull request on the void-packages repository
build-style/cmake: also fix -isystem for Ninja
https://github.com/void-linux/void-packages/pull/28910
Description:
Discovered by cross-build failure of gnuradio-osmosdr.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-02-20 6:09 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-20 5:25 [PR PATCH] build-style/cmake: also fix -isystem for Ninja sgn
2021-02-20 5:26 ` [PR PATCH] [Updated] " sgn
2021-02-20 6:09 ` [PR PATCH] [Merged]: " sgn
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).