* [gentoo-commits] gentoo-x86 commit in net-misc/socat/files: socat-1.7.2.0-cross-compile.patch socat-1.7.1.3-cross-compile.patch
@ 2011-12-15 19:33 Mike Frysinger (vapier)
0 siblings, 0 replies; 2+ messages in thread
From: Mike Frysinger (vapier) @ 2011-12-15 19:33 UTC (permalink / raw
To: gentoo-commits
vapier 11/12/15 19:33:19
Added: socat-1.7.2.0-cross-compile.patch
socat-1.7.1.3-cross-compile.patch
Log:
Fix cross-compilation with shift defines.
(Portage version: 2.2.0_alpha79/cvs/Linux x86_64)
Revision Changes Path
1.1 net-misc/socat/files/socat-1.7.2.0-cross-compile.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/socat/files/socat-1.7.2.0-cross-compile.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/socat/files/socat-1.7.2.0-cross-compile.patch?rev=1.1&content-type=text/plain
Index: socat-1.7.2.0-cross-compile.patch
===================================================================
already sent upstream
From ceff276b495884e0b6904814f2bcc93dc98da132 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Thu, 15 Dec 2011 14:16:50 -0500
Subject: [PATCH] add compile-only tests for shift sizes
We can take advantage of array limits to calculate the shift size
required for constants. If we compile to a value we don't like,
then the array limit will be -1 and trigger a compile error.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
configure.in | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/configure.in b/configure.in
index 45cb88a..15c4d7d 100644
--- a/configure.in
+++ b/configure.in
@@ -1331,7 +1331,20 @@ AC_CACHE_CHECK(shift offset of $1, $2,
],
[$2=`cat $conftestoffset`],
[$2=-1],
- [$2=-1]
+ [
+ i=0
+ $2=-1
+ while test $i -lt 64 -a $$2 -eq -1; do
+ AC_TRY_COMPILE([
+ #include <errno.h>
+ #include <stdio.h>
+ #include <termios.h>
+ #include <string.h>
+ ],[char c[(($1 >> $i) & 1) - 1];],
+ [$2=$i])
+ i=$(( $i + 1 ))
+ done
+ ]
)
LIBS="$LIBS1"])
AC_DEFINE_UNQUOTED($1_SHIFT, ${$2})
--
1.7.6.1
1.1 net-misc/socat/files/socat-1.7.1.3-cross-compile.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/socat/files/socat-1.7.1.3-cross-compile.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/socat/files/socat-1.7.1.3-cross-compile.patch?rev=1.1&content-type=text/plain
Index: socat-1.7.1.3-cross-compile.patch
===================================================================
already sent upstream
From ceff276b495884e0b6904814f2bcc93dc98da132 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Thu, 15 Dec 2011 14:16:50 -0500
Subject: [PATCH] add compile-only tests for shift sizes
We can take advantage of array limits to calculate the shift size
required for constants. If we compile to a value we don't like,
then the array limit will be -1 and trigger a compile error.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
configure.in | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/configure.in b/configure.in
index 45cb88a..15c4d7d 100644
--- a/configure.in
+++ b/configure.in
@@ -1331,7 +1331,20 @@ AC_CACHE_CHECK(shift offset of $1, $2,
],
[$2=`cat $conftestoffset`],
[$2=-1],
- [AC_MSG_RESULT(please determine $1_SHIFT manually)]
+ [
+ i=0
+ $2=-1
+ while test $i -lt 64 -a $$2 -eq -1; do
+ AC_TRY_COMPILE([
+ #include <errno.h>
+ #include <stdio.h>
+ #include <termios.h>
+ #include <string.h>
+ ],[char c[(($1 >> $i) & 1) - 1];],
+ [$2=$i])
+ i=$(( $i + 1 ))
+ done
+ ]
)
LIBS="$LIBS1"])
AC_DEFINE_UNQUOTED($1_SHIFT, ${$2})
--
1.7.6.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-misc/socat/files: socat-1.7.2.0-cross-compile.patch socat-1.7.1.3-cross-compile.patch
@ 2011-12-15 20:26 Mike Frysinger (vapier)
0 siblings, 0 replies; 2+ messages in thread
From: Mike Frysinger (vapier) @ 2011-12-15 20:26 UTC (permalink / raw
To: gentoo-commits
vapier 11/12/15 20:26:03
Modified: socat-1.7.2.0-cross-compile.patch
socat-1.7.1.3-cross-compile.patch
Log:
Fix cross-compile issues with ospeed offset too.
(Portage version: 2.2.0_alpha81/cvs/Linux x86_64)
Revision Changes Path
1.2 net-misc/socat/files/socat-1.7.2.0-cross-compile.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/socat/files/socat-1.7.2.0-cross-compile.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/socat/files/socat-1.7.2.0-cross-compile.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/socat/files/socat-1.7.2.0-cross-compile.patch?r1=1.1&r2=1.2
Index: socat-1.7.2.0-cross-compile.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/socat/files/socat-1.7.2.0-cross-compile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- socat-1.7.2.0-cross-compile.patch 15 Dec 2011 19:33:19 -0000 1.1
+++ socat-1.7.2.0-cross-compile.patch 15 Dec 2011 20:26:03 -0000 1.2
@@ -43,3 +43,38 @@
--
1.7.6.1
+From a3e300ce4cde7e326ecffe1035017874d85d796e Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Thu, 15 Dec 2011 15:00:37 -0500
+Subject: [PATCH] let compiler handle ISPEED_OFFSET when cross-compiling
+
+While I can't devise a compile-only test that'll calculate the offset
+(which doesn't involve inspecting the compiled object file), at least
+gcc is good enough with a offsetof()-like value. So use that in the
+cross-compile fallback case.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ configure.in | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 15c4d7d..87e1029 100644
+--- a/configure.in
++++ b/configure.in
+@@ -918,11 +918,11 @@ AC_CACHE_VAL(ac_cv_ispeed_offset,
+ ],
+ [ac_cv_ispeed_offset=`cat $conftestspeedoff`],
+ [ac_cv_ispeed_offset=-1],
+- [ac_cv_ispeed_offset=-1] #!
++ [ac_cv_ispeed_offset="((unsigned long)&((struct termios *)0)->c_ispeed / sizeof(speed_t))"] #!
+ )])
+ LIBS="$LIBS1"
+ AC_MSG_RESULT($ac_cv_ispeed_offset)
+- if test $ac_cv_ispeed_offset -ge 0; then
++ if test "$ac_cv_ispeed_offset" != "-1"; then
+ AC_DEFINE_UNQUOTED(ISPEED_OFFSET, $ac_cv_ispeed_offset)
+ fi
+ fi
+--
+1.7.6.1
1.2 net-misc/socat/files/socat-1.7.1.3-cross-compile.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/socat/files/socat-1.7.1.3-cross-compile.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/socat/files/socat-1.7.1.3-cross-compile.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/socat/files/socat-1.7.1.3-cross-compile.patch?r1=1.1&r2=1.2
Index: socat-1.7.1.3-cross-compile.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/socat/files/socat-1.7.1.3-cross-compile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- socat-1.7.1.3-cross-compile.patch 15 Dec 2011 19:33:19 -0000 1.1
+++ socat-1.7.1.3-cross-compile.patch 15 Dec 2011 20:26:03 -0000 1.2
@@ -43,3 +43,38 @@
--
1.7.6.1
+From a3e300ce4cde7e326ecffe1035017874d85d796e Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Thu, 15 Dec 2011 15:00:37 -0500
+Subject: [PATCH] let compiler handle ISPEED_OFFSET when cross-compiling
+
+While I can't devise a compile-only test that'll calculate the offset
+(which doesn't involve inspecting the compiled object file), at least
+gcc is good enough with a offsetof()-like value. So use that in the
+cross-compile fallback case.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ configure.in | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 15c4d7d..87e1029 100644
+--- a/configure.in
++++ b/configure.in
+@@ -918,11 +918,11 @@ AC_CACHE_VAL(ac_cv_ispeed_offset,
+ ],
+ [ac_cv_ispeed_offset=`cat $conftestspeedoff`],
+ [ac_cv_ispeed_offset=-1],
+- [ac_cv_ispeed_offset=-1] #!
++ [ac_cv_ispeed_offset="((unsigned long)&((struct termios *)0)->c_ispeed / sizeof(speed_t))"] #!
+ )])
+ LIBS="$LIBS1"
+ AC_MSG_RESULT($ac_cv_ispeed_offset)
+- if test $ac_cv_ispeed_offset -ge 0; then
++ if test "$ac_cv_ispeed_offset" != "-1"; then
+ AC_DEFINE_UNQUOTED(ISPEED_OFFSET, $ac_cv_ispeed_offset)
+ fi
+ fi
+--
+1.7.6.1
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-12-15 20:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-15 19:33 [gentoo-commits] gentoo-x86 commit in net-misc/socat/files: socat-1.7.2.0-cross-compile.patch socat-1.7.1.3-cross-compile.patch Mike Frysinger (vapier)
-- strict thread matches above, loose matches on Subject: below --
2011-12-15 20:26 Mike Frysinger (vapier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox