glib-2.0-native_2.21.4.bb: New recipe for native glib 2.21.4

* Build shared library instead of static.

* with libint.a the link order matters and generally for uclibc
  targets we append -lintl to LDFLAGS and sometime it gets specified
  before the objects and symbols do not get pulled in. Better we
  generate shared object so the linking order does not matter

Signed-off-by: Khem Raj <raj.khem@gmail.com>
glib-2.0_2.21.4.bb: Make default prefrence.

* Move to INC_PR

Signed-off-by: Khem Raj <raj.khem@gmail.com>

diff --git a/recipes/glib-2.0/glib-2.0-native_2.21.4.bb b/recipes/glib-2.0/glib-2.0-native_2.21.4.bb
new file mode 100644 (file)
index 0000000..b5ce9da
--- /dev/null
+++ b/recipes/glib-2.0/glib-2.0-native_2.21.4.bb
@@ -0,0 +1,40 @@
+require glib-2.0_${PV}.bb
+
+FILESPATH = "${FILE_DIRNAME}/glib-2.0-${PV}:${FILE_DIRNAME}/files"
+DEPENDS = "gettext-native gtk-doc-native"
+EXTRA_OECONF = ""
+
+inherit native
+
+do_configure_prepend() {
+    if [ -e ${S}/${TARGET_SYS}-libtool ] ; then
+               echo "${TARGET_SYS}-libtool already present"
+    else
+        cp ${STAGING_BINDIR}/${TARGET_SYS}-libtool ${S}
+    fi
+
+}
+
+do_stage () {
+       install -m 0755 gobject/glib-mkenums ${STAGING_BINDIR}/
+       install -m 0755 gobject/.libs/glib-genmarshal ${STAGING_BINDIR}/
+       install -m 0755 glib-gettextize ${STAGING_BINDIR}/
+       oe_libinstall -so -C glib libglib-2.0 ${STAGING_LIBDIR}
+       oe_libinstall -so -C gmodule libgmodule-2.0 ${STAGING_LIBDIR}
+       oe_libinstall -so -C gthread libgthread-2.0 ${STAGING_LIBDIR}
+       oe_libinstall -so -C gobject libgobject-2.0 ${STAGING_LIBDIR}
+       oe_libinstall -so -C gio libgio-2.0 ${STAGING_LIBDIR}
+       autotools_stage_includes
+       install -d ${STAGING_INCDIR}/glib-2.0/glib
+       install -m 0755 ${S}/glibconfig.h ${STAGING_INCDIR}/glib-2.0/glibconfig.h
+       install -d ${STAGING_DATADIR}/aclocal
+       install -m 0644 ${S}/m4macros/glib-2.0.m4 ${STAGING_DATADIR}/aclocal/glib-2.0.m4
+       install -m 0644 ${S}/m4macros/glib-gettext.m4 ${STAGING_DATADIR}/aclocal/glib-gettext.m4
+       install -d ${STAGING_DATADIR}/glib-2.0/gettext/po
+       install -m 0755 mkinstalldirs ${STAGING_DATADIR}/glib-2.0/gettext/
+       install -m 0644 po/Makefile.in.in ${STAGING_DATADIR}/glib-2.0/gettext/po/
+}
+
+do_install () {
+       :
+}

diff --git a/recipes/glib-2.0/glib-2.0_2.12.10.bb b/recipes/glib-2.0/glib-2.0_2.12.10.bb
index 4d8e59b35590995f5fad32d935bd671975c6e05c..acd1927647a364aef88cd69f671632702b96b1b1 100644 (file)
--- a/recipes/glib-2.0/glib-2.0_2.12.10.bb
+++ b/recipes/glib-2.0/glib-2.0_2.12.10.bb
@@ -1,5 +1,5 @@
 require glib.inc
-
+PR = "${INC_PR}.0"
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.12/glib-${PV}.tar.bz2 \
            file://glibconfig-sysdefs.h \
            file://configure-libtool.patch;patch=1"

diff --git a/recipes/glib-2.0/glib-2.0_2.12.11.bb b/recipes/glib-2.0/glib-2.0_2.12.11.bb
index 4d8e59b35590995f5fad32d935bd671975c6e05c..31a1d53a63abd4bf612347d08204d43a5e78c5b2 100644 (file)
--- a/recipes/glib-2.0/glib-2.0_2.12.11.bb
+++ b/recipes/glib-2.0/glib-2.0_2.12.11.bb
@@ -1,4 +1,5 @@
 require glib.inc
+PR = "${INC_PR}.0"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.12/glib-${PV}.tar.bz2 \
            file://glibconfig-sysdefs.h \

diff --git a/recipes/glib-2.0/glib-2.0_2.12.12.bb b/recipes/glib-2.0/glib-2.0_2.12.12.bb
index 2e5259073a99c779f915c60bed13c9b6bdf63425..31a1d53a63abd4bf612347d08204d43a5e78c5b2 100644 (file)
--- a/recipes/glib-2.0/glib-2.0_2.12.12.bb
+++ b/recipes/glib-2.0/glib-2.0_2.12.12.bb
@@ -1,6 +1,5 @@
 require glib.inc
-
-PR = "r2"
+PR = "${INC_PR}.0"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.12/glib-${PV}.tar.bz2 \
            file://glibconfig-sysdefs.h \

diff --git a/recipes/glib-2.0/glib-2.0_2.12.13.bb b/recipes/glib-2.0/glib-2.0_2.12.13.bb
index 2e5259073a99c779f915c60bed13c9b6bdf63425..e543b836791f6f6f6164a66e67cd1cacae4c4d13 100644 (file)
--- a/recipes/glib-2.0/glib-2.0_2.12.13.bb
+++ b/recipes/glib-2.0/glib-2.0_2.12.13.bb
@@ -1,6 +1,6 @@
 require glib.inc
 
-PR = "r2"
+PR = "${INC_PR}.0"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.12/glib-${PV}.tar.bz2 \
            file://glibconfig-sysdefs.h \

diff --git a/recipes/glib-2.0/glib-2.0_2.12.6.bb b/recipes/glib-2.0/glib-2.0_2.12.6.bb
index 4d8e59b35590995f5fad32d935bd671975c6e05c..31a1d53a63abd4bf612347d08204d43a5e78c5b2 100644 (file)
--- a/recipes/glib-2.0/glib-2.0_2.12.6.bb
+++ b/recipes/glib-2.0/glib-2.0_2.12.6.bb
@@ -1,4 +1,5 @@
 require glib.inc
+PR = "${INC_PR}.0"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.12/glib-${PV}.tar.bz2 \
            file://glibconfig-sysdefs.h \

diff --git a/recipes/glib-2.0/glib-2.0_2.12.9.bb b/recipes/glib-2.0/glib-2.0_2.12.9.bb
index 4d8e59b35590995f5fad32d935bd671975c6e05c..31a1d53a63abd4bf612347d08204d43a5e78c5b2 100644 (file)
--- a/recipes/glib-2.0/glib-2.0_2.12.9.bb
+++ b/recipes/glib-2.0/glib-2.0_2.12.9.bb
@@ -1,4 +1,5 @@
 require glib.inc
+PR = "${INC_PR}.0"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.12/glib-${PV}.tar.bz2 \
            file://glibconfig-sysdefs.h \

diff --git a/recipes/glib-2.0/glib-2.0_2.14.0.bb b/recipes/glib-2.0/glib-2.0_2.14.0.bb
index e4318cd1f0906e8607b9cf7995bd3b5016352f59..37117b2577c67fb7891749ff60aab4ff3bc36111 100644 (file)
--- a/recipes/glib-2.0/glib-2.0_2.14.0.bb
+++ b/recipes/glib-2.0/glib-2.0_2.14.0.bb
@@ -1,4 +1,5 @@
 require glib.inc
+PR = "${INC_PR}.0"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.14/glib-${PV}.tar.bz2 \
            file://glibconfig-sysdefs.h \

diff --git a/recipes/glib-2.0/glib-2.0_2.14.1.bb b/recipes/glib-2.0/glib-2.0_2.14.1.bb
index e4318cd1f0906e8607b9cf7995bd3b5016352f59..37117b2577c67fb7891749ff60aab4ff3bc36111 100644 (file)
--- a/recipes/glib-2.0/glib-2.0_2.14.1.bb
+++ b/recipes/glib-2.0/glib-2.0_2.14.1.bb
@@ -1,4 +1,5 @@
 require glib.inc
+PR = "${INC_PR}.0"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.14/glib-${PV}.tar.bz2 \
            file://glibconfig-sysdefs.h \

diff --git a/recipes/glib-2.0/glib-2.0_2.14.4.bb b/recipes/glib-2.0/glib-2.0_2.14.4.bb
index e4318cd1f0906e8607b9cf7995bd3b5016352f59..37117b2577c67fb7891749ff60aab4ff3bc36111 100644 (file)
--- a/recipes/glib-2.0/glib-2.0_2.14.4.bb
+++ b/recipes/glib-2.0/glib-2.0_2.14.4.bb
@@ -1,4 +1,5 @@
 require glib.inc
+PR = "${INC_PR}.0"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.14/glib-${PV}.tar.bz2 \
            file://glibconfig-sysdefs.h \

diff --git a/recipes/glib-2.0/glib-2.0_2.15.6.bb b/recipes/glib-2.0/glib-2.0_2.15.6.bb
index 525a9d23de0a2f6cd3ce0fc56f5929afd15a4db4..4fcbf67e7049a5d8adcccf51c5b091bbb2a8ec99 100644 (file)
--- a/recipes/glib-2.0/glib-2.0_2.15.6.bb
+++ b/recipes/glib-2.0/glib-2.0_2.15.6.bb
@@ -1,4 +1,5 @@
 require glib.inc
+PR = "${INC_PR}.0"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.15/glib-${PV}.tar.bz2 \
            file://glibconfig-sysdefs.h \

diff --git a/recipes/glib-2.0/glib-2.0_2.16.1.bb b/recipes/glib-2.0/glib-2.0_2.16.1.bb
index db388d7277c6c5982fdc5d964685064eb9d85ee3..7e2ddd31ce08f4bd7b1ca3421b0eb12cf01dbc9c 100644 (file)
--- a/recipes/glib-2.0/glib-2.0_2.16.1.bb
+++ b/recipes/glib-2.0/glib-2.0_2.16.1.bb
@@ -1,6 +1,5 @@
 require glib.inc
-
-PR = "r5"
+PR = "${INC_PR}.0"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.16/glib-${PV}.tar.bz2 \
            file://glibconfig-sysdefs.h \

diff --git a/recipes/glib-2.0/glib-2.0_2.16.3.bb b/recipes/glib-2.0/glib-2.0_2.16.3.bb
index f70539f18e42a5bd07c2a8cf06f981874be46e31..36fdc878aabba66abeddc87f666d87ac7ccf95f4 100644 (file)
--- a/recipes/glib-2.0/glib-2.0_2.16.3.bb
+++ b/recipes/glib-2.0/glib-2.0_2.16.3.bb
@@ -1,10 +1,9 @@
 require glib.inc
+PR = "${INC_PR}.0"
 
 # This version requires a newer libtool that isn't default yet 
 DEFAULT_PREFERENCE = "-1"
 
-PR = "r0"
-
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.16/glib-${PV}.tar.bz2 \
            file://glibconfig-sysdefs.h \
            file://configure-libtool.patch;patch=1 \

diff --git a/recipes/glib-2.0/glib-2.0_2.16.4.bb b/recipes/glib-2.0/glib-2.0_2.16.4.bb
index a1ce510c51d4310aa7e6c47e6aae12c3ccdfa9a4..0e4ba2d16b11cc9e659821e5762d053e514312aa 100644 (file)
--- a/recipes/glib-2.0/glib-2.0_2.16.4.bb
+++ b/recipes/glib-2.0/glib-2.0_2.16.4.bb
@@ -1,10 +1,9 @@
 require glib.inc
+PR = "${INC_PR}.0"
 
 # This version requires a newer libtool that isn't default yet 
 DEFAULT_PREFERENCE = "-1"
 
-PR = "r1"
-
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.16/glib-${PV}.tar.bz2 \
            file://glibconfig-sysdefs.h \
            file://configure-libtool.patch;patch=1 \

diff --git a/recipes/glib-2.0/glib-2.0_2.16.5.bb b/recipes/glib-2.0/glib-2.0_2.16.5.bb
index f70539f18e42a5bd07c2a8cf06f981874be46e31..36fdc878aabba66abeddc87f666d87ac7ccf95f4 100644 (file)
--- a/recipes/glib-2.0/glib-2.0_2.16.5.bb
+++ b/recipes/glib-2.0/glib-2.0_2.16.5.bb
@@ -1,10 +1,9 @@
 require glib.inc
+PR = "${INC_PR}.0"
 
 # This version requires a newer libtool that isn't default yet 
 DEFAULT_PREFERENCE = "-1"
 
-PR = "r0"
-
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.16/glib-${PV}.tar.bz2 \
            file://glibconfig-sysdefs.h \
            file://configure-libtool.patch;patch=1 \

diff --git a/recipes/glib-2.0/glib-2.0_2.18.0.bb b/recipes/glib-2.0/glib-2.0_2.18.0.bb
index 8fead8014378c59fecdad49874b4c1e5ad8e3b93..ce8bcb3aa879aeddff94ba8da0fa4e7e34da95dc 100644 (file)
--- a/recipes/glib-2.0/glib-2.0_2.18.0.bb
+++ b/recipes/glib-2.0/glib-2.0_2.18.0.bb
@@ -1,5 +1,5 @@
 require glib.inc
-PR = "r0"
+PR = "${INC_PR}.0"
 
 SRC_URI = "\
   http://ftp.gnome.org/pub/GNOME/sources/glib/2.18/glib-${PV}.tar.bz2 \

diff --git a/recipes/glib-2.0/glib-2.0_2.18.1.bb b/recipes/glib-2.0/glib-2.0_2.18.1.bb
index 449fcd376901df4643d71fcc860694fabbad846a..6243c0d326aa877110245918473cc139af9553c5 100644 (file)
--- a/recipes/glib-2.0/glib-2.0_2.18.1.bb
+++ b/recipes/glib-2.0/glib-2.0_2.18.1.bb
@@ -1,5 +1,5 @@
 require glib.inc
-PR = "r0"
+PR = "${INC_PR}.0"
 
 SRC_URI = "\
   http://ftp.gnome.org/pub/GNOME/sources/glib/2.18/glib-${PV}.tar.bz2 \

diff --git a/recipes/glib-2.0/glib-2.0_2.18.3.bb b/recipes/glib-2.0/glib-2.0_2.18.3.bb
index c8789e75d91d34d74f7ab20603ae9ceebc62a8b0..6243c0d326aa877110245918473cc139af9553c5 100644 (file)
--- a/recipes/glib-2.0/glib-2.0_2.18.3.bb
+++ b/recipes/glib-2.0/glib-2.0_2.18.3.bb
@@ -1,5 +1,5 @@
 require glib.inc
-PR = "r1"
+PR = "${INC_PR}.0"
 
 SRC_URI = "\
   http://ftp.gnome.org/pub/GNOME/sources/glib/2.18/glib-${PV}.tar.bz2 \

diff --git a/recipes/glib-2.0/glib-2.0_2.20.4.bb b/recipes/glib-2.0/glib-2.0_2.20.4.bb
index e0afd218f778b656ce220183ce9099d6b6d16038..f0cb5cd08b9dee28c225335e313751266091482d 100644 (file)
--- a/recipes/glib-2.0/glib-2.0_2.20.4.bb
+++ b/recipes/glib-2.0/glib-2.0_2.20.4.bb
@@ -1,6 +1,5 @@
 require glib.inc
-
-PR = "r0"
+PR = "${INC_PR}.0"
 
 SRC_URI = "\
   http://ftp.gnome.org/pub/GNOME/sources/glib/2.20/glib-${PV}.tar.bz2 \

diff --git a/recipes/glib-2.0/glib-2.0_2.21.4.bb b/recipes/glib-2.0/glib-2.0_2.21.4.bb
index 5402a81535996ca5889127d234514848fb46f4e5..4aac57f96d9e2e4485e910980504592000205bef 100644 (file)
--- a/recipes/glib-2.0/glib-2.0_2.21.4.bb
+++ b/recipes/glib-2.0/glib-2.0_2.21.4.bb
@@ -1,7 +1,5 @@
 require glib.inc
-
-DEFAULT_PREFERENCE = "-1"
-DEFAULT_PREFERENCE_angstrom = "1"
+PR = "${INC_PR}.0"
 
 SRC_URI = "\
   http://ftp.gnome.org/pub/GNOME/sources/glib/2.21/glib-${PV}.tar.bz2 \

diff --git a/recipes/glib-2.0/glib.inc b/recipes/glib-2.0/glib.inc
index df2bf0c8699b711dd1739dc20210a46272fe8cff..53d8d991997817c02eddd3390b09559667f99c88 100644 (file)
--- a/recipes/glib-2.0/glib.inc
+++ b/recipes/glib-2.0/glib.inc
@@ -10,7 +10,7 @@ DEPENDS += "glib-2.0-native gtk-doc"
 DEPENDS += "virtual/libiconv virtual/libintl"
 PACKAGES =+ "gobject-2.0 gmodule-2.0 gthread-2.0 gio-2.0 glib-2.0-utils "
 
-PR = "r5"
+INC_PR = "r5"
 
 LEAD_SONAME = "libglib-2.0.*"
 FILES_glib-2.0-utils = "${bindir}/*"

diff --git a/recipes/proxy-libintl/proxy-libintl_20080418.bb b/recipes/proxy-libintl/proxy-libintl_20080418.bb
index dbe7b92c7e173e87b4a2823525a6121f467c2ffd..6c625d6ba0c1d14dc005974289dafcdeaf2a576e 100644 (file)
--- a/recipes/proxy-libintl/proxy-libintl_20080418.bb
+++ b/recipes/proxy-libintl/proxy-libintl_20080418.bb
@@ -5,16 +5,18 @@ LICENSE = "LGPL"
 
 PR = "r1"
 PROVIDES = "virtual/libintl"
-
+LEAD_SONAME = "libintl.so"
 
 SRC_URI = " \
     http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/${PN}-${PV}.zip \
     file://stub-only.patch;patch=1 \
+    file://create-as-shared-lib.patch;patch=1 \
 "
 
 
 S = "${WORKDIR}"
-FILES_${PN}-dev = "${includedir} ${libdir}"
+FILES_${PN}-dev = "${includedir}"
+FILES_${PN} = "${libdir}/libintl.so"
 
 
 CFLAGS_append = " -Wall -I ../../include ${@['-DSTUB_ONLY', ''][bb.data.getVar('USE_NLS', d, 1) != 'no']}"
@@ -32,15 +34,13 @@ do_install() {
     install -d ${D}/usr/lib
     
     install -m 0644 ${WORKDIR}/include/libintl.h ${D}/${includedir}
-    install -m 0644 ${WORKDIR}/lib/libintl.a ${D}/${libdir}
+    install -m 0644 ${WORKDIR}/lib/libintl.so ${D}/${libdir}
 }
 
 
 
 do_stage() {
     install -m 0644 ${WORKDIR}/include/libintl.h ${STAGING_INCDIR}/
-    oe_libinstall -a -C lib libintl ${STAGING_LIBDIR}/
+    oe_libinstall -a -so -C lib libintl ${STAGING_LIBDIR}/
 }
 
-
-