Skip to contentSkip to conversation

enca_1.9.bb: remove unused configure test which is bound to fail.

PATCH In review Graham Gower 5 participants 7 messages Aug 26, 2009 – Sep 9, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 enca_1.9.bb: remove unused configure test which is bound to fail.

Enca's configure will fail on everything not arm or ix86.

---

recipes/enca/enca_1.9.bb |    7 ++++++-
site/arm-linux           |    3 ---
site/ix86-common         |    3 ---
3 files changed, 6 insertions(+), 7 deletions(-)
recipes/enca/enca_1.9.bb +0 -0
index 548a824..dbffe1e 100644
@@ -3,7 +3,7 @@ SECTION = "libs"

PRIORITY = "optional"
LICENSE = "GPLv2"
HOMEPAGE = "http://trific.ath.cx/software/enca/"
-PR = "r3"
+PR = "r4"

SRC_URI = "http://www.sourcefiles.org/Networking/Tools/Miscellanenous/enca-${PV}.tar.bz2 \
	file://configure-hack.patch;patch=1 \

@@ -15,6 +15,11 @@ inherit autotools

EXTRA_OECONF="--with-libiconv-prefix=${STAGING_DIR_HOST}${layout_exec_prefix}"

+do_configure_prepend() {
+ # remove failing test which checks for something that isn't even used
+ sed -i -e '/ye_FUNC_SCANF_MODIF_SIZE_T/d' configure.ac
+}
+
do_configure_append() {
sed -i s:-I/usr/include::g Makefile
sed -i s:-I/usr/include::g */Makefile

site/arm-linux +0 -0
index 4212728..18dfb38 100644
@@ -148,9 +148,6 @@ samba_cv_USE_SETREUID=${samba_cv_USE_SETREUID=yes}

samba_cv_USE_SETUIDX=${samba_cv_USE_SETUIDX=yes} samba_cv_LINUX_LFS_SUPPORT=${samba_cv_LINUX_LFS_SUPPORT=yes}

-# enca
-yeti_cv_func_scanf_modif_size_t=yes
-

# clamav
clamav_av_func_working_snprintf_long=${clamav_av_func_working_snprintf_long=yes}
clamav_av_have_in_port_t=${clamav_av_have_in_port_t=yes}
site/ix86-common +0 -0
index a5c4b60..b7a503f 100644
@@ -104,9 +104,6 @@ ac_cv_func_posix_getpwnam_r=${ac_cv_func_posix_getpwnam_r=yes}

dpkg_cv_va_copy=${ac_cv_va_copy=no}
dpkg_cv___va_copy=${ac_cv___va_copy=yes}

-# enca
-yeti_cv_func_scanf_modif_size_t=yes
-

# ettercap
ettercap_cv_type_socklen_t=${ettercap_cv_type_socklen_t=yes}
Signature · 1 line
1.6.0.3
#1 lore raw
Quoted 26 lines · Graham Gower

Enca's configure will fail on everything not arm or ix86.

---

recipes/enca/enca_1.9.bb |    7 ++++++-
site/arm-linux           |    3 ---
site/ix86-common         |    3 ---
3 files changed, 6 insertions(+), 7 deletions(-)
recipes/enca/enca_1.9.bb +0 -0
index 548a824..dbffe1e 100644
@@ -3,7 +3,7 @@ SECTION = "libs"

PRIORITY = "optional"
LICENSE = "GPLv2"
HOMEPAGE = "http://trific.ath.cx/software/enca/"

recipes/enca/enca_1.9.bb +1 -1
-PR = "r3"
+PR = "r4"
SRC_URI = "http://www.sourcefiles.org/Networking/Tools/Miscellanenous/enca-${PV}.tar.bz2 \
	file://configure-hack.patch;patch=1 \
recipes/enca/enca_1.9.bb +0 -0
@@ -15,6 +15,11 @@ inherit autotools
 

EXTRA_OECONF="--with-libiconv-prefix=${STAGING_DIR_HOST}${layout_exec_prefix}"

recipes/enca/enca_1.9.bb

Quoted 4 lines
recipes/enca/enca_1.9.bb +4 -0
+do_configure_prepend() {
+	# remove failing test which checks for something that isn't even used
+	sed -i -e '/ye_FUNC_SCANF_MODIF_SIZE_T/d' configure.ac
+}

you may not require this hunk. see below

Quoted 9 lines

+
do_configure_append() {
sed -i s:-I/usr/include::g Makefile
sed -i s:-I/usr/include::g */Makefile

site/arm-linux +0 -0
index 4212728..18dfb38 100644

site/arm-linux samba_cv_USE_SETREUID=${samba_cv_USE_SETREUID=yes} · line 153

Quoted 6 lines
site/arm-linux +0 -3
@@ -148,9 +148,6 @@ samba_cv_USE_SETREUID=${samba_cv_USE_SETREUID=yes}
 samba_cv_USE_SETUIDX=${samba_cv_USE_SETUIDX=yes}
 samba_cv_LINUX_LFS_SUPPORT=${samba_cv_LINUX_LFS_SUPPORT=yes}
 
-# enca
-yeti_cv_func_scanf_modif_size_t=yes
-

set this to 'no'

Quoted 8 lines
site/arm-linux +0 -0
 # clamav
 clamav_av_func_working_snprintf_long=${clamav_av_func_working_snprintf_long=yes}
 clamav_av_have_in_port_t=${clamav_av_have_in_port_t=yes}
site/ix86-common +0 -0
index a5c4b60..b7a503f 100644

site/ix86-common ac_cv_func_posix_getpwnam_r=${ac_cv_func_posix_getpwnam_r=yes} · line 109

Quoted 6 lines
site/ix86-common +0 -3
@@ -104,9 +104,6 @@ ac_cv_func_posix_getpwnam_r=${ac_cv_func_posix_getpwnam_r=yes}
 dpkg_cv_va_copy=${ac_cv_va_copy=no}
 dpkg_cv___va_copy=${ac_cv___va_copy=yes}
 
-# enca
-yeti_cv_func_scanf_modif_size_t=yes
-

same here.

Quoted 11 lines
site/ix86-common +0 -0
 # ettercap
 ettercap_cv_type_socklen_t=${ettercap_cv_type_socklen_t=yes}
 
Signature · 7 lines
1.6.0.3


_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
#2 lore raw

2009/8/27 Khem Raj <[email protected]>:

Quoted 15 lines

Review

Quoted 4 lines
(quoted diff) +4 -0
+do_configure_prepend() {
+     # remove failing test which checks for something that isn't even used
+     sed -i -e '/ye_FUNC_SCANF_MODIF_SIZE_T/d' configure.ac
+}

you may not require this hunk. see below

Review

Quoted 3 lines
(quoted diff) +0 -3
-# enca
-yeti_cv_func_scanf_modif_size_t=yes
-

set this to 'no'

Quoted 5 lines

Review

Quoted 3 lines
(quoted diff) +0 -3
-# enca
-yeti_cv_func_scanf_modif_size_t=yes
-

same here.

The two site files that specify yeti_cv_func_scanf_modif_size_t=yes probably make things work on those two systems. But every other system will fail to configure. Hence, a fix which is independent of the architecture. And with that fix, I figured the arch dependent fixes should be removed.

-Graham

#3 lore raw
In reply to Graham Gower
Quoted 8 lines · Graham Gower

Enca's configure will fail on everything not arm or ix86.

---
 recipes/enca/enca_1.9.bb |    7 ++++++-
 site/arm-linux           |    3 ---
 site/ix86-common         |    3 ---
 3 files changed, 6 insertions(+), 7 deletions(-)

Looks fine to me. It does seem a bit weird that enca tests this scanf thing and then doesn't use the information but, sure enough, I couldn't find any reference to the result anywhere in the source code.

Do you have commit access or do you want me to check it in for you?

p.

#4 lore raw

2009/8/27 Phil Blundell <[email protected]>:

Quoted 2 lines

Do you have commit access or do you want me to check it in for you?

I don't have commit access, so if you could commit it that would be great.

-Graham

#6 lore raw
In reply to Phil Blundell
Quoted 10 lines · Phil Blundell
Quoted 8 lines · Graham Gower

Enca's configure will fail on everything not arm or ix86.

---
 recipes/enca/enca_1.9.bb |    7 ++++++-
 site/arm-linux           |    3 ---
 site/ix86-common         |    3 ---
 3 files changed, 6 insertions(+), 7 deletions(-)
Quoted 3 lines

Looks fine to me. It does seem a bit weird that enca tests this scanf thing and then doesn't use the information but, sure enough, I couldn't find any reference to the result anywhere in the source code.

It seems to be a relict from old versions.

Here is a new upstream, and the commit that fixes your problem:
http://gitorious.org/enca/enca/commit/163589d468dee45ab5495a8f4f8058d27da91a91

________________________________________________________________________
Stanislav Brabec
http://www.penguin.cz/~utx/zaurus

#5 lore raw
In reply to Graham Gower
Quoted 5 lines · Graham Gower

2009/8/27 Phil Blundell <[email protected]>:

Quoted 2 lines

Do you have commit access or do you want me to check it in for you?

I don't have commit access, so if you could commit it that would be great.

Righto, done.

p.