* [PATCH 1/3] perl: honour DISTRO_FEATURE largefile
@ 2010-08-04 13:51 Bernhard Reutner-Fischer
2010-08-04 13:51 ` [PATCH 2/3] perl: use only one method all_perl_packages Bernhard Reutner-Fischer
` (2 more replies)
0 siblings, 3 replies; 14+ messages in thread
From: Bernhard Reutner-Fischer @ 2010-08-04 13:51 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
---
recipes/perl/perl-native_5.8.8.bb | 4 ++--
recipes/perl/perl_5.8.8.bb | 6 ++++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/recipes/perl/perl-native_5.8.8.bb b/recipes/perl/perl-native_5.8.8.bb
index fe1bc84..41a85bc 100644
--- a/recipes/perl/perl-native_5.8.8.bb
+++ b/recipes/perl/perl-native_5.8.8.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.perl.org/"
SECTION = "libs"
LICENSE = "Artistic|GPL"
DEPENDS = "virtual/db-native gdbm-native"
-PR = "r20"
+PR = "r21"
NATIVE_INSTALL_WORKS = "1"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/perl-${PV}"
@@ -44,7 +44,7 @@ do_configure () {
-Duseshrplib \
-Dusethreads \
-Duseithreads \
- -Duselargefiles \
+ ${@base_contains("DISTRO_FEATURES", "largefile", "-Duselargefiles", "-Uuselargefiles", d)} \
-Dnoextensions=ODBM_File \
-Ud_dosuid \
-Ui_db \
diff --git a/recipes/perl/perl_5.8.8.bb b/recipes/perl/perl_5.8.8.bb
index ed489f4..5400e69 100644
--- a/recipes/perl/perl_5.8.8.bb
+++ b/recipes/perl/perl_5.8.8.bb
@@ -5,7 +5,7 @@ LICENSE = "Artistic|GPL"
PRIORITY = "optional"
# We need gnugrep (for -I)
DEPENDS = "virtual/db perl-native grep-native"
-PR = "r35"
+PR = "r36"
# Major part of version
PVM = "5.8"
@@ -66,7 +66,9 @@ do_configure() {
${WORKDIR}/config.sh-${SITEINFO_BITS}-${SITEINFO_ENDIANNESS}; do
cat $i >> config.sh-${TARGET_ARCH}-${TARGET_OS}
done
-
+ uselargefiles="${@base_contains("DISTRO_FEATURES", "largefile", "define", "undef", d)}"
+ sed -i -e "s,^\(uselargefiles=\).*,\1'$uselargefiles',g" \
+ config.sh-${TARGET_ARCH}-${TARGET_OS}
# Fixups for uclibc
if [ "${TARGET_OS}" = "linux-uclibc" -o "${TARGET_OS}" = "linux-uclibceabi" ]; then
sed -i -e "s,\(d_crypt_r=\)'define',\1'undef',g" \
--
1.7.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 2/3] perl: use only one method all_perl_packages
2010-08-04 13:51 [PATCH 1/3] perl: honour DISTRO_FEATURE largefile Bernhard Reutner-Fischer
@ 2010-08-04 13:51 ` Bernhard Reutner-Fischer
2010-08-04 14:07 ` Roman I Khimov
2010-08-04 13:51 ` [PATCH 3/3] openssl: properly handle ipv6 and largefile Bernhard Reutner-Fischer
2010-08-04 14:02 ` [PATCH 1/3] perl: honour DISTRO_FEATURE largefile Roman I Khimov
2 siblings, 1 reply; 14+ messages in thread
From: Bernhard Reutner-Fischer @ 2010-08-04 13:51 UTC (permalink / raw)
To: openembedded-devel
.. to avoid
ERROR: Error Method already seen: all_perl_packages in' perl_5.8.8.bb'
now in 'perl_5.10.1.bb'
TODO: error() already prints "ERROR:" so the "Error" in above msg is
redundant
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
---
recipes/perl/perl_5.10.1.bb | 7 +------
recipes/perl/perl_5.8.8.bb | 7 +------
recipes/perl/perl_helper.inc | 8 ++++++++
3 files changed, 10 insertions(+), 12 deletions(-)
create mode 100644 recipes/perl/perl_helper.inc
diff --git a/recipes/perl/perl_5.10.1.bb b/recipes/perl/perl_5.10.1.bb
index 75993b5..dd0bb0f 100644
--- a/recipes/perl/perl_5.10.1.bb
+++ b/recipes/perl/perl_5.10.1.bb
@@ -210,12 +210,7 @@ FILES_${PN}-doc = "${datadir}/perl/${PV}/*/*.txt \
RPROVIDES_perl-lib = "perl-lib"
-def all_perl_packages(d):
- depchains = (d.getVar("DEPCHAIN_POST", True) or "").split()
- blacklist = ["perl-modules", "perl-misc", "perl-pod", "perl-doc"]
- for pkg in d.getVar("PACKAGES", True).split():
- if not pkg in blacklist and not any(pkg.endswith(post) for post in depchains):
- yield pkg
+require perl_helper.inc
# Create a perl-modules package recommending all the other perl
# packages (actually the non modules packages and not created too)
diff --git a/recipes/perl/perl_5.8.8.bb b/recipes/perl/perl_5.8.8.bb
index 5400e69..d546a15 100644
--- a/recipes/perl/perl_5.8.8.bb
+++ b/recipes/perl/perl_5.8.8.bb
@@ -212,12 +212,7 @@ FILES_${PN}-doc = "${datadir}/perl/${PV}/*/*.txt \
RPROVIDES_perl-lib = "perl-lib"
-def all_perl_packages(d):
- depchains = (d.getVar("DEPCHAIN_POST", True) or "").split()
- blacklist = ["perl-modules", "perl-misc", "perl-pod", "perl-doc"]
- for pkg in d.getVar("PACKAGES", True).split():
- if not pkg in blacklist and not any(pkg.endswith(post) for post in depchains):
- yield pkg
+require perl_helper.inc
# Create a perl-modules package recommending all the other perl
# packages (actually the non modules packages and not created too)
diff --git a/recipes/perl/perl_helper.inc b/recipes/perl/perl_helper.inc
new file mode 100644
index 0000000..ddde0b8
--- /dev/null
+++ b/recipes/perl/perl_helper.inc
@@ -0,0 +1,8 @@
+# helper functions for perl
+def all_perl_packages(d):
+ depchains = (d.getVar("DEPCHAIN_POST", True) or "").split()
+ blacklist = ["perl-modules", "perl-misc", "perl-pod", "perl-doc"]
+ for pkg in d.getVar("PACKAGES", True).split():
+ if not pkg in blacklist and not any(pkg.endswith(post) for post in depchains):
+ yield pkg
+
--
1.7.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 3/3] openssl: properly handle ipv6 and largefile
2010-08-04 13:51 [PATCH 1/3] perl: honour DISTRO_FEATURE largefile Bernhard Reutner-Fischer
2010-08-04 13:51 ` [PATCH 2/3] perl: use only one method all_perl_packages Bernhard Reutner-Fischer
@ 2010-08-04 13:51 ` Bernhard Reutner-Fischer
2010-08-04 14:02 ` [PATCH 1/3] perl: honour DISTRO_FEATURE largefile Roman I Khimov
2 siblings, 0 replies; 14+ messages in thread
From: Bernhard Reutner-Fischer @ 2010-08-04 13:51 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
---
recipes/openssl/openssl-0.9.8m/ipv6.patch | 34 +++++++++++++++++++++++
recipes/openssl/openssl-0.9.8m/uclibc-lfs.patch | 24 ++++++++++++++++
recipes/openssl/openssl-1.0.0/uclibc-lfs.patch | 25 +++++++++++++++++
recipes/openssl/openssl-native_0.9.8m.bb | 3 +-
recipes/openssl/openssl-native_1.0.0.bb | 1 +
recipes/openssl/openssl_0.9.8m.bb | 4 ++-
recipes/openssl/openssl_1.0.0.bb | 1 +
7 files changed, 90 insertions(+), 2 deletions(-)
create mode 100644 recipes/openssl/openssl-0.9.8m/ipv6.patch
create mode 100644 recipes/openssl/openssl-0.9.8m/uclibc-lfs.patch
create mode 100644 recipes/openssl/openssl-1.0.0/uclibc-lfs.patch
diff --git a/recipes/openssl/openssl-0.9.8m/ipv6.patch b/recipes/openssl/openssl-0.9.8m/ipv6.patch
new file mode 100644
index 0000000..05df761
--- /dev/null
+++ b/recipes/openssl/openssl-0.9.8m/ipv6.patch
@@ -0,0 +1,34 @@
+diff -rdup openssl-0.9.8m.old1/crypto/bio/bss_dgram.c openssl-0.9.8m/crypto/bio/bss_dgram.c
+--- openssl-0.9.8m.old1/crypto/bio/bss_dgram.c 2009-09-22 13:33:58.000000000 +0200
++++ openssl-0.9.8m/crypto/bio/bss_dgram.c 2010-08-03 10:04:03.716585233 +0200
+@@ -429,12 +429,14 @@ static long dgram_ctrl(BIO *b, int cmd,
+ &sockopt_val, sizeof(sockopt_val))) < 0)
+ perror("setsockopt");
+ break;
++#if defined _POSIX_IPV6
+ case AF_INET6:
+ sockopt_val = IPV6_PMTUDISC_DO;
+ if ((ret = setsockopt(b->num, IPPROTO_IPV6, IPV6_MTU_DISCOVER,
+ &sockopt_val, sizeof(sockopt_val))) < 0)
+ perror("setsockopt");
+ break;
++#endif
+ default:
+ ret = -1;
+ break;
+@@ -470,6 +472,7 @@ static long dgram_ctrl(BIO *b, int cmd,
+ ret = data->mtu;
+ }
+ break;
++#if defined _POSIX_IPV6
+ case AF_INET6:
+ if ((ret = getsockopt(b->num, IPPROTO_IPV6, IPV6_MTU, (void *)&sockopt_val,
+ &sockopt_len)) < 0 || sockopt_val < 0)
+@@ -485,6 +488,7 @@ static long dgram_ctrl(BIO *b, int cmd,
+ ret = data->mtu;
+ }
+ break;
++#endif
+ default:
+ ret = 0;
+ break;
diff --git a/recipes/openssl/openssl-0.9.8m/uclibc-lfs.patch b/recipes/openssl/openssl-0.9.8m/uclibc-lfs.patch
new file mode 100644
index 0000000..c91bea8
--- /dev/null
+++ b/recipes/openssl/openssl-0.9.8m/uclibc-lfs.patch
@@ -0,0 +1,24 @@
+diff -rdup openssl-0.9.8m.old/crypto/bio/bss_file.c openssl-0.9.8m/crypto/bio/bss_file.c
+--- openssl-0.9.8m.old/crypto/bio/bss_file.c 2009-10-04 16:04:36.000000000 +0200
++++ openssl-0.9.8m/crypto/bio/bss_file.c 2010-07-30 15:21:51.436093098 +0200
+@@ -65,6 +65,7 @@
+ #ifndef HEADER_BSS_FILE_C
+ #define HEADER_BSS_FILE_C
+
++#include <features.h>
+ #if defined(__linux) || defined(__sun) || defined(__hpux)
+ /* Following definition aliases fopen to fopen64 on above mentioned
+ * platforms. This makes it possible to open and sequentially access
+@@ -78,10 +79,12 @@
+ * sequential access of large files without extra "magic" comprise *BSD,
+ * Darwin, IRIX...
+ */
++#if (defined __UCLIBC__ && defined __UCLIBC_HAS_LFS__) || !defined __UCLIBC__
+ #ifndef _FILE_OFFSET_BITS
+ #define _FILE_OFFSET_BITS 64
+ #endif
+ #endif
++#endif
+
+ #include <stdio.h>
+ #include <errno.h>
diff --git a/recipes/openssl/openssl-1.0.0/uclibc-lfs.patch b/recipes/openssl/openssl-1.0.0/uclibc-lfs.patch
new file mode 100644
index 0000000..664bbc0
--- /dev/null
+++ b/recipes/openssl/openssl-1.0.0/uclibc-lfs.patch
@@ -0,0 +1,25 @@
+diff -rdup openssl-1.0.0.orig/crypto/bio/bss_file.c openssl-1.0.0/crypto/bio/bss_file.c
+--- openssl-1.0.0.orig/crypto/bio/bss_file.c 2010-03-22 23:39:46.000000000 +0100
++++ openssl-1.0.0/crypto/bio/bss_file.c 2010-08-02 19:17:26.642347341 +0200
+@@ -65,6 +65,8 @@
+ #ifndef HEADER_BSS_FILE_C
+ #define HEADER_BSS_FILE_C
+
++#include <features.h>
++
+ #if defined(__linux) || defined(__sun) || defined(__hpux)
+ /* Following definition aliases fopen to fopen64 on above mentioned
+ * platforms. This makes it possible to open and sequentially access
+@@ -78,10 +80,12 @@
+ * sequential access of large files without extra "magic" comprise *BSD,
+ * Darwin, IRIX...
+ */
++#if (defined __UCLIBC__ && defined __UCLIBC_HAS_LFS__) || !defined __UCLIBC__
+ #ifndef _FILE_OFFSET_BITS
+ #define _FILE_OFFSET_BITS 64
+ #endif
+ #endif
++#endif
+
+ #include <stdio.h>
+ #include <errno.h>
diff --git a/recipes/openssl/openssl-native_0.9.8m.bb b/recipes/openssl/openssl-native_0.9.8m.bb
index 1b82645..53ec4f6 100644
--- a/recipes/openssl/openssl-native_0.9.8m.bb
+++ b/recipes/openssl/openssl-native_0.9.8m.bb
@@ -12,7 +12,8 @@ export BUILD_OPTIMIZATION = " "
SRC_URI += "file://configure-targets.patch \
file://shared-libs.patch \
- file://debian.patch"
+ file://debian.patch \
+ file://uclibc-lfs.patch"
PARALLEL_MAKE = ""
diff --git a/recipes/openssl/openssl-native_1.0.0.bb b/recipes/openssl/openssl-native_1.0.0.bb
index 7029bfe..7507c37 100644
--- a/recipes/openssl/openssl-native_1.0.0.bb
+++ b/recipes/openssl/openssl-native_1.0.0.bb
@@ -18,6 +18,7 @@ SRC_URI += "file://configure-targets.patch \
file://shared-libs.patch \
file://debian.patch \
file://libdeps-first.patch \
+ file://uclibc-lfs.patch \
"
PARALLEL_MAKE = ""
diff --git a/recipes/openssl/openssl_0.9.8m.bb b/recipes/openssl/openssl_0.9.8m.bb
index a7eb332..6ee1929 100644
--- a/recipes/openssl/openssl_0.9.8m.bb
+++ b/recipes/openssl/openssl_0.9.8m.bb
@@ -11,6 +11,8 @@ export OE_LDFLAGS="${LDFLAGS}"
SRC_URI += "file://configure-targets.patch \
file://shared-libs.patch \
file://debian.patch \
- file://oe-ldflags.patch"
+ file://oe-ldflags.patch \
+ file://uclibc-lfs.patch \
+ file://ipv6.patch"
PARALLEL_MAKE = ""
diff --git a/recipes/openssl/openssl_1.0.0.bb b/recipes/openssl/openssl_1.0.0.bb
index 4f7dcb7..a13d471 100644
--- a/recipes/openssl/openssl_1.0.0.bb
+++ b/recipes/openssl/openssl_1.0.0.bb
@@ -17,6 +17,7 @@ SRC_URI += "file://configure-targets.patch \
file://oe-ldflags.patch \
file://libdeps-first.patch \
file://engines-install-in-libdir-ssl.patch \
+ file://uclibc-lfs.patch \
"
PARALLEL_MAKE = ""
--
1.7.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH 1/3] perl: honour DISTRO_FEATURE largefile
2010-08-04 13:51 [PATCH 1/3] perl: honour DISTRO_FEATURE largefile Bernhard Reutner-Fischer
2010-08-04 13:51 ` [PATCH 2/3] perl: use only one method all_perl_packages Bernhard Reutner-Fischer
2010-08-04 13:51 ` [PATCH 3/3] openssl: properly handle ipv6 and largefile Bernhard Reutner-Fischer
@ 2010-08-04 14:02 ` Roman I Khimov
2010-08-04 14:17 ` Bernhard Reutner-Fischer
2 siblings, 1 reply; 14+ messages in thread
From: Roman I Khimov @ 2010-08-04 14:02 UTC (permalink / raw)
To: openembedded-devel
В сообщении от Среда 04 августа 2010 17:51:56 автор Bernhard Reutner-Fischer
написал:
> Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
> ---
> recipes/perl/perl-native_5.8.8.bb | 4 ++--
> recipes/perl/perl_5.8.8.bb | 6 ++++--
> 2 files changed, 6 insertions(+), 4 deletions(-)
Is it really appropriate for -native? And how about Perl 5.10.1?
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 2/3] perl: use only one method all_perl_packages
2010-08-04 13:51 ` [PATCH 2/3] perl: use only one method all_perl_packages Bernhard Reutner-Fischer
@ 2010-08-04 14:07 ` Roman I Khimov
2010-08-04 14:21 ` Bernhard Reutner-Fischer
0 siblings, 1 reply; 14+ messages in thread
From: Roman I Khimov @ 2010-08-04 14:07 UTC (permalink / raw)
To: openembedded-devel
В сообщении от Среда 04 августа 2010 17:51:57 автор Bernhard Reutner-Fischer
написал:
> .. to avoid
> ERROR: Error Method already seen: all_perl_packages in' perl_5.8.8.bb'
> now in 'perl_5.10.1.bb'
>
> TODO: error() already prints "ERROR:" so the "Error" in above msg is
> redundant
>
> Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
What kind of configuration gives you such an error? Never seen that.
Although the change itself looks good, I'd only probably rename
perl_helper.inc to plain perl.inc, we can merge more common things between
different perl versions later.
Acked-by: Roman I Khimov <khimov@altell.ru>
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 1/3] perl: honour DISTRO_FEATURE largefile
2010-08-04 14:02 ` [PATCH 1/3] perl: honour DISTRO_FEATURE largefile Roman I Khimov
@ 2010-08-04 14:17 ` Bernhard Reutner-Fischer
2010-08-04 14:20 ` Bernhard Reutner-Fischer
2010-08-04 15:17 ` Roman I Khimov
0 siblings, 2 replies; 14+ messages in thread
From: Bernhard Reutner-Fischer @ 2010-08-04 14:17 UTC (permalink / raw)
To: openembedded-devel
On Wed, Aug 04, 2010 at 06:02:01PM +0400, Roman I Khimov wrote:
>В сообщении от Среда 04 августа 2010 17:51:56 автор Bernhard Reutner-Fischer
>написал:
>> Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
>> ---
>> recipes/perl/perl-native_5.8.8.bb | 4 ++--
>> recipes/perl/perl_5.8.8.bb | 6 ++++--
>> 2 files changed, 6 insertions(+), 4 deletions(-)
>
>Is it really appropriate for -native? And how about Perl 5.10.1?
it's perfectly fine to build on a uclibc-based host with LFS off.
Dunno about 5.10.1, it has a default preference of -1
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 1/3] perl: honour DISTRO_FEATURE largefile
2010-08-04 14:17 ` Bernhard Reutner-Fischer
@ 2010-08-04 14:20 ` Bernhard Reutner-Fischer
2010-08-04 15:17 ` Roman I Khimov
1 sibling, 0 replies; 14+ messages in thread
From: Bernhard Reutner-Fischer @ 2010-08-04 14:20 UTC (permalink / raw)
To: openembedded-devel
oh sorry, i just see that this needs even more munging so better
disregard this for now.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 2/3] perl: use only one method all_perl_packages
2010-08-04 14:07 ` Roman I Khimov
@ 2010-08-04 14:21 ` Bernhard Reutner-Fischer
2010-08-04 14:31 ` Roman I Khimov
2010-08-04 14:36 ` Chris Larson
0 siblings, 2 replies; 14+ messages in thread
From: Bernhard Reutner-Fischer @ 2010-08-04 14:21 UTC (permalink / raw)
To: openembedded-devel
On Wed, Aug 04, 2010 at 06:07:06PM +0400, Roman I Khimov wrote:
>В сообщении от Среда 04 августа 2010 17:51:57 автор Bernhard Reutner-Fischer
>написал:
>> .. to avoid
>> ERROR: Error Method already seen: all_perl_packages in' perl_5.8.8.bb'
>> now in 'perl_5.10.1.bb'
>>
>> TODO: error() already prints "ERROR:" so the "Error" in above msg is
>> redundant
>>
>> Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
>
>What kind of configuration gives you such an error? Never seen that.
It was applied by Chris as a5dee57033f7d9987858d2c0514f4e687ece2874
>
>Although the change itself looks good, I'd only probably rename
>perl_helper.inc to plain perl.inc, we can merge more common things between
>different perl versions later.
fine with me, sure.
>
>Acked-by: Roman I Khimov <khimov@altell.ru>
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 2/3] perl: use only one method all_perl_packages
2010-08-04 14:21 ` Bernhard Reutner-Fischer
@ 2010-08-04 14:31 ` Roman I Khimov
2010-08-04 14:36 ` Chris Larson
1 sibling, 0 replies; 14+ messages in thread
From: Roman I Khimov @ 2010-08-04 14:31 UTC (permalink / raw)
To: openembedded-devel
В сообщении от Среда 04 августа 2010 18:21:47 автор Bernhard Reutner-Fischer
написал:
> On Wed, Aug 04, 2010 at 06:07:06PM +0400, Roman I Khimov wrote:
> >В сообщении от Среда 04 августа 2010 17:51:57 автор Bernhard
> > Reutner-Fischer
> >
> >написал:
> >> .. to avoid
> >> ERROR: Error Method already seen: all_perl_packages in' perl_5.8.8.bb'
> >> now in 'perl_5.10.1.bb'
> >>
> >> TODO: error() already prints "ERROR:" so the "Error" in above msg is
> >> redundant
> >>
> >> Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
> >
> >What kind of configuration gives you such an error? Never seen that.
>
> It was applied by Chris as a5dee57033f7d9987858d2c0514f4e687ece2874
Probably d67c4e5ba499a054f67d665733d29f873e426db9? Very recent change, got it,
OK.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 2/3] perl: use only one method all_perl_packages
2010-08-04 14:21 ` Bernhard Reutner-Fischer
2010-08-04 14:31 ` Roman I Khimov
@ 2010-08-04 14:36 ` Chris Larson
2010-08-04 15:58 ` Bernhard Reutner-Fischer
1 sibling, 1 reply; 14+ messages in thread
From: Chris Larson @ 2010-08-04 14:36 UTC (permalink / raw)
To: openembedded-devel
On Wed, Aug 4, 2010 at 7:21 AM, Bernhard Reutner-Fischer <
rep.dot.nop@gmail.com> wrote:
> On Wed, Aug 04, 2010 at 06:07:06PM +0400, Roman I Khimov wrote:
> >В сообщении от Среда 04 августа 2010 17:51:57 автор Bernhard
> Reutner-Fischer
> >написал:
> >> .. to avoid
> >> ERROR: Error Method already seen: all_perl_packages in' perl_5.8.8.bb'
> >> now in 'perl_5.10.1.bb'
> >>
> >> TODO: error() already prints "ERROR:" so the "Error" in above msg is
> >> redundant
> >>
> >> Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
> >
> >What kind of configuration gives you such an error? Never seen that.
>
> It was applied by Chris as a5dee57033f7d9987858d2c0514f4e687ece2874
> >
> >Although the change itself looks good, I'd only probably rename
> >perl_helper.inc to plain perl.inc, we can merge more common things between
> >different perl versions later.
>
> fine with me, sure.
Thanks for the fix, appreciate it -- I was really surprised to see no
perl.inc existed yet.
--
Christopher Larson
clarson at kergoth dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 1/3] perl: honour DISTRO_FEATURE largefile
2010-08-04 14:17 ` Bernhard Reutner-Fischer
2010-08-04 14:20 ` Bernhard Reutner-Fischer
@ 2010-08-04 15:17 ` Roman I Khimov
2010-08-04 16:54 ` [PATCH][v2] " Bernhard Reutner-Fischer
1 sibling, 1 reply; 14+ messages in thread
From: Roman I Khimov @ 2010-08-04 15:17 UTC (permalink / raw)
To: openembedded-devel
В сообщении от Среда 04 августа 2010 18:17:48 автор Bernhard Reutner-Fischer
написал:
> On Wed, Aug 04, 2010 at 06:02:01PM +0400, Roman I Khimov wrote:
> >В сообщении от Среда 04 августа 2010 17:51:56 автор Bernhard
> > Reutner-Fischer
> >
> >написал:
> >> Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
> >> ---
> >> recipes/perl/perl-native_5.8.8.bb | 4 ++--
> >> recipes/perl/perl_5.8.8.bb | 6 ++++--
> >> 2 files changed, 6 insertions(+), 4 deletions(-)
> >
> >Is it really appropriate for -native? And how about Perl 5.10.1?
>
> it's perfectly fine to build on a uclibc-based host with LFS off.
Well, that's _build machine_ characteristic anyway, that's what I'm concerned
about. DISTRO_FEATURES on the other hand characterize what we want to get on
_target_ machine. So you might be building on uclibc-based no-LFS system for
uclibc-based LFS-enabled target or more common case with glibc-based build
system and uclibc no-LFS target. I'm very unsure about what kind of result
that might give.
> Dunno about 5.10.1, it has a default preference of -1
I think we should try to keep two versions in sync wrt to such changes, I can
test on 5.10.1.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 2/3] perl: use only one method all_perl_packages
2010-08-04 14:36 ` Chris Larson
@ 2010-08-04 15:58 ` Bernhard Reutner-Fischer
2010-08-04 16:25 ` Chris Larson
0 siblings, 1 reply; 14+ messages in thread
From: Bernhard Reutner-Fischer @ 2010-08-04 15:58 UTC (permalink / raw)
To: openembedded-devel
On Wed, Aug 04, 2010 at 07:36:01AM -0700, Chris Larson wrote:
>On Wed, Aug 4, 2010 at 7:21 AM, Bernhard Reutner-Fischer <
>rep.dot.nop@gmail.com> wrote:
>
>> On Wed, Aug 04, 2010 at 06:07:06PM +0400, Roman I Khimov wrote:
>> >В сообщении от Среда 04 августа 2010 17:51:57 автор Bernhard
>> Reutner-Fischer
>> >написал:
>> >> .. to avoid
>> >> ERROR: Error Method already seen: all_perl_packages in' perl_5.8.8.bb'
>> >> now in 'perl_5.10.1.bb'
>> >>
>> >> TODO: error() already prints "ERROR:" so the "Error" in above msg is
>> >> redundant
>> >>
>> >> Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
>> >
>> >What kind of configuration gives you such an error? Never seen that.
>>
>> It was applied by Chris as a5dee57033f7d9987858d2c0514f4e687ece2874
>> >
>> >Although the change itself looks good, I'd only probably rename
>> >perl_helper.inc to plain perl.inc, we can merge more common things between
>> >different perl versions later.
>>
>> fine with me, sure.
>
>
>Thanks for the fix, appreciate it -- I was really surprised to see no
>perl.inc existed yet.
It would be way cool if somebody with write-access could move the
function into some perl.inc and push that change....
Let me know if i'm supposed to send a patch with the correct .inc name
instead.
thanks,
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 2/3] perl: use only one method all_perl_packages
2010-08-04 15:58 ` Bernhard Reutner-Fischer
@ 2010-08-04 16:25 ` Chris Larson
0 siblings, 0 replies; 14+ messages in thread
From: Chris Larson @ 2010-08-04 16:25 UTC (permalink / raw)
To: openembedded-devel
On Wed, Aug 4, 2010 at 8:58 AM, Bernhard Reutner-Fischer <
rep.dot.nop@gmail.com> wrote:
> On Wed, Aug 04, 2010 at 07:36:01AM -0700, Chris Larson wrote:
> >On Wed, Aug 4, 2010 at 7:21 AM, Bernhard Reutner-Fischer <
> >rep.dot.nop@gmail.com> wrote:
> >
> >> On Wed, Aug 04, 2010 at 06:07:06PM +0400, Roman I Khimov wrote:
> >> >В сообщении от Среда 04 августа 2010 17:51:57 автор Bernhard
> >> Reutner-Fischer
> >> >написал:
> >> >> .. to avoid
> >> >> ERROR: Error Method already seen: all_perl_packages in'
> perl_5.8.8.bb'
> >> >> now in 'perl_5.10.1.bb'
> >> >>
> >> >> TODO: error() already prints "ERROR:" so the "Error" in above msg is
> >> >> redundant
> >> >>
> >> >> Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
> >> >
> >> >What kind of configuration gives you such an error? Never seen that.
> >>
> >> It was applied by Chris as a5dee57033f7d9987858d2c0514f4e687ece2874
> >> >
> >> >Although the change itself looks good, I'd only probably rename
> >> >perl_helper.inc to plain perl.inc, we can merge more common things
> between
> >> >different perl versions later.
> >>
> >> fine with me, sure.
> >
> >
> >Thanks for the fix, appreciate it -- I was really surprised to see no
> >perl.inc existed yet.
>
> It would be way cool if somebody with write-access could move the
> function into some perl.inc and push that change....
> Let me know if i'm supposed to send a patch with the correct .inc name
> instead.
>
> thanks,
Done
--
Christopher Larson
clarson at kergoth dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH][v2] perl: honour DISTRO_FEATURE largefile
2010-08-04 15:17 ` Roman I Khimov
@ 2010-08-04 16:54 ` Bernhard Reutner-Fischer
0 siblings, 0 replies; 14+ messages in thread
From: Bernhard Reutner-Fischer @ 2010-08-04 16:54 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
---
recipes/perl/perl-native_5.8.8.bb | 3 +--
recipes/perl/perl_5.8.8.bb | 18 ++++++++++++++----
2 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/recipes/perl/perl-native_5.8.8.bb b/recipes/perl/perl-native_5.8.8.bb
index fe1bc84..74103de 100644
--- a/recipes/perl/perl-native_5.8.8.bb
+++ b/recipes/perl/perl-native_5.8.8.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.perl.org/"
SECTION = "libs"
LICENSE = "Artistic|GPL"
DEPENDS = "virtual/db-native gdbm-native"
-PR = "r20"
+PR = "r21"
NATIVE_INSTALL_WORKS = "1"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/perl-${PV}"
@@ -44,7 +44,6 @@ do_configure () {
-Duseshrplib \
-Dusethreads \
-Duseithreads \
- -Duselargefiles \
-Dnoextensions=ODBM_File \
-Ud_dosuid \
-Ui_db \
diff --git a/recipes/perl/perl_5.8.8.bb b/recipes/perl/perl_5.8.8.bb
index c8ad895..3321b9b 100644
--- a/recipes/perl/perl_5.8.8.bb
+++ b/recipes/perl/perl_5.8.8.bb
@@ -5,7 +5,7 @@ LICENSE = "Artistic|GPL"
PRIORITY = "optional"
# We need gnugrep (for -I)
DEPENDS = "virtual/db perl-native grep-native"
-PR = "r35"
+PR = "r36"
# Major part of version
PVM = "5.8"
@@ -60,12 +60,22 @@ do_configure() {
cd Cross
# Generate configuration
- rm -f config.sh-${TARGET_ARCH}-${TARGET_OS}
for i in ${WORKDIR}/config.sh \
${WORKDIR}/config.sh-${SITEINFO_BITS} \
${WORKDIR}/config.sh-${SITEINFO_BITS}-${SITEINFO_ENDIANNESS}; do
- cat $i >> config.sh-${TARGET_ARCH}-${TARGET_OS}
- done
+ cat $i
+ done > config.sh-${TARGET_ARCH}-${TARGET_OS}
+ uselargefiles="${@base_contains('DISTRO_FEATURES', 'largefile', 'define', 'undef', d)}"
+ flaglfs="${@base_contains('DISTRO_FEATURES', 'largefile', '-D', '-U', d)}"
+ sed -i -e "s,^\(optimize=\).*,\1'',g" \
+ -e "s,^\(uselargefiles=\).*,\1'$uselargefiles',g" \
+ -e "s,^\(d_readdir64_r=\).*,\1'$uselargefiles',g" \
+ -e "s,-[DU]\(uselargefiles\),$flaglfs\1,g" \
+ config.sh-${TARGET_ARCH}-${TARGET_OS}
+ if [ "$uselargefiles" = "undef" ]; then
+ sed -i -e 's/\([[:space:]]\|__USE\|-D\|-U\)\(_LARGEFILE_SOURCE\|_LARGEFILE64_SOURCE\|_\(FILE_OFFSET_BITS\|FILE_OFFSET64\|LARGEFILE\|LARGEFILE64\)=[[:digit:]]*\)//g' \
+ config.sh-${TARGET_ARCH}-${TARGET_OS}
+ fi
# Fixups for uclibc
if [ "${TARGET_OS}" = "linux-uclibc" -o "${TARGET_OS}" = "linux-uclibceabi" ]; then
--
1.7.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
end of thread, other threads:[~2010-08-04 16:55 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-08-04 13:51 [PATCH 1/3] perl: honour DISTRO_FEATURE largefile Bernhard Reutner-Fischer
2010-08-04 13:51 ` [PATCH 2/3] perl: use only one method all_perl_packages Bernhard Reutner-Fischer
2010-08-04 14:07 ` Roman I Khimov
2010-08-04 14:21 ` Bernhard Reutner-Fischer
2010-08-04 14:31 ` Roman I Khimov
2010-08-04 14:36 ` Chris Larson
2010-08-04 15:58 ` Bernhard Reutner-Fischer
2010-08-04 16:25 ` Chris Larson
2010-08-04 13:51 ` [PATCH 3/3] openssl: properly handle ipv6 and largefile Bernhard Reutner-Fischer
2010-08-04 14:02 ` [PATCH 1/3] perl: honour DISTRO_FEATURE largefile Roman I Khimov
2010-08-04 14:17 ` Bernhard Reutner-Fischer
2010-08-04 14:20 ` Bernhard Reutner-Fischer
2010-08-04 15:17 ` Roman I Khimov
2010-08-04 16:54 ` [PATCH][v2] " Bernhard Reutner-Fischer
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.