[meta-oe][PATCH 1/3] proxy-libintl_20100902.bb: Specify -fPIC in CFLAGS

[meta-oe][PATCH 1/3] proxy-libintl_20100902.bb: Specify -fPIC in CFLAGS

[raj.khem]

From: Khem Raj <raj.khem@gmail.com>

Some architectures like mips become upset if you
try to link non-pic libraries to shared objects
some generate pic by default so it does not matter
Specifying -fPIC on commandline should make all happy

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../proxy-libintl/proxy-libintl_20100902.bb        |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta-oe/recipes-core/proxy-libintl/proxy-libintl_20100902.bb b/meta-oe/recipes-core/proxy-libintl/proxy-libintl_20100902.bb
index 7c433bd..548e656 100644
--- a/meta-oe/recipes-core/proxy-libintl/proxy-libintl_20100902.bb
+++ b/meta-oe/recipes-core/proxy-libintl/proxy-libintl_20100902.bb
@@ -16,7 +16,7 @@ SRC_URI[sha256sum] = "291ac350cc5eb4a01b0d651ca99fae64cee8a1c06b2005277fab5a4356
 S = "${WORKDIR}"
 FILES_${PN}-dev = "${includedir}/libintl.h ${libdir}/libintl.a"
 
-CFLAGS_append = " -Wall -I ../../include ${@['-DSTUB_ONLY', ''][bb.data.getVar('USE_NLS', d, 1) != 'no']}"
+CFLAGS_append = " -fPIC -Wall -I ../../include ${@['-DSTUB_ONLY', ''][bb.data.getVar('USE_NLS', d, 1) != 'no']}"
 TARGET_CC_ARCH += "${LDFLAGS}"
 
 do_compile() {
-- 
1.7.4.1

[meta-oe][PATCH 2/3] xcb-proto: Add recipe for version 1.6

[raj.khem]

From: Khem Raj <raj.khem@gmail.com>

xcb-proto is needed by libxcb and --without-xcb
is not possible with xorg-lib anymore hence the need

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-oe/recipes-graphics/xcb/xcb-proto.inc    |   18 ++++++++++++++++++
 meta-oe/recipes-graphics/xcb/xcb-proto_1.6.bb |    6 ++++++
 2 files changed, 24 insertions(+), 0 deletions(-)
 create mode 100644 meta-oe/recipes-graphics/xcb/xcb-proto.inc
 create mode 100644 meta-oe/recipes-graphics/xcb/xcb-proto_1.6.bb

diff --git a/meta-oe/recipes-graphics/xcb/xcb-proto.inc b/meta-oe/recipes-graphics/xcb/xcb-proto.inc
new file mode 100644
index 0000000..226dd72
--- /dev/null
+++ b/meta-oe/recipes-graphics/xcb/xcb-proto.inc
@@ -0,0 +1,18 @@
+DESCRIPTION = "XCB: an X protocol C binding"
+SECTION = "x11/libs"
+LICENSE = "MIT-X"
+HOMEPAGE = "http://xcb.freedesktop.org"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7"
+DEPENDS = "python-native"
+
+SRC_URI = "http://xcb.freedesktop.org/dist/xcb-proto-${PV}.tar.bz2"
+
+BBCLASSEXTEND = "native nativesdk"
+
+inherit autotools pkgconfig
+
+INC_PR = "r0"
+
+FILES_${PN}-dev += "${datadir}/xcb/*.xml"
+ALLOW_EMPTY_${PN} = "1"
+
diff --git a/meta-oe/recipes-graphics/xcb/xcb-proto_1.6.bb b/meta-oe/recipes-graphics/xcb/xcb-proto_1.6.bb
new file mode 100644
index 0000000..db18c2a
--- /dev/null
+++ b/meta-oe/recipes-graphics/xcb/xcb-proto_1.6.bb
@@ -0,0 +1,6 @@
+include xcb-proto.inc
+PR = "${INC_PR}.0"
+
+SRC_URI[md5sum] = "04313e1d914b44d0e457f6c494fc178b"
+SRC_URI[sha256sum] = "f52bc1159b12496f002404eb5793c01277b20c82cb72c5ff076d7b25da9b5ca2"
+
-- 
1.7.4.1

[meta-oe][PATCH 3/3] libx11_1.4.3.bb: Remove --without-xcb

[raj.khem]

From: Khem Raj <raj.khem@gmail.com>

--without-xcb is no longer supported and that made a lot of difference
in different BBCLASSEXTENDED recipes. It can be unified now

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-oe/recipes-graphics/xorg-lib/libx11.inc      |   15 +++++----------
 meta-oe/recipes-graphics/xorg-lib/libx11_1.4.3.bb |    1 -
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/meta-oe/recipes-graphics/xorg-lib/libx11.inc b/meta-oe/recipes-graphics/xorg-lib/libx11.inc
index d1e646a..2aa9700 100644
--- a/meta-oe/recipes-graphics/xorg-lib/libx11.inc
+++ b/meta-oe/recipes-graphics/xorg-lib/libx11.inc
@@ -1,13 +1,10 @@
 require xorg-lib-common.inc
 
 DESCRIPTION = "Base X libs."
-COMMON_DEPENDS = "util-macros xtrans libxdmcp libxau \
-                  bigreqsproto xproto xextproto xcmiscproto \
-                  xf86bigfontproto kbproto inputproto xproto-native"
-
-DEPENDS = "libxcb ${COMMON_DEPENDS}"		  
-DEPENDS_virtclass-native = "${COMMON_DEPENDS}"
-DEPENDS_virtclass-nativesdk = "${COMMON_DEPENDS}"
+DEPENDS += "util-macros xtrans libxdmcp libxau \
+            bigreqsproto xproto xextproto xcmiscproto \
+            xf86bigfontproto kbproto inputproto libxcb \
+	    xproto-native"
 
 FILESPATHPKG .= ":libx11-${PV}:libx11"
 BBCLASSEXTEND = "native nativesdk"
@@ -22,9 +19,7 @@ FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
 
 XORG_PN = "libX11"
 
-EXTRA_OECONF += " --with-xcb --with-keysymdefdir=${STAGING_INCDIR}/X11 --with-groff=no --with-ps2pdf=no --with-fop=no"
-EXTRA_OECONF_virtclass-native = " --without-xcb --with-groff=no --with-ps2pdf=no --with-fop=no"
-EXTRA_OECONF_virtclass-nativesdk = " --without-xcb --with-groff=no --with-ps2pdf=no --with-fop=no"
+EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11 --with-groff=no --with-ps2pdf=no --with-fop=no --disable-specs"
 
 # Below option is added to overcome the GCC bug on ARM
 # see http://gcc.gnu.org/PR42981 for further details.
diff --git a/meta-oe/recipes-graphics/xorg-lib/libx11_1.4.3.bb b/meta-oe/recipes-graphics/xorg-lib/libx11_1.4.3.bb
index 481b90f..3c6a170 100644
--- a/meta-oe/recipes-graphics/xorg-lib/libx11_1.4.3.bb
+++ b/meta-oe/recipes-graphics/xorg-lib/libx11_1.4.3.bb
@@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
 
 #--without-xcb is not an option anymore
 #http://cgit.freedesktop.org/xorg/lib/libX11/commit/?id=15e5eaf62897b3179d1fbe457cb19f886f0449f8
-DEPENDS_virtclass-native = "libxcb-native ${COMMON_DEPENDS}"
 PR = "${INC_PR}.0"
 
 SRC_URI[md5sum] = "85e942627aaa020813e0eb8433353563"
-- 
1.7.4.1

Re: [meta-oe][PATCH 1/3] proxy-libintl_20100902.bb: Specify -fPIC in CFLAGS

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 29-04-11 01:31, raj.khem@gmail.com wrote:
> From: Khem Raj <raj.khem@gmail.com>
> 
> Some architectures like mips become upset if you
> try to link non-pic libraries to shared objects
> some generate pic by default so it does not matter
> Specifying -fPIC on commandline should make all happy
> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>

This needs a PR bump, since it changes the output.

regards,

Koen

> ---
>  .../proxy-libintl/proxy-libintl_20100902.bb        |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/meta-oe/recipes-core/proxy-libintl/proxy-libintl_20100902.bb b/meta-oe/recipes-core/proxy-libintl/proxy-libintl_20100902.bb
> index 7c433bd..548e656 100644
> --- a/meta-oe/recipes-core/proxy-libintl/proxy-libintl_20100902.bb
> +++ b/meta-oe/recipes-core/proxy-libintl/proxy-libintl_20100902.bb
> @@ -16,7 +16,7 @@ SRC_URI[sha256sum] = "291ac350cc5eb4a01b0d651ca99fae64cee8a1c06b2005277fab5a4356
>  S = "${WORKDIR}"
>  FILES_${PN}-dev = "${includedir}/libintl.h ${libdir}/libintl.a"
>  
> -CFLAGS_append = " -Wall -I ../../include ${@['-DSTUB_ONLY', ''][bb.data.getVar('USE_NLS', d, 1) != 'no']}"
> +CFLAGS_append = " -fPIC -Wall -I ../../include ${@['-DSTUB_ONLY', ''][bb.data.getVar('USE_NLS', d, 1) != 'no']}"
>  TARGET_CC_ARCH += "${LDFLAGS}"
>  
>  do_compile() {

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFNul90MkyGM64RGpERAryIAKCUVh3wc0iPwSJGc9gXPC8qrhNaDACeLsX3
64BJOcqERBPwYoesfm+2bgY=
=OVMA
-----END PGP SIGNATURE-----