[PR PATCH] wrappers/cross-cc: drop -isystem /usr/include, too

[PR PATCH] wrappers/cross-cc: drop -isystem /usr/include, too

[sgn]

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

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

https://github.com/sgn/void-packages cross-cc-isystem
https://github.com/void-linux/void-packages/pull/46635

wrappers/cross-cc: drop -isystem /usr/include, too
<!-- Uncomment relevant sections and delete options which are not applicable -->
For #46246 
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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/46635.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cross-cc-isystem-46635.patch --]
[-- Type: text/x-diff, Size: 1120 bytes --]

From 898223e6e1e2388df1f8c7ec9b144ee0d3ee9328 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, 12 Oct 2023 19:42:10 +0700
Subject: [PATCH] wrappers/cross-cc: drop -isystem /usr/include, too

---
 common/wrappers/cross-cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/wrappers/cross-cc b/common/wrappers/cross-cc
index 0e08bc91d0fc2..9f9d581a8b7af 100644
--- a/common/wrappers/cross-cc
+++ b/common/wrappers/cross-cc
@@ -23,13 +23,13 @@ while [ $i -lt ${#ARGS[@]} ]; do
 			MYARGS+=("-L${arg}")
 		fi
 		unset libpath
-	elif [ "$arg" = "-I" ]; then
+	elif [ "$arg" = "-I" -o "$arg" = "-isystem" ]; then
 		incpath=1
 	elif [ "$arg" = "-L" ]; then
 		libpath=1
-	elif [ "$arg" = "-I/usr/include" -o "$arg" = "-L/usr/lib" \
+	elif [ "$arg" = "-I/usr/include" -o "$arg" = "-isystem/usr/include" \
 		-o "$arg" = "-L/usr/lib32" -o "$arg" = "-L/usr/lib64" \
-		-o "$arg" = "-L/lib" ]; then
+		-o "$arg" = "-L/usr/lib" -o "$arg" = "-L/lib" ]; then
 		echo "[cc-wrapper] ignoring $arg"
 	else
 		MYARGS+=("${arg}")

Re: [PR REVIEW] wrappers/cross-cc: drop -isystem /usr/include, too

[Johnnynator]

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

New review comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/46635#discussion_r1356775577

Comment:
This changes all `-isystem` to `-I`, which changes the search order that might be used for headers.

Re: [PR PATCH] [Updated] wrappers/cross-cc: drop -isystem /usr/include, too

[sgn]

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

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

https://github.com/sgn/void-packages cross-cc-isystem
https://github.com/void-linux/void-packages/pull/46635

wrappers/cross-cc: drop -isystem /usr/include, too
<!-- Uncomment relevant sections and delete options which are not applicable -->
For #46246 
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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/46635.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cross-cc-isystem-46635.patch --]
[-- Type: text/x-diff, Size: 1538 bytes --]

From efc4b2d61a1b41fce27f667ac31042a092ac36ba 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, 12 Oct 2023 19:42:10 +0700
Subject: [PATCH] wrappers/cross-cc: drop -isystem /usr/include, too

---
 common/wrappers/cross-cc | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/common/wrappers/cross-cc b/common/wrappers/cross-cc
index 0e08bc91d0fc2..ab5e01ad5655a 100644
--- a/common/wrappers/cross-cc
+++ b/common/wrappers/cross-cc
@@ -8,11 +8,11 @@ ARGS=("$@")
 i=0
 while [ $i -lt ${#ARGS[@]} ]; do
 	arg="${ARGS[$i]}"
-	if [ "$incpath" ]; then
+	if [ -n "$incpath" ]; then
 		if [ "$arg" = "/usr/include" ]; then
-			echo "[cc-wrapper] ignoring -I $arg"
+			echo "[cc-wrapper] ignoring ${incpath} $arg"
 		else
-			MYARGS+=("-I${arg}")
+			MYARGS+=("${incpath}${arg}")
 		fi
 		unset incpath
 	elif [ "$libpath" ]; then
@@ -23,13 +23,13 @@ while [ $i -lt ${#ARGS[@]} ]; do
 			MYARGS+=("-L${arg}")
 		fi
 		unset libpath
-	elif [ "$arg" = "-I" ]; then
-		incpath=1
+	elif [ "$arg" = "-I" -o "$arg" = "-isystem" ]; then
+		incpath="$arg"
 	elif [ "$arg" = "-L" ]; then
 		libpath=1
-	elif [ "$arg" = "-I/usr/include" -o "$arg" = "-L/usr/lib" \
+	elif [ "$arg" = "-I/usr/include" -o "$arg" = "-isystem/usr/include" \
 		-o "$arg" = "-L/usr/lib32" -o "$arg" = "-L/usr/lib64" \
-		-o "$arg" = "-L/lib" ]; then
+		-o "$arg" = "-L/usr/lib" -o "$arg" = "-L/lib" ]; then
 		echo "[cc-wrapper] ignoring $arg"
 	else
 		MYARGS+=("${arg}")

Re: wrappers/cross-cc: drop -isystem /usr/include, too

[SpidFightFR]

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

New comment by SpidFightFR on void-packages repository

https://github.com/void-linux/void-packages/pull/46635#issuecomment-1760904851

Comment:
+up (to enable notifications 😅)

Re: wrappers/cross-cc: drop -isystem /usr/include, too

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/46635#issuecomment-1761754723

Comment:
> +up (to enable notifications 😅)

there's a subscibe button in the sidebar 

Re: wrappers/cross-cc: drop -isystem /usr/include, too

[SpidFightFR]

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

New comment by SpidFightFR on void-packages repository

https://github.com/void-linux/void-packages/pull/46635#issuecomment-1761816711

Comment:
Oh... :sweat_smile: 
thanks

Re: wrappers/cross-cc: drop -isystem /usr/include, too

[classabbyamp]

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

New comment by SpidFightFR on void-packages repository

https://github.com/void-linux/void-packages/pull/46635#issuecomment-1760904851

Comment:
+up (to enable notifications 😅)

Re: wrappers/cross-cc: drop -isystem /usr/include, too

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/46635#issuecomment-1761754723

Comment:
> +up (to enable notifications 😅)

there's a subscibe button in the sidebar 

Re: [PR PATCH] [Merged]: wrappers/cross-cc: drop -isystem /usr/include, too

[sgn]

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

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

wrappers/cross-cc: drop -isystem /usr/include, too
https://github.com/void-linux/void-packages/pull/46635

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
For #46246 
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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
-->