Merge openembedded@openembedded.bkbits.net:packages

into handhelds.org:/home/kergoth/code/oe/packages

2004/09/18 07:36:04-04:00 handhelds.org!kergoth
uclibc:
  * Enhance packaging to match up more with the glibc packaging.
  * Remove staging_incdir from CFLAGS passed into the builds.
  * Apply patch to make ldconfig dynamic, not static.

BKrev: 414c1dd7No2MdGlY14ct9FwIEBg0qw

4 files changed, 40 insertions, 0 deletions

diff --git a/uclibc/uclibc-0.9.26/dyn-ldconfig.patch b/uclibc/uclibc-0.9.26/dyn-ldconfig.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/uclibc/uclibc-0.9.26/dyn-ldconfig.patch
diff --git a/uclibc/uclibc-cvs/dyn-ldconfig.patch b/uclibc/uclibc-cvs/dyn-ldconfig.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/uclibc/uclibc-cvs/dyn-ldconfig.patch
diff --git a/uclibc/uclibc_0.9.26.oe b/uclibc/uclibc_0.9.26.oe
index 71231aff58..46370c4b32 100644
--- a/uclibc/uclibc_0.9.26.oe
+++ b/uclibc/uclibc_0.9.26.oe
@@ -26,6 +26,24 @@ DEPENDS = "patcher-native virtual/${TARGET_PREFIX}binutils \
 	   virtual/${TARGET_PREFIX}gcc-initial linux-libc-headers"
 INHIBIT_DEFAULT_DEPS = "1"
 
+PACKAGES = "uclibc ldd uclibc-utils uclibc-gconv uclibc-dev uclibc-doc uclibc-thread-db"
+
+uclibc_baselibs = "/lib/libcrypt*.so* /lib/libdl*.so \
+		   /lib/libintl*.so* /lib/libm*.so \
+		   /lib/libnsl*.so* /lib/libpthread*.so \
+		   /lib/libresolv*.so* /lib/libutil*.so \
+		   /lib/libuClibc*.so* /lib/ld*.so* \
+		   /lib/libc*.so* /lib/libdl*.so* \
+		   /lib/libm*.so* /lib/libutil*.so* \
+		   /lib/libpthread*.so*"
+FILES_${PN} = "${sysconfdir} ${uclibc_baselibs} /sbin/ldconfig \
+	       ${libexecdir} ${datadir}/zoneinfo ${libdir}/locale"
+FILES_ldd = "${bindir}/ldd"
+FILES_uclibc-dev += "${libdir}/*.o"
+FILES_uclibc-utils = "${bindir} ${sbindir}"
+FILES_uclibc-gconv = "${libdir}/gconv"
+FILES_uclibc-thread-db = "/lib/libthread_db*"
+
 #
 # This locale file gets copied into uClibc-${PV}/extra/locale/ prior to
 # build, it does not need to be unpacked, but we can't inhibit the unpacking
@@ -40,6 +58,7 @@ SRC_URI = "http://www.uclibc.org/downloads/uClibc-${PV}.tar.bz2 \
 	   ${UCLIBC_LOCALE_URI} \
            file://26headers.patch;patch=1 \
            file://nokernelheadercheck.patch;patch=1 \
+	   file://dyn-ldconfig.patch;patch=1 \
            file://uClibc.config"
 
 S = "${WORKDIR}/uClibc-${PV}"
@@ -54,6 +73,7 @@ configmangle = 's,^KERNEL_SOURCE=.*,KERNEL_SOURCE="${CROSS_DIR}/${TARGET_SYS}/in
 		s,^DEVEL_PREFIX=.*,DEVEL_PREFIX="/${prefix}",g; \
 		s,^SHARED_LIB_LOADER_PATH=.*,SHARED_LIB_LOADER_PATH="/lib",; \
 		s,.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=y\nUCLIBC_HAS_LOCALE=n,g;'
+CFLAGS := "${@oe_filter_out('-I\S+', '${CFLAGS}', d)}"
 
 python () {
 	if oe.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
diff --git a/uclibc/uclibc_cvs.oe b/uclibc/uclibc_cvs.oe
index 8eb15dcc03..45ee7358a2 100644
--- a/uclibc/uclibc_cvs.oe
+++ b/uclibc/uclibc_cvs.oe
@@ -30,6 +30,24 @@ INHIBIT_DEFAULT_DEPS = "1"
 
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-cvs', '${FILE_DIRNAME}/uclibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 
+PACKAGES = "uclibc ldd uclibc-utils uclibc-gconv uclibc-dev uclibc-doc uclibc-thread-db"
+
+uclibc_baselibs = "/lib/libcrypt*.so* /lib/libdl*.so \
+		   /lib/libintl*.so* /lib/libm*.so \
+		   /lib/libnsl*.so* /lib/libpthread*.so \
+		   /lib/libresolv*.so* /lib/libutil*.so \
+		   /lib/libuClibc*.so* /lib/ld*.so* \
+		   /lib/libc*.so* /lib/libdl*.so* \
+		   /lib/libm*.so* /lib/libutil*.so* \
+		   /lib/libpthread*.so*"
+FILES_${PN} = "${sysconfdir} ${uclibc_baselibs} /sbin/ldconfig \
+	       ${libexecdir} ${datadir}/zoneinfo ${libdir}/locale"
+FILES_ldd = "${bindir}/ldd"
+FILES_uclibc-dev += "${libdir}/*.o"
+FILES_uclibc-utils = "${bindir} ${sbindir}"
+FILES_uclibc-gconv = "${libdir}/gconv"
+FILES_uclibc-thread-db = "/lib/libthread_db*"
+
 #
 # This locale file gets copied into uClibc-${PV}/extra/locale/ prior to
 # build, it does not need to be unpacked, but we can't inhibit the unpacking
@@ -43,6 +61,7 @@ UCLIBC_LOCALE_URI_arm = "http://openembedded.org/dl/uclibc-locale/${UCLIBC_LOCAL
 SRC_URI = "cvs://anonymous:@uclibc.org/var/cvs;module=uClibc \
 	   ${UCLIBC_LOCALE_URI} \
            file://nokernelheadercheck.patch;patch=1 \
+	   file://dyn-ldconfig.patch;patch=1 \
            file://uClibc.config"
 
 S = "${WORKDIR}/uClibc"
@@ -57,6 +76,7 @@ configmangle = 's,^KERNEL_SOURCE=.*,KERNEL_SOURCE="${CROSS_DIR}/${TARGET_SYS}/in
 		s,^DEVEL_PREFIX=.*,DEVEL_PREFIX="/${prefix}",g; \
 		s,^SHARED_LIB_LOADER_PATH=.*,SHARED_LIB_LOADER_PATH="/lib",; \
 		s,.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=y\nUCLIBC_HAS_LOCALE=n,g;'
+CFLAGS := "${@oe_filter_out('-I\S+', '${CFLAGS}', d)}"
 
 python () {
 	if oe.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]: