Paul Menzel wrote:
Am Samstag, den 23.01.2010, 15:16 -0800 schrieb John Faith:
[Moved note about v2 to the end of commit message.]
Allow socat 1.7.1.2 to cross build. In configure.in, the 4th value in
AC_TRY_RUN() gives a default value for cross build environments since
a test program cannot be run on the build system. There are 2 places
where AC_MSG_RESULT() is used instead of a default value which seems
to result in code like "#define CRDLY_SHIFT" which breaks preprocessor
checks like "#if CRDLY_SHIFT >= 0".
Maybe add an item, why the change in do_configure() is needed. Just copy
it from your reply to Koen maybe.
Do you want a v3 of the patch for this or other changes?
The patch gives default values in configure and configure.in for cross
compiling and checks were added in the affected source.
v2: Added package source checksums, changed PR to r0, and removed some
trailing whitespace in the patch.
Signed-off-by: John Faith <[email protected]>
Build-tested-by: Paul Menzel <[email protected]>
(beagleboard, Ångström)
/oe/angstrom-dev/deploy/glibc/ipk/armv7a$ ls -lh socat*
-rw-r--r-- 1 x x 146K 24. Jan 12:21 socat_1.7.1.2-r0.5_armv7a.ipk
-rw-r--r-- 1 x x 9,4M 24. Jan 12:21 socat-dbg_1.7.1.2-r0.5_armv7a.ipk
-rw-r--r-- 1 x x 790 24. Jan 12:21 socat-dev_1.7.1.2-r0.5_armv7a.ipk
-rw-r--r-- 1 x x 36K 24. Jan 12:21 socat-doc_1.7.1.2-r0.5_armv7a.ipk
I am just wondering about the size of `socat-dbg*.ipk` though.
Hm, my debug ipk is only 30k and contains 3 files:
~/oe/arago-deploy/ipk/armv5te $ ls -lh socat*1.7*r0*
-rw-r--r-- 1 148K 2010-01-23 13:37 socat_1.7.1.2-r0.2_armv5te.ipk
-rw-r--r-- 1 30K 2010-01-23 13:37 socat-dbg_1.7.1.2-r0.2_armv5te.ipk
-rw-r--r-- 1 784 2010-01-23 13:37 socat-dev_1.7.1.2-r0.2_armv5te.ipk
-rw-r--r-- 1 36K 2010-01-23 13:37 socat-doc_1.7.1.2-r0.2_armv5te.ipk
# opkg files socat-dbg
Package socat-dbg (1.7.1.2-r0.2) is installed on root and has the
following files:
/usr/bin/.debug/procan
/usr/bin/.debug/filan
/usr/bin/.debug/socat
# ls -l /usr/bin/.debug
-rwxr-xr-x 1 root root 20599 Jan 23 21:37 filan
-rwxr-xr-x 1 root root 18750 Jan 23 21:37 procan
-rwxr-xr-x 1 root root 59328 Jan 23 21:37 socat
+--- socat-1.7.1.2/xioopts.c.orig 2010-01-04 04:29:36.000000000 -0800
++++ socat-1.7.1.2/xioopts.c 2010-01-21 10:54:03.561742501 -0800
+@@ -763,7 +763,7 @@ const struct optname optionnames[] = {
+ IF_IP6 ("ipv6only", &opt_ipv6_v6only)
Still some trailing whitespaces (in all ipv6 lines I think).
openembedded$ git am -s /tmp/\[oe\]_\[PATCH_v2\]_socat\:_Add_version_1.7.1.2
Applying: socat: Add version 1.7.1.2
/oe/openembedded/.git/rebase-apply/patch:76: space before tab in indent.
IF_IP6 ("ipv6only", &opt_ipv6_v6only)
/oe/openembedded/.git/rebase-apply/patch:78: space before tab in indent.
IF_TERMIOS("isig", &opt_isig)
/oe/openembedded/.git/rebase-apply/patch:81: space before tab in indent.
IF_TERMIOS("ispeed", &opt_ispeed)
/oe/openembedded/.git/rebase-apply/patch:83: space before tab in indent.
IF_TERMIOS("istrip", &opt_istrip)
/oe/openembedded/.git/rebase-apply/patch:85: space before tab in indent.
IF_OPENSSL("openssl-pseudo", &opt_openssl_pseudo)
warning: squelched 5 whitespace errors
warning: 10 lines add whitespace errors.
(Try to apply your patch yourself.) But I guess it is alright.
[…]
I did try 'git am' and noticed that the number of whitespace warnings
wend down after I manually removed spaces on otherwise empty lines
apparently introduced by my diff process. The remaining "space before
tab" warnings are in the socat source in adjacent lines created by diff
-u; these of course could never go away since a patch to remove them
containing the '-<space><tab>' would itself trigger a warning from "git
am". Not sure how the socat authors would feel about changing all these ;).
socat-1.7.1.2$ grep ' \t' * | wc -l
7615
Thanks for the review.
,
John
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
