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 4d8e59b..acd1927 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 4d8e59b..31a1d53 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 2e52590..31a1d53 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 2e52590..e543b83 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 4d8e59b..31a1d53 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 4d8e59b..31a1d53 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 e4318cd..37117b2 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 e4318cd..37117b2 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 e4318cd..37117b2 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 525a9d2..4fcbf67 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 db388d7..7e2ddd3 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 f70539f..36fdc87 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 a1ce510..0e4ba2d 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 f70539f..36fdc87 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 8fead80..ce8bcb3 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 449fcd3..6243c0d 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 c8789e7..6243c0d 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 e0afd21..f0cb5cd 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 5402a81..4aac57f 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 df2bf0c..53d8d99 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 dbe7b92..6c625d6 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}/
 }
 
-
-