Skip to contentSkip to conversation

Misc Bugfixes

PATCH Applied [email protected] 2 participants 4 messages Apr 26, 2012 – Apr 27, 2012

lore
Share & tools
lore

[email protected]

author
#0 lore raw

cover Misc Bugfixes

From: Nitin A Kamble <[email protected]>

The following changes since commit 492a58cabdc053b2312712681dbcffa8270d4ea4:

self-hosted-image: Update poky revision to point at the 1.2 release branch (2012-04-24 10:21:11 +0100)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib nitin/bugfixes
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=nitin/bugfixes

Nitin A Kamble (2):
libproxy: fix compilations with gcc 4.7
quilt: fix perl path in target perl scripts

 meta/recipes-devtools/quilt/quilt_0.51.bb          |   16 ++++++++++-
 .../libproxy/libproxy_fix_for_gcc4.7.patch         |   30 ++++++++++++++++++++
 meta/recipes-support/libproxy/libproxy_0.4.7.bb    |    3 +-
 3 files changed, 47 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-support/libproxy/libproxy/libproxy_fix_for_gcc4.7.patch
Signature · 1 line
1.7.7
author
#1 lore raw

PATCH 1/2 libproxy: fix compilations with gcc 4.7

From: Nitin A Kamble <[email protected]>

Signed-off-by Nitin A Kamble <[email protected]>
---
 .../libproxy/libproxy_fix_for_gcc4.7.patch         |   30 ++++++++++++++++++++
 meta/recipes-support/libproxy/libproxy_0.4.7.bb    |    3 +-
 2 files changed, 32 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-support/libproxy/libproxy/libproxy_fix_for_gcc4.7.patch
meta/recipes-support/libproxy/libproxy/libproxy_fix_for_gcc4.7.patch new file +30 -0
new file mode 100644
index 0000000..a772f09
@@ -0,0 +1,30 @@
+Upstream-Status: Pending
+
+Signed-Off-By: Nitin A Kamble <[email protected]>
+2012/04/20
+Fixes this issue with gcc 4.7
+
+| cd /srv/home/nitin/builds/bERROR: Function failed: do_compile (see /srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/libproxy-0.4.7-r3/temp/log.do_compile.7514 for further information)
+| uild-gcc47/tmp/work/x86_64-poky-linux/libproxy-0.4.7-r3/libproxy-0.4.7/libproxy && /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/bin/x86_64-poky-linux/x86_64-poky-linux-g++   -Dlibproxy_EXPORTS -D_POSIX_C_SOURCE=1 -DLIBEXECDIR=\"/usr/libexec\" -DMM_MODULE_BUILTIN=config_sysconfig -fvisibility=hidden    -m64  --sysroot=/srv/home/nitin/builds/build-gcc47/tmp/sysroots/qemux86-64  -O2 -pipe -g -feliminate-unused-debug-types -fpermissive -fvisibility-inlines-hidden -fpermissive -O2 -g -fPIC -I/srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/libproxy-0.4.7-r3/libproxy-0.4.7 -I/srv/home/nitin/builds/build-gcc47/tmp/sysroots/qemux86-64/usr/include/glib-2.0 -I/srv/home/nitin/builds/build-gcc47/tmp/sysroots/qemux86-64/usr/lib/glib-2.0/include    -o CMakeFiles/libproxy.dir/modules/config_sysconfig.cpp.o -c /srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/libproxy-0.4.7-r3/libproxy-0.4.7/libproxy/modules/config_sysconfig.cpp
+| /srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/libproxy-0.4.7-r3/libproxy-0.4.7/libproxy/modules/config_sysconfig.cpp: In function 'bool should_use_sysconfig()':
+| /srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/libproxy-0.4.7-r3/libproxy-0.4.7/libproxy/modules/config_sysconfig.cpp:107:18: error: 'getuid' was not declared in this scope
+| make[2]: *** [libproxy/CMakeFiles/libproxy.dir/modules/config_sysconfig.cpp.o] Error 1
+| make[2]: Leaving directory `/srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/libproxy-0.4.7-r3/libproxy-0.4.7'
+| make[1]: *** [libproxy/CMakeFiles/libproxy.dir/all] Error 2
+| make[1]: Leaving directory `/srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/libproxy-0.4.7-r3/libproxy-0.4.7'
+| make: *** [all] Error 2
+| ERROR: oe_runmake failed
+NOTE: package libproxy-0.4.7-r3: task do_compile: Failed
+
+Index: libproxy-0.4.7/libproxy/modules/config_sysconfig.cpp
+===================================================================
+--- libproxy-0.4.7.orig/libproxy/modules/config_sysconfig.cpp
++++ libproxy-0.4.7/libproxy/modules/config_sysconfig.cpp
+@@ -21,6 +21,7 @@
+ #include <cstdlib>
+ #include <map>
+ #include <fstream>
++#include <unistd.h>
+ 
+ #include "../extension_config.hpp"
+ using namespace libproxy;
meta/recipes-support/libproxy/libproxy_0.4.7.bb +2 -1
index 6d99861..e3721a8 100644
@@ -8,10 +8,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7d7044444a7b1b116e8783edcdb44ff4 \
 
 DEPENDS = "gconf"
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "http://libproxy.googlecode.com/files/libproxy-${PV}.tar.gz \
            file://g++-namepace.patch \
+           file://libproxy_fix_for_gcc4.7.patch \
           "
 
 SRC_URI[md5sum] = "509e03a488a61cd62bfbaf3ab6a2a7a5"
Signature · 1 line
1.7.7
author
#2 lore raw

PATCH 2/2 quilt: fix perl path in target perl scripts

From: Nitin A Kamble <[email protected]>

While building on distros like fedora17, which has /bin/perl, the target perl scripts get perl path also as /bin/perl. And that is not correction path of perl on the target.

This commit avoids this error.

| error: Failed dependencies:
| /bin/perl is needed by quilt-0.51-r2.i586
NOTE: package core-image-sato-sdk-1.0-r0: task do_rootfs: Failed
ERROR: Task 8 (/home/nitin/prj/poky.git/meta/recipes-sato/images/core-image-sato-sdk.bb, do_rootfs) failed with exit code '1'

Signed-off-by Nitin A Kamble <[email protected]>
---
 meta/recipes-devtools/quilt/quilt_0.51.bb |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)
meta/recipes-devtools/quilt/quilt_0.51.bb +15 -1
index bc62161..75dd8ae 100644
@@ -4,4 +4,18 @@ RDEPENDS_${PN} += "patch diffstat bzip2 util-linux"
 SRC_URI += "file://aclocal.patch \
             file://gnu_patch_test_fix_target.patch \
            "
-PR = "r2"
+PR = "r3"
+
+
+PERLPATH = "${bindir}/env perl"
+PERLPATH_virtclass-nativesdk = "/usr/bin/env perl"
+
+# fix build-distro specific perl path in the target perl scripts
+do_install_append() {
+	for perlscript in ${D}${datadir}/quilt/scripts/remove-trailing-ws ${D}${datadir}/quilt/scripts/dependency-graph ${D}${datadir}/quilt/scripts/edmail ${D}${bindir}/guards
+	do
+		if [ -f $perlscript ]; then
+			sed -i -e '1s,#!.*perl,#! ${PERLPATH},' $perlscript
+		fi
+	done
+}
Signature · 1 line
1.7.7
Applied
#3 lore raw
In reply to [email protected]
Quoted 14 lines · On 04/25/2012 05:00 PM, [email protected] wrote:

From: Nitin A Kamble<[email protected]>

The following changes since commit 492a58cabdc053b2312712681dbcffa8270d4ea4:

self-hosted-image: Update poky revision to point at the 1.2 release branch (2012-04-24 10:21:11 +0100)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib nitin/bugfixes
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=nitin/bugfixes

Nitin A Kamble (2):
libproxy: fix compilations with gcc 4.7
quilt: fix perl path in target perl scripts

Quoted 6 lines
  meta/recipes-devtools/quilt/quilt_0.51.bb          |   16 ++++++++++-
  .../libproxy/libproxy_fix_for_gcc4.7.patch         |   30 ++++++++++++++++++++
  meta/recipes-support/libproxy/libproxy_0.4.7.bb    |    3 +-
  3 files changed, 47 insertions(+), 2 deletions(-)

create mode 100644 meta/recipes-support/libproxy/libproxy/libproxy_fix_for_gcc4.7.patch

Merged into OE-Core

Thanks
Sau!