glibc-initial: Factor common code into a .inc file

diff --git a/packages/glibc/glibc-initial.inc b/packages/glibc/glibc-initial.inc
new file mode 100644 (file)
index 0000000..9355320
--- /dev/null
+++ b/packages/glibc/glibc-initial.inc
@@ -0,0 +1,45 @@
+SECTION = "libs"
+DEPENDS = "linux-libc-headers"
+PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
+FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-2.4', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
+
+PACKAGES = ""
+PACKAGES_DYNAMIC = ""
+
+do_configure () {
+       sed -ie 's,{ (exit 1); exit 1; }; },{ (exit 0); }; },g' ${S}/configure
+       chmod +x ${S}/configure
+       CC="${BUILD_CC}" CPP="${BUILD_CPP}" LD="${BUILD_LD}" ${S}/configure --host=${TARGET_SYS} --build=${BUILD_SYS} \
+               --without-cvs --disable-sanity-checks \
+               --with-headers=${CROSS_DIR}/${TARGET_SYS}/include \
+               --enable-hacker-mode
+       if grep -q GLIBC_2.3 ${S}/ChangeLog; then
+               # glibc-2.3.x passes cross options to $(CC) when generating errlist-compat.c, which fails without a real cross-compiler.
+               # Fortunately, we don't need errlist-compat.c, since we just need .h files,
+               # so work around this by creating a fake errlist-compat.c and satisfying its dependencies.
+               # Another workaround might be to tell configure to not use any cross options to $(CC).
+               # The real fix would be to get install-headers to not generate errlist-compat.c.
+               make sysdeps/gnu/errlist.c
+               mkdir -p stdio-common
+               touch stdio-common/errlist-compat.c
+       fi
+}
+
+do_compile () {
+       :
+}
+
+do_stage () {
+       oe_runmake cross-compiling=yes install_root=${STAGING_DIR}/${HOST_SYS} includedir=/include prefix="" install-headers
+
+       # Two headers -- stubs.h and features.h -- aren't installed by install-headers,
+       # so do them by hand.  We can tolerate an empty stubs.h for the moment.
+       # See e.g. http://gcc.gnu.org/ml/gcc/2002-01/msg00900.html
+       mkdir -p ${STAGING_DIR}/${HOST_SYS}/include/gnu
+       touch ${STAGING_DIR}/${HOST_SYS}/include/gnu/stubs.h
+       cp ${S}/include/features.h ${STAGING_DIR}/${HOST_SYS}/include/features.h
+}
+
+do_install () {
+       :
+}

diff --git a/packages/glibc/glibc-initial_2.2.5.bb b/packages/glibc/glibc-initial_2.2.5.bb
index 1510433..84412bd 100644 (file)
--- a/packages/glibc/glibc-initial_2.2.5.bb
+++ b/packages/glibc/glibc-initial_2.2.5.bb
@@ -1,49 +1,5 @@
-SECTION = "libs"
 require glibc_${PV}.bb
+require glibc-initial.inc
 
 DEFAULT_PREFERENCE_sh3 = "-99"
-
-DEPENDS = "linux-libc-headers"
-PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-${PV}', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
-
-PACKAGES = ""
-PACKAGES_DYANMIC = ""
-
-do_configure () {
-       sed -ie 's,{ (exit 1); exit 1; }; },{ (exit 0); }; },g' ${S}/configure
-       chmod +x ${S}/configure
-       CC="${BUILD_CC}" CPP="${BUILD_CPP}" LD="${BUILD_LD}" ${S}/configure --host=${TARGET_SYS} --build=${BUILD_SYS} \
-               --without-cvs --disable-sanity-checks \
-               --with-headers=${CROSS_DIR}/${TARGET_SYS}/include \
-               --enable-hacker-mode
-       if grep -q GLIBC_2.3 ${S}/ChangeLog; then
-               # glibc-2.3.x passes cross options to $(CC) when generating errlist-compat.c, which fails without a real cross-compiler.
-               # Fortunately, we don't need errlist-compat.c, since we just need .h files,
-               # so work around this by creating a fake errlist-compat.c and satisfying its dependencies.
-               # Another workaround might be to tell configure to not use any cross options to $(CC).
-               # The real fix would be to get install-headers to not generate errlist-compat.c.
-               make sysdeps/gnu/errlist.c
-               mkdir -p stdio-common
-               touch stdio-common/errlist-compat.c
-       fi
-}
-
-do_compile () {
-       :
-}
-
-do_stage () {
-       oe_runmake cross-compiling=yes install_root=${STAGING_DIR}/${HOST_SYS} includedir=/include prefix="" install-headers
-
-       # Two headers -- stubs.h and features.h -- aren't installed by install-headers,
-       # so do them by hand.  We can tolerate an empty stubs.h for the moment.
-       # See e.g. http://gcc.gnu.org/ml/gcc/2002-01/msg00900.html
-       mkdir -p ${STAGING_DIR}/${HOST_SYS}/include/gnu
-       touch ${STAGING_DIR}/${HOST_SYS}/include/gnu/stubs.h
-       cp ${S}/include/features.h ${STAGING_DIR}/${HOST_SYS}/include/features.h
-}
-
-do_install () {
-       :
-}

diff --git a/packages/glibc/glibc-initial_2.3.2+cvs20040726.bb b/packages/glibc/glibc-initial_2.3.2+cvs20040726.bb
index aed639b..4d7129b 100644 (file)
--- a/packages/glibc/glibc-initial_2.3.2+cvs20040726.bb
+++ b/packages/glibc/glibc-initial_2.3.2+cvs20040726.bb
@@ -1,48 +1,5 @@
-SECTION = "libs"
 require glibc_${PV}.bb
-DEFAULT_PREFERENCE_sh3 = "-99"
+require glibc-initial.inc
 
-DEPENDS = "linux-libc-headers"
-PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
+DEFAULT_PREFERENCE_sh3 = "-99"
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-cvs', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
-
-PACKAGES = ""
-PACKAGES_DYANMIC = ""
-
-do_configure () {
-       sed -ie 's,{ (exit 1); exit 1; }; },{ (exit 0); }; },g' ${S}/configure
-       chmod +x ${S}/configure
-       CC="${BUILD_CC}" CPP="${BUILD_CPP}" LD="${BUILD_LD}" ${S}/configure --host=${TARGET_SYS} --build=${BUILD_SYS} \
-               --without-cvs --disable-sanity-checks \
-               --with-headers=${CROSS_DIR}/${TARGET_SYS}/include \
-               --enable-hacker-mode
-       if grep -q GLIBC_2.3 ${S}/ChangeLog; then
-               # glibc-2.3.x passes cross options to $(CC) when generating errlist-compat.c, which fails without a real cross-compiler.
-               # Fortunately, we don't need errlist-compat.c, since we just need .h files,
-               # so work around this by creating a fake errlist-compat.c and satisfying its dependencies.
-               # Another workaround might be to tell configure to not use any cross options to $(CC).
-               # The real fix would be to get install-headers to not generate errlist-compat.c.
-               make sysdeps/gnu/errlist.c
-               mkdir -p stdio-common
-               touch stdio-common/errlist-compat.c
-       fi
-}
-
-do_compile () {
-       :
-}
-
-do_stage () {
-       oe_runmake cross-compiling=yes install_root=${STAGING_DIR}/${HOST_SYS} includedir=/include prefix="" install-headers
-
-       # Two headers -- stubs.h and features.h -- aren't installed by install-headers,
-       # so do them by hand.  We can tolerate an empty stubs.h for the moment.
-       # See e.g. http://gcc.gnu.org/ml/gcc/2002-01/msg00900.html
-       mkdir -p ${STAGING_DIR}/${HOST_SYS}/include/gnu
-       touch ${STAGING_DIR}/${HOST_SYS}/include/gnu/stubs.h
-       cp ${S}/include/features.h ${STAGING_DIR}/${HOST_SYS}/include/features.h
-}
-
-do_install () {
-       :
-}

diff --git a/packages/glibc/glibc-initial_2.3.2.bb b/packages/glibc/glibc-initial_2.3.2.bb
index c7647f4..84412bd 100644 (file)
--- a/packages/glibc/glibc-initial_2.3.2.bb
+++ b/packages/glibc/glibc-initial_2.3.2.bb
@@ -1,48 +1,5 @@
-SECTION = "libs"
 require glibc_${PV}.bb
-DEFAULT_PREFERENCE_sh3 = "-99"
+require glibc-initial.inc
 
-DEPENDS = "linux-libc-headers"
-PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
+DEFAULT_PREFERENCE_sh3 = "-99"
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-${PV}', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
-
-PACKAGES = ""
-PACKAGES_DYNAMIC = ""
-
-do_configure () {
-       sed -ie 's,{ (exit 1); exit 1; }; },{ (exit 0); }; },g' ${S}/configure
-       chmod +x ${S}/configure
-       CC="${BUILD_CC}" CPP="${BUILD_CPP}" LD="${BUILD_LD}" ${S}/configure --host=${TARGET_SYS} --build=${BUILD_SYS} \
-               --without-cvs --disable-sanity-checks \
-               --with-headers=${CROSS_DIR}/${TARGET_SYS}/include \
-               --enable-hacker-mode
-       if grep -q GLIBC_2.3 ${S}/ChangeLog; then
-               # glibc-2.3.x passes cross options to $(CC) when generating errlist-compat.c, which fails without a real cross-compiler.
-               # Fortunately, we don't need errlist-compat.c, since we just need .h files,
-               # so work around this by creating a fake errlist-compat.c and satisfying its dependencies.
-               # Another workaround might be to tell configure to not use any cross options to $(CC).
-               # The real fix would be to get install-headers to not generate errlist-compat.c.
-               make sysdeps/gnu/errlist.c
-               mkdir -p stdio-common
-               touch stdio-common/errlist-compat.c
-       fi
-}
-
-do_compile () {
-       :
-}
-
-do_stage () {
-       oe_runmake cross-compiling=yes install_root=${STAGING_DIR}/${HOST_SYS} includedir=/include prefix="" install-headers
-
-       # Two headers -- stubs.h and features.h -- aren't installed by install-headers,
-       # so do them by hand.  We can tolerate an empty stubs.h for the moment.
-       # See e.g. http://gcc.gnu.org/ml/gcc/2002-01/msg00900.html
-       mkdir -p ${STAGING_DIR}/${HOST_SYS}/include/gnu
-       touch ${STAGING_DIR}/${HOST_SYS}/include/gnu/stubs.h
-       cp ${S}/include/features.h ${STAGING_DIR}/${HOST_SYS}/include/features.h
-}
-
-do_install () {
-       :
-}

diff --git a/packages/glibc/glibc-initial_2.4.bb b/packages/glibc/glibc-initial_2.4.bb
index 173d550..fa7836a 100644 (file)
--- a/packages/glibc/glibc-initial_2.4.bb
+++ b/packages/glibc/glibc-initial_2.4.bb
@@ -1,47 +1,2 @@
-SECTION = "libs"
 require glibc_${PV}.bb
-
-DEPENDS = "linux-libc-headers"
-PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-2.4', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
-
-PACKAGES = ""
-PACKAGES_DYNAMIC = ""
-
-do_configure () {
-       sed -ie 's,{ (exit 1); exit 1; }; },{ (exit 0); }; },g' ${S}/configure
-       chmod +x ${S}/configure
-       CC="${BUILD_CC}" CPP="${BUILD_CPP}" LD="${BUILD_LD}" ${S}/configure --host=${TARGET_SYS} --build=${BUILD_SYS} \
-               --without-cvs --disable-sanity-checks \
-               --with-headers=${CROSS_DIR}/${TARGET_SYS}/include \
-               --enable-hacker-mode
-       if grep -q GLIBC_2.3 ${S}/ChangeLog; then
-               # glibc-2.3.x passes cross options to $(CC) when generating errlist-compat.c, which fails without a real cross-compiler.
-               # Fortunately, we don't need errlist-compat.c, since we just need .h files,
-               # so work around this by creating a fake errlist-compat.c and satisfying its dependencies.
-               # Another workaround might be to tell configure to not use any cross options to $(CC).
-               # The real fix would be to get install-headers to not generate errlist-compat.c.
-               make sysdeps/gnu/errlist.c
-               mkdir -p stdio-common
-               touch stdio-common/errlist-compat.c
-       fi
-}
-
-do_compile () {
-       :
-}
-
-do_stage () {
-       oe_runmake cross-compiling=yes install_root=${STAGING_DIR}/${HOST_SYS} includedir=/include prefix="" install-headers
-
-       # Two headers -- stubs.h and features.h -- aren't installed by install-headers,
-       # so do them by hand.  We can tolerate an empty stubs.h for the moment.
-       # See e.g. http://gcc.gnu.org/ml/gcc/2002-01/msg00900.html
-       mkdir -p ${STAGING_DIR}/${HOST_SYS}/include/gnu
-       touch ${STAGING_DIR}/${HOST_SYS}/include/gnu/stubs.h
-       cp ${S}/include/features.h  ${STAGING_DIR}/${HOST_SYS}/include/features.h
-}
-
-do_install () {
-       :
-}
+require glibc-initial.inc

diff --git a/packages/glibc/glibc-initial_2.5.bb b/packages/glibc/glibc-initial_2.5.bb
index f05c960..1e41d21 100644 (file)
--- a/packages/glibc/glibc-initial_2.5.bb
+++ b/packages/glibc/glibc-initial_2.5.bb
@@ -1,11 +1,5 @@
 require glibc_${PV}.bb
-
-DEPENDS = "linux-libc-headers"
-PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-2.4', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
-
-PACKAGES = ""
-PACKAGES_DYNAMIC = ""
+require glibc-initial.inc
 
 do_configure () {
        sed -ie 's,{ (exit 1); exit 1; }; },{ (exit 0); }; },g' ${S}/configure
@@ -26,22 +20,3 @@ do_configure () {
                touch stdio-common/errlist-compat.c
        fi
 }
-
-do_compile () {
-       :
-}
-
-do_stage () {
-       oe_runmake cross-compiling=yes install_root=${STAGING_DIR}/${HOST_SYS} includedir=/include prefix="" install-headers
-
-       # Two headers -- stubs.h and features.h -- aren't installed by install-headers,
-       # so do them by hand.  We can tolerate an empty stubs.h for the moment.
-       # See e.g. http://gcc.gnu.org/ml/gcc/2002-01/msg00900.html
-       mkdir -p ${STAGING_DIR}/${HOST_SYS}/include/gnu
-       touch ${STAGING_DIR}/${HOST_SYS}/include/gnu/stubs.h
-       cp ${S}/include/features.h ${STAGING_DIR}/${HOST_SYS}/include/features.h
-}
-
-do_install () {
-       :
-}

diff --git a/packages/glibc/glibc-initial_2.6.1.bb b/packages/glibc/glibc-initial_2.6.1.bb
index 428a4a3..3ad9656 100644 (file)
--- a/packages/glibc/glibc-initial_2.6.1.bb
+++ b/packages/glibc/glibc-initial_2.6.1.bb
@@ -1,47 +1,6 @@
 require glibc_${PV}.bb
+require glibc-initial.inc
 
-DEPENDS = "linux-libc-headers"
-PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-2.4', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
-
-PACKAGES = ""
-PACKAGES_DYANMIC = ""
-
-do_configure () {
-       sed -ie 's,{ (exit 1); exit 1; }; },{ (exit 0); }; },g' ${S}/configure
-       chmod +x ${S}/configure
+do_configure_prepend () {
        unset CFLAGS
-       CC="${BUILD_CC}" CPP="${BUILD_CPP}" LD="${BUILD_LD}" ${S}/configure --host=${TARGET_SYS} --build=${BUILD_SYS} \
-               --without-cvs --disable-sanity-checks \
-               --with-headers=${CROSS_DIR}/${TARGET_SYS}/include \
-               --enable-hacker-mode
-       if grep -q GLIBC_2.3 ${S}/ChangeLog; then
-               # glibc-2.3.x passes cross options to $(CC) when generating errlist-compat.c, which fails without a real cross-compiler.
-               # Fortunately, we don't need errlist-compat.c, since we just need .h files,
-               # so work around this by creating a fake errlist-compat.c and satisfying its dependencies.
-               # Another workaround might be to tell configure to not use any cross options to $(CC).
-               # The real fix would be to get install-headers to not generate errlist-compat.c.
-               make sysdeps/gnu/errlist.c
-               mkdir -p stdio-common
-               touch stdio-common/errlist-compat.c
-       fi
-}
-
-do_compile () {
-       :
-}
-
-do_stage () {
-       oe_runmake cross-compiling=yes install_root=${STAGING_DIR}/${HOST_SYS} includedir=/include prefix="" install-headers
-
-       # Two headers -- stubs.h and features.h -- aren't installed by install-headers,
-       # so do them by hand.  We can tolerate an empty stubs.h for the moment.
-       # See e.g. http://gcc.gnu.org/ml/gcc/2002-01/msg00900.html
-       mkdir -p ${STAGING_DIR}/${HOST_SYS}/include/gnu
-       touch ${STAGING_DIR}/${HOST_SYS}/include/gnu/stubs.h
-       cp ${S}/include/features.h ${STAGING_DIR}/${HOST_SYS}/include/features.h
-}
-
-do_install () {
-       :
-}
+}
\ No newline at end of file

diff --git a/packages/glibc/glibc-initial_cvs.bb b/packages/glibc/glibc-initial_cvs.bb
index 47e2ef8..81be5fc 100644 (file)
--- a/packages/glibc/glibc-initial_cvs.bb
+++ b/packages/glibc/glibc-initial_cvs.bb
@@ -1,47 +1,4 @@
-SECTION = "libs"
 require glibc_${PV}.bb
+require glibc-initial.inc
 
-DEPENDS = "linux-libc-headers"
-PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-cvs', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
-
-PACKAGES = ""
-PACKAGES_DYNAMIC = ""
-
-do_configure () {
-       sed -ie 's,{ (exit 1); exit 1; }; },{ (exit 0); }; },g' ${S}/configure
-       chmod +x ${S}/configure
-       CC="${BUILD_CC}" CPP="${BUILD_CPP}" LD="${BUILD_LD}" ${S}/configure --host=${TARGET_SYS} --build=${BUILD_SYS} \
-               --without-cvs --disable-sanity-checks \
-               --with-headers=${CROSS_DIR}/${TARGET_SYS}/include \
-               --enable-hacker-mode
-       if grep -q GLIBC_2.3 ${S}/ChangeLog; then
-               # glibc-2.3.x passes cross options to $(CC) when generating errlist-compat.c, which fails without a real cross-compiler.
-               # Fortunately, we don't need errlist-compat.c, since we just need .h files,
-               # so work around this by creating a fake errlist-compat.c and satisfying its dependencies.
-               # Another workaround might be to tell configure to not use any cross options to $(CC).
-               # The real fix would be to get install-headers to not generate errlist-compat.c.
-               make sysdeps/gnu/errlist.c
-               mkdir -p stdio-common
-               touch stdio-common/errlist-compat.c
-       fi
-}
-
-do_compile () {
-       :
-}
-
-do_stage () {
-       oe_runmake cross-compiling=yes install_root=${STAGING_DIR}/${HOST_SYS} includedir=/include prefix="" install-headers
-
-       # Two headers -- stubs.h and features.h -- aren't installed by install-headers,
-       # so do them by hand.  We can tolerate an empty stubs.h for the moment.
-       # See e.g. http://gcc.gnu.org/ml/gcc/2002-01/msg00900.html
-       mkdir -p ${STAGING_DIR}/${HOST_SYS}/include/gnu
-       touch ${STAGING_DIR}/${HOST_SYS}/include/gnu/stubs.h
-       cp ${S}/include/features.h ${STAGING_DIR}/${HOST_SYS}/include/features.h
-}
-
-do_install () {
-       :
-}