Skip to contentSkip to conversation

postgresql-8.1.8 : fix configure

PATCH New Eric Bénard 3 participants 9 messages Aug 26, 2010 – Aug 29, 2010

lore
Share & tools
lore

Eric Bénard

author
#0 lore raw

PATCH 1/1 postgresql-8.1.8 : fix configure

without this patch, using angstrom 2010.x on armv6 I actually get :
| checking alignment of short... configure: error:
cannot compute alignment of short, 77
| ERROR: Function do_configure failed
NOTE: package postgresql-8.1.8-r4: task do_configure: Failed

Signed-off-by Eric Bénard <[email protected]>
---
 site/arm-common |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)
site/arm-common +7 -0
index 20de8c5..1554c8f 100644
@@ -166,6 +166,13 @@ ac_cv_pwrite=${ac_cv_pwrite=no}
 php_cv_lib_cookie_io_functions_use_off64_t=${php_cv_lib_cookie_io_functions_use_off64_t=yes}
 cv_php_mbstring_stdarg=${cv_php_mbstring_stdarg=yes}
 
+# postgresql
+pgac_cv_alignof_short=2
+pgac_cv_alignof_int=4
+pgac_cv_alignof_long=4
+pgac_cv_alignof_long_long_int=8
+pgac_cv_alignof_double=8
+
 # rsync
 rsync_cv_HAVE_BROKEN_LARGEFILE=${rsync_cv_HAVE_BROKEN_LARGEFILE=no}
 rsync_cv_HAVE_SOCKETPAIR=${rsync_cv_HAVE_SOCKETPAIR=yes}
Signature · 1 line
1.6.3.3
author
#1 lore raw

PATCH 1/1 ncurses-5.7 : fix sdk build

ENABLE_WIDEC should also be false when building sdk like when building native (tested on ubuntu server 9.10)

Signed-off-by Eric Bénard <[email protected]>
---
 recipes/ncurses/ncurses_5.7.bb |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
recipes/ncurses/ncurses_5.7.bb +3 -3
index 57374ec..29c1674 100644
@@ -4,7 +4,7 @@ LICENSE = "MIT"
 SECTION = "libs"
 PATCHDATE = "20100501"
 PKGV = "${PV}+${PATCHDATE}"
-PR = "r11"
+PR = "r12"
 
 DEPENDS = "ncurses-native unifdef-native"
 DEPENDS_virtclass-native = "unifdef-native"

@@ -32,7 +32,7 @@ EXTRA_AUTORECONF = "-I m4"
 ENABLE_WIDEC = "true"
 # Build breaks on Ubuntu else :(
 ENABLE_WIDEC_virtclass-native = "false"
-
+ENABLE_WIDEC_virtclass-nativesdk = "false"
 
 # Override the function from the autotools class; ncurses requires a
 # patched autoconf213 to generate the configure script. This autoconf

@@ -170,7 +170,7 @@ pkg_prerm_ncurses-tools () {
         fi
 }
 
-BBCLASSEXTEND = "native sdk"
+BBCLASSEXTEND = "native nativesdk"
 
 PACKAGES = " \
   ncurses-dbg \
Signature · 1 line
1.6.3.3
#2 lore raw

Re: [PATCH] ncurses-5.7 : fix sdk build

recipes/ncurses/ncurses_5.7.bb pkg_prerm_ncurses-tools () { · line 173

Quoted 6 lines · Eric Bénard
recipes/ncurses/ncurses_5.7.bb +1 -1
@@ -170,7 +170,7 @@ pkg_prerm_ncurses-tools () {
         fi
 }
 
-BBCLASSEXTEND = "native sdk"
+BBCLASSEXTEND = "native nativesdk"

Don't remove sdk from here, just add nativesdk. We haven't fully converted everything.

Signature · 2 lines
Tom Rini
Mentor Graphics Corporation
author
#3 lore raw

PATCH v2 1/1 ncurses-5.7 : fix sdk build

ENABLE_WIDEC should also be false when building sdk like when building native (tested on ubuntu server 9.10)

Signed-off-by Eric Bénard <[email protected]>

---
v2 : keep sdk in BBCLASSEXTEND as suggested by Tom Rini

 recipes/ncurses/ncurses_5.7.bb |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
recipes/ncurses/ncurses_5.7.bb +3 -3
index 57374ec..2c41ec6 100644
@@ -4,7 +4,7 @@ LICENSE = "MIT"
 SECTION = "libs"
 PATCHDATE = "20100501"
 PKGV = "${PV}+${PATCHDATE}"
-PR = "r11"
+PR = "r12"
 
 DEPENDS = "ncurses-native unifdef-native"
 DEPENDS_virtclass-native = "unifdef-native"

@@ -32,7 +32,7 @@ EXTRA_AUTORECONF = "-I m4"
 ENABLE_WIDEC = "true"
 # Build breaks on Ubuntu else :(
 ENABLE_WIDEC_virtclass-native = "false"
-
+ENABLE_WIDEC_virtclass-nativesdk = "false"
 
 # Override the function from the autotools class; ncurses requires a
 # patched autoconf213 to generate the configure script. This autoconf

@@ -170,7 +170,7 @@ pkg_prerm_ncurses-tools () {
         fi
 }
 
-BBCLASSEXTEND = "native sdk"
+BBCLASSEXTEND = "native nativesdk sdk"
 
 PACKAGES = " \
   ncurses-dbg \
Signature · 1 line
1.6.3.3
author
#4 lore raw

Re: [PATCH] ncurses-5.7 : fix sdk build

In reply to Tom Rini

Hi,

Quoted 6 lines · Tom Rini
Quoted 4 lines · Eric Bénard
(quoted diff) +0 -0
@@ -170,7 +170,7 @@ pkg_prerm_ncurses-tools () {

fi
}

Quoted 6 lines

recipes/ncurses/ncurses_5.7.bb pkg_prerm_ncurses-tools () { · line 173

Quoted 2 lines
recipes/ncurses/ncurses_5.7.bb +1 -1
-BBCLASSEXTEND = "native sdk"
+BBCLASSEXTEND = "native nativesdk"

Don't remove sdk from here, just add nativesdk. We haven't fully converted everything.

in fact there is a problem when keeping sdk + nativesdk :

ENABLE_WIDEC_virtclass-nativesdk = "false"
is no more taken in account.

_virtclass-sdk or _sdk or _${PN}-sdk are also not good overides.

Do you have any idea how to fix this ?

Eric

author
#5 lore raw

PATCH 1/2 ncurses-5.7 : fix sdk build

fix ncurses-sdk build (tested on ubuntu using angstrom 2010.x)

Signed-off-by Eric Bénard <[email protected]>
---
 recipes/ncurses/ncurses_5.7.bb |   29 ++++++++++++++---------------
 1 files changed, 14 insertions(+), 15 deletions(-)
recipes/ncurses/ncurses_5.7.bb +14 -15
index 57374ec..eebeb63 100644
@@ -4,7 +4,7 @@ LICENSE = "MIT"
 SECTION = "libs"
 PATCHDATE = "20100501"
 PKGV = "${PV}+${PATCHDATE}"
-PR = "r11"
+PR = "r12"
 
 DEPENDS = "ncurses-native unifdef-native"
 DEPENDS_virtclass-native = "unifdef-native"

@@ -32,7 +32,7 @@ EXTRA_AUTORECONF = "-I m4"
 ENABLE_WIDEC = "true"
 # Build breaks on Ubuntu else :(
 ENABLE_WIDEC_virtclass-native = "false"
-
+ENABLE_WIDEC_virtclass-sdk = "false"
 
 # Override the function from the autotools class; ncurses requires a
 # patched autoconf213 to generate the configure script. This autoconf

@@ -152,10 +152,10 @@ do_install() {
 
 python populate_packages_prepend () {
         libdir = bb.data.expand("${libdir}", d)
-        do_split_packages(d, libdir, '^lib(.*)\.so\..*', 'ncurses-lib%s', 'ncurses %s library', prepend=True, extra_depends = '', allow_links=True)
+        libname = bb.data.expand('${PN}-lib%s', d)
+        do_split_packages(d, libdir, '^lib(.*)\.so\..*', libname, 'ncurses %s library', prepend=True, extra_depends = '', allow_links=True)
 }
 
-
 pkg_postinst_ncurses-tools () {
         if [ "${PN}" = "ncurses" ]; then
                 update-alternatives --install ${bindir}/clear clear clear.${PN} 100

@@ -172,16 +172,15 @@ pkg_prerm_ncurses-tools () {
 
 BBCLASSEXTEND = "native sdk"
 
-PACKAGES = " \
-  ncurses-dbg \
-  ncurses-dev \
-  ncurses-doc \
-  ncurses-tools \
-  ncurses \
-  ncurses-static \
-  ncurses-terminfo \
+PACKAGES += " \
+  ${PN}-tools \
+  ${PN}-terminfo \
 "
-RSUGGESTS_${PN} = "ncurses-terminfo"
+
+RSUGGESTS_${PN} = "${PN}-terminfo"
+RPROVIDES_${PN} = "libncurses5"
+RCONFLICTS_${PN} = "libncurses5"
+RREPLACES_${PN} = "libncurses5"
 
 FILES_${PN} = "\
   ${bindir}/tput \

@@ -192,7 +191,7 @@ FILES_${PN} = "\
 
 # This keeps only tput/tset in ncurses
 # clear/reset are in already busybox
-FILES_ncurses-tools = "\
+FILES_${PN}-tools = "\
   ${bindir}/tic \
   ${bindir}/toe \
   ${bindir}/infotocap \

@@ -204,6 +203,6 @@ FILES_ncurses-tools = "\
   ${bindir}/tabs \
 "
 
-FILES_ncurses-terminfo = "\
+FILES_${PN}-terminfo = "\
   ${datadir}/terminfo \
 "
Signature · 1 line
1.6.3.3
author
#6 lore raw

Re: [PATCH 1/2] ncurses-5.7 : fix sdk build

Quoted 2 lines · Eric Bénard

fix ncurses-sdk build (tested on ubuntu using angstrom 2010.x)

forget it, there is still a problem with the splited packages for libraries.

Eric

author
#7 lore raw

PATCH 2/2 sdk.bbclass: allow virtclass-sdk override

In reply to Eric Bénard
Signed-off-by Eric Bénard <[email protected]>
---
 classes/sdk.bbclass |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
classes/sdk.bbclass +2 -0
index 198d147..c8fa076 100644
@@ -66,3 +66,5 @@ FILES_${PN}-dbg += "${prefix}/.debug \
                    "
 
 export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR_HOST}"
+
+OVERRIDES .= ":virtclass-sdk"
Signature · 1 line
1.6.3.3
Acked-by on v1 2/2
#8 lore raw

Re: [PATCH 2/2] sdk.bbclass: allow virtclass-sdk override

Quoted 1 line · Eric Bénard
Signed-off-by Eric Bénard <[email protected]>
Acked-by Khem Raj <[email protected]>
Quoted 23 lines

---
 classes/sdk.bbclass |    2 ++

 1 files changed, 2 insertions(+), 0 deletions(-)
classes/sdk.bbclass +0 -0
index 198d147..c8fa076 100644
@@ -66,3 +66,5 @@ FILES_${PN}-dbg += "${prefix}/.debug \

                   "

 export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR_HOST}"

classes/sdk.bbclass +2 -1
+
+OVERRIDES .= ":virtclass-sdk"
--

1.6.3.3

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