gettext: move to BBCLASSEXTEND, taken from popky

* delete all native recipes now handled by BBCLASSEXTEND
* bump PR's

diff --git a/recipes/gettext/gettext-native_0.14.1.bb b/recipes/gettext/gettext-native_0.14.1.bb
deleted file mode 100644 (file)
index fed847b..0000000
--- a/recipes/gettext/gettext-native_0.14.1.bb
+++ /dev/null
@@ -1,62 +0,0 @@
-require gettext_${PV}.bb
-PR = "r1"
-
-S = "${WORKDIR}/gettext-${PV}"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gettext-${PV}"
-inherit native
-DEPENDS = ""
-PROVIDES = ""
-
-M4_FILES = "\
-lib-ld.m4 \
-lib-link.m4 \
-lib-prefix.m4 \
-codeset.m4 \
-gettext.m4 \
-glibc21.m4 \
-iconv.m4 \
-intdiv0.m4 \
-intmax.m4 \
-inttypes.m4 \
-inttypes_h.m4 \
-inttypes-pri.m4 \
-isc-posix.m4 \
-lcmessage.m4 \
-longdouble.m4 \
-longlong.m4 \
-nls.m4 \
-po.m4 \
-printf-posix.m4 \
-progtest.m4 \
-signed.m4 \
-size_max.m4 \
-stdint_h.m4 \
-uintmax_t.m4 \
-ulonglong.m4 \
-wchar_t.m4 \
-wint_t.m4 \
-xsize.m4 \
-"
-
-do_stage_append() {
-       for i in ${M4_FILES}; do
-               src="gettext-runtime/m4/$i"
-               if [ ! -f $src ]; then
-                       src="gettext-tools/m4/$i"
-               fi
-               if [ ! -f $src ]; then
-                       src="autoconf-lib-link/m4/$i"
-               fi
-               if [ ! -f $src ]; then
-                       echo "can't find $i" >&2
-                       exit 1
-               fi
-               install -m 0644 $src ${STAGING_DATADIR}/aclocal/$i
-       done
-       # config.rpath is needed by some configure macros and needs to be autoinstalled.
-       # automake will do this but config.rpath needs to be visible to automake
-       for i in `ls -d ${STAGING_DATADIR}/automake*`
-       do
-               cp ${STAGING_DATADIR}/gettext/config.rpath $i
-       done
-}

diff --git a/recipes/gettext/gettext-native_0.17.bb b/recipes/gettext/gettext-native_0.17.bb
deleted file mode 100644 (file)
index d2de0bc..0000000
--- a/recipes/gettext/gettext-native_0.17.bb
+++ /dev/null
@@ -1,67 +0,0 @@
-require gettext_${PV}.bb
-PR = "r4"
-
-DEPENDS = ""
-PROVIDES = ""
-
-inherit native
-
-S = "${WORKDIR}/gettext-${PV}"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gettext-${PV}"
-
-M4_FILES = "\
-ansi-c++.m4 \
-codeset.m4 \
-gettext.m4 \
-glibc21.m4 \
-glibc2.m4 \
-iconv.m4 \
-intdiv0.m4 \
-intldir.m4 \
-intl.m4 \
-intlmacosx.m4 \
-intmax.m4 \
-inttypes_h.m4 \
-inttypes-pri.m4 \
-lcmessage.m4 \
-lock.m4 \
-longlong.m4 \
-nls.m4 \
-po.m4 \
-printf-posix.m4 \
-progtest.m4 \
-size_max.m4 \
-stdint_h.m4 \
-uintmax_t.m4 \
-visibility.m4 \
-wchar_t.m4 \
-wint_t.m4 \
-xsize.m4 \
-lib-ld.m4 \
-lib-link.m4 \
-lib-prefix.m4 \
-"
-
-do_stage_append() {
-       for i in ${M4_FILES}; do
-               src="gettext-runtime/m4/$i"
-               if [ ! -f $src ]; then
-                       src="gettext-tools/m4/$i"
-               fi
-               if [ ! -f $src ]; then
-                       src="autoconf-lib-link/m4/$i"
-               fi
-               if [ ! -f $src ]; then
-                       echo "can't find $i" >&2
-                       exit 1
-               fi
-               install -m 0644 $src ${STAGING_DATADIR}/aclocal/$i
-       done
-
-       # config.rpath is needed by some configure macros and needs to be autoinstalled.
-        # automake will do this but config.rpath needs to be visible to automake
-        for i in `ls -d ${STAGING_DATADIR}/automake*`
-        do
-                cp ${STAGING_DATADIR}/gettext/config.rpath $i
-        done
-}

diff --git a/recipes/gettext/gettext_0.14.1.bb b/recipes/gettext/gettext_0.14.1.bb
index b383525..77ec7b9 100644 (file)
--- a/recipes/gettext/gettext_0.14.1.bb
+++ b/recipes/gettext/gettext_0.14.1.bb
@@ -2,9 +2,11 @@ DESCRIPTION = "The GNU internationalization library."
 HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html"
 SECTION = "libs"
 LICENSE = "GPL"
-PR = "r10"
+PR = "r11"
 DEPENDS = "virtual/libiconv"
+DEPENDS_virtclass-native = ""
 PROVIDES = "virtual/libintl"
+PROVIDES_virtclass-native = ""
 
 SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
           file://gettext-vpath.patch;patch=1;pnum=1 \
@@ -28,7 +30,6 @@ acpaths = '-I ${S}/autoconf-lib-link/m4/ \
 
 do_configure_prepend() {
        rm -f ${S}/config/m4/libtool.m4
-       install -m 0644 ${STAGING_DATADIR}/aclocal/libtool.m4 ${S}/config/m4/
 }
 
 # these lack the .x behind the .so, but shouldn't be in the -dev package
@@ -45,6 +46,3 @@ PACKAGES =+ "libgettextlib libgettextsrc"
 FILES_libgettextlib = "${libdir}/libgettextlib-*.so*"
 FILES_libgettextsrc = "${libdir}/libgettextsrc-*.so*"
 
-do_stage () {
-       autotools_stage_all
-}

diff --git a/recipes/gettext/gettext_0.17.bb b/recipes/gettext/gettext_0.17.bb
index 9f9f695..2f8429c 100644 (file)
--- a/recipes/gettext/gettext_0.17.bb
+++ b/recipes/gettext/gettext_0.17.bb
@@ -2,9 +2,12 @@ DESCRIPTION = "The GNU internationalization library."
 HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html"
 SECTION = "libs"
 LICENSE = "GPLv3"
-PR = "r3"
+PR = "r4"
 DEPENDS = "gettext-native virtual/libiconv ncurses expat"
+DEPENDS_virtclass-native = ""
 PROVIDES = "virtual/libintl"
+PROVIDES_virtclass-native = ""
+
 
 SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
           file://autotools.patch;patch=1 \
@@ -49,6 +52,5 @@ PACKAGES =+ "libgettextlib libgettextsrc"
 FILES_libgettextlib = "${libdir}/libgettextlib-*.so*"
 FILES_libgettextsrc = "${libdir}/libgettextsrc-*.so*"
 
-do_stage () {
-       autotools_stage_all
-}
+BBCLASSEXTEND = "native nativesdk"
+