Skip to contentSkip to conversation

package/apache: fix nios2 detection

PATCH New Bernd Kuhls 3 participants 3 messages Apr 2, 2015 – Apr 3, 2015

lore
Share & tools
lore

Bernd Kuhls

author
#0 lore raw

PATCH 1/1 package/apache: fix nios2 detection

Apache treats nios2 as OS/2 which is wrong.

Fixes
http://autobuild.buildroot.net/results/27c/27c5848a344c7e16feefcbd3773b50a78d6e63f0/
http://autobuild.buildroot.net/results/d8c/d8cf103033c63e79ed2db0b600f120f6fcb5b5e9/
http://autobuild.buildroot.net/results/1de/1dec866cf9a5f731a9ed93dff5b8b98001863635/
http://autobuild.buildroot.net/results/776/776be8ef579e3444123d8183dca1062ece656436/
http://autobuild.buildroot.net/results/5d2/5d21ac2d8f008d984d6f8b359ebb0e2482545683/
http://autobuild.buildroot.net/results/87f/87f25b20f63eebf7f75e35064bad79e3d383e7a8/
http://autobuild.buildroot.net/results/1b7/1b75f52c70af7880d523185565b7aaf59d9f9b3e/

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/apache/0002-nios2_is_not_os2.patch |   18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 package/apache/0002-nios2_is_not_os2.patch
package/apache/0002-nios2_is_not_os2.patch new file +18 -0
new file mode 100644
index 0000000..20f60fa
@@ -0,0 +1,18 @@
+Fix nios2 detection.
+
+Apache treats nios2 as OS/2.
+
+Signed-off-by: Bernd Kuhls <[email protected]>
+
+diff -uNr httpd-2.4.12.org/configure.in httpd-2.4.12/configure.in
+--- httpd-2.4.12.org/configure.in	2015-01-22 18:33:07.000000000 +0100
++++ httpd-2.4.12/configure.in	2015-04-02 22:01:32.851102219 +0200
+@@ -268,7 +268,7 @@
+ AC_MSG_NOTICE([])
+ 
+ case $host in
+-  *os2*)
++  *os_2*)
+       # Use a custom made libtool replacement
+       echo "using aplibtool"
+       LIBTOOL="$abs_srcdir/srclib/apr/build/aplibtool"
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH 1/1 package/apache: fix nios2 detection

Quoted 29 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Bernd" == Bernd Kuhls <[email protected]> writes:

Apache treats nios2 as OS/2 which is wrong.
Fixes
http://autobuild.buildroot.net/results/27c/27c5848a344c7e16feefcbd3773b50a78d6e63f0/
http://autobuild.buildroot.net/results/d8c/d8cf103033c63e79ed2db0b600f120f6fcb5b5e9/
http://autobuild.buildroot.net/results/1de/1dec866cf9a5f731a9ed93dff5b8b98001863635/
http://autobuild.buildroot.net/results/776/776be8ef579e3444123d8183dca1062ece656436/
http://autobuild.buildroot.net/results/5d2/5d21ac2d8f008d984d6f8b359ebb0e2482545683/
http://autobuild.buildroot.net/results/87f/87f25b20f63eebf7f75e35064bad79e3d383e7a8/
http://autobuild.buildroot.net/results/1b7/1b75f52c70af7880d523185565b7aaf59d9f9b3e/

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/apache/0002-nios2_is_not_os2.patch |   18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 package/apache/0002-nios2_is_not_os2.patch
package/apache/0002-nios2_is_not_os2.patch new file +5 -0
new file mode 100644
index 0000000..20f60fa
@@ -0,0 +1,18 @@
+Fix nios2 detection.
+
+Apache treats nios2 as OS/2.
+
+Signed-off-by: Bernd Kuhls <[email protected]>

package/apache/0002-nios2_is_not_os2.patch line 15

Quoted 10 lines
package/apache/0002-nios2_is_not_os2.patch new file +10 -0
+
+diff -uNr httpd-2.4.12.org/configure.in httpd-2.4.12/configure.in
+--- httpd-2.4.12.org/configure.in	2015-01-22 18:33:07.000000000 +0100
++++ httpd-2.4.12/configure.in	2015-04-02 22:01:32.851102219 +0200
+@@ -268,7 +268,7 @@
+ AC_MSG_NOTICE([])
+ 
+ case $host in
+-  *os2*)
++  *os_2*)

Is os_2 really the correct host name for OS/2? Have you brought this up with upstream?

Signature · 1 line
Bye, Peter Korsgaard
#2 lore raw

PATCH 1/1 package/apache: fix nios2 detection

In reply to Bernd Kuhls

Dear Bernd Kuhls,

Quoted 3 lines · Bernd Kuhls

+ case $host in

+-  *os2*)
++  *os_2*)

I've changed this to *-os2*, which matches what is done in autoconf config.guess. It makes sure it will continue to match OS/2, but not NIOS 2.

Applied with this changed. Feel free to submit the patch upstream.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com