Merge openembedded@openembedded.bkbits.net:packages

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

2004/09/07 16:47:03-05:00 handhelds.org!kergoth
Apply arm textrel patch to recent binutils, which fixes the ARM+uclibc ld.so problems.

BKrev: 413e2eb1M0ZJxspK0n14XF2YOUG5jQ

6 files changed, 118 insertions, 2 deletions

diff --git a/binutils/binutils-2.14.90.0.7/600-arm-textrel.patch b/binutils/binutils-2.14.90.0.7/600-arm-textrel.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/binutils/binutils-2.14.90.0.7/600-arm-textrel.patch
diff --git a/binutils/binutils-2.15.90.0.3/600-arm-textrel.patch b/binutils/binutils-2.15.90.0.3/600-arm-textrel.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/binutils/binutils-2.15.90.0.3/600-arm-textrel.patch
diff --git a/binutils/binutils-2.15.91.0.1/600-arm-textrel.patch b/binutils/binutils-2.15.91.0.1/600-arm-textrel.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/binutils/binutils-2.15.91.0.1/600-arm-textrel.patch
diff --git a/binutils/binutils_2.14.90.0.7.oe b/binutils/binutils_2.14.90.0.7.oe
index 88ad697273..bbfca3a5f7 100644
--- a/binutils/binutils_2.14.90.0.7.oe
+++ b/binutils/binutils_2.14.90.0.7.oe
@@ -3,6 +3,7 @@ inherit autotools
 DESCRIPTION = "A GNU collection of binary utilities"
 LICENSE = "GPL"
 MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
+PR = "r1"
 
 PACKAGES = "${PN} ${PN}-dev ${PN}-doc ${PN}-symlinks"
 
@@ -41,7 +42,8 @@ SRC_URI = \
      file://binutils-uclibc-210-cflags.patch;patch=1 \
      file://binutils-006_better_file_error.patch;patch=1 \
      file://binutils-100_cflags_for_build.patch;patch=1 \
-     file://plt32trunc.patch;patch=1"
+     file://plt32trunc.patch;patch=1 \
+     file://600-arm-textrel.patch;patch=1"
 
 S = "${WORKDIR}/binutils-${PV}"
 B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
diff --git a/binutils/binutils_2.15.90.0.3.oe b/binutils/binutils_2.15.90.0.3.oe
index d75da80127..d99927c8a9 100644
--- a/binutils/binutils_2.15.90.0.3.oe
+++ b/binutils/binutils_2.15.90.0.3.oe
@@ -3,6 +3,7 @@ inherit autotools
 DESCRIPTION = "A GNU collection of binary utilities"
 LICENSE = "GPL"
 MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
+PR = "r1"
 
 PACKAGES = "${PN} ${PN}-dev ${PN}-doc ${PN}-symlinks"
 
@@ -41,7 +42,8 @@ SRC_URI = \
      file://binutils-100_cflags_for_build.patch;patch=1 \
      file://binutils-2.15.90.0.3-uclibc-100-conf.patch;patch=1 \
      file://binutils-2.15.90.0.3-uclibc-200-build_modules.patch;patch=1 \
-     file://plt32trunc.patch;patch=1"
+     file://plt32trunc.patch;patch=1 \
+     file://600-arm-textrel.patch;patch=1"
 
 S = "${WORKDIR}/binutils-${PV}"
 B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
diff --git a/binutils/binutils_2.15.91.0.1.oe b/binutils/binutils_2.15.91.0.1.oe
index e69de29bb2..dcf99edf79 100644
--- a/binutils/binutils_2.15.91.0.1.oe
+++ b/binutils/binutils_2.15.91.0.1.oe
@@ -0,0 +1,112 @@
+inherit autotools
+
+DESCRIPTION = "A GNU collection of binary utilities"
+LICENSE = "GPL"
+MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
+PR = "r1"
+
+PACKAGES = "${PN} ${PN}-dev ${PN}-doc ${PN}-symlinks"
+
+FILES_${PN} = " \
+	${bindir}/${TARGET_PREFIX}* \
+	${libdir}/lib*-*.so"
+
+FILES_${PN}-dev = " \
+	${includedir} \
+	${libdir}/*.a \
+	${libdir}/*.la \
+	${libdir}/libbfd.so \
+	${libdir}/libopcodes.so"
+
+FILES_${PN}-symlinks = " \
+	${bindir}/addr2line \
+	${bindir}/ar \
+	${bindir}/as \
+	${bindir}/c++filt \
+	${bindir}/gprof \
+	${bindir}/ld \
+	${bindir}/nm \
+	${bindir}/objcopy \
+	${bindir}/objdump \
+	${bindir}/ranlib \
+	${bindir}/readelf \
+	${bindir}/size \
+	${bindir}/strings \
+	${bindir}/strip"
+
+SRC_URI = \
+    "http://ftp.kernel.org/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \
+     file://binutils-001_ld_makefile.patch;patch=1 \
+     file://binutils-006_better_file_error.patch;patch=1 \
+     file://binutils-009_signed_char_fix.patch;patch=1 \
+     file://binutils-100_cflags_for_build.patch;patch=1 \
+     file://binutils-2.15.91.0.1-uclibc-100-conf.patch;patch=1 \
+     file://binutils-2.15.90.0.3-uclibc-200-build_modules.patch;patch=1 \
+     file://600-arm-textrel.patch;patch=1"
+
+S = "${WORKDIR}/binutils-${PV}"
+B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
+
+EXTRA_OECONF = "--with-sysroot=${prefix} \
+		--disable-nls \
+		--program-prefix=${TARGET_PREFIX} \
+		--enable-shared"
+
+# This is necessary due to a bug in the binutils Makefiles
+EXTRA_OEMAKE = "configure-build-libiberty all"
+
+export AR = "${HOST_PREFIX}ar"
+export AS = "${HOST_PREFIX}as"
+export LD = "${HOST_PREFIX}ld"
+export NM = "${HOST_PREFIX}nm"
+export RANLIB = "${HOST_PREFIX}ranlib"
+export OBJCOPY = "${HOST_PREFIX}objcopy"
+export OBJDUMP = "${HOST_PREFIX}objdump"
+
+export AR_FOR_TARGET = "${TARGET_PREFIX}ar"
+export AS_FOR_TARGET = "${TARGET_PREFIX}as"
+export LD_FOR_TARGET = "${TARGET_PREFIX}ld"
+export NM_FOR_TARGET = "${TARGET_PREFIX}nm"
+export RANLIB_FOR_TARGET = "${TARGET_PREFIX}ranlib"
+
+export CC_FOR_HOST = "${CCACHE} ${HOST_PREFIX}gcc"
+export CXX_FOR_HOST = "${CCACHE} ${HOST_PREFIX}gcc"
+
+export CC_FOR_BUILD = "${BUILD_CC}"
+
+export CC = "${CCACHE} ${HOST_PREFIX}gcc"
+
+do_configure () {
+	(cd ${S}; gnu-configize) || die "Failed to run gnu-configize"
+	oe_runconf
+}
+
+do_stage () {
+	oe_libinstall -so -a -C opcodes libopcodes ${STAGING_LIBDIR}/
+	oe_libinstall -a -C libiberty libiberty ${STAGING_LIBDIR}/
+	oe_libinstall -so -a -C bfd libbfd ${STAGING_LIBDIR}/
+	install -m 0644 ${S}/include/dis-asm.h ${STAGING_INCDIR}/
+	install -m 0644 ${S}/include/symcat.h ${STAGING_INCDIR}/
+	install -m 0644 ${S}/include/libiberty.h ${STAGING_INCDIR}/
+	install -m 0644 ${S}/include/ansidecl.h ${STAGING_INCDIR}/
+	install -m 0644 ${S}/include/bfdlink.h ${STAGING_INCDIR}/
+	install -m 0644 bfd/bfd.h ${STAGING_INCDIR}/
+}
+
+do_install () {
+	autotools_do_install
+
+	# We don't really need these, so we'll remove them...
+	rm -rf ${D}/${libdir}/ldscripts
+
+	# Install the libiberty header
+	install -m 644 ${S}/include/ansidecl.h ${D}/${includedir}
+	install -m 644 ${S}/include/libiberty.h ${D}/${includedir}
+
+	cd ${D}/${bindir}
+
+	# Symlinks for ease of running these on the native target
+	for p in ${TARGET_SYS}-* ; do
+		ln -sf $p `echo $p | sed -e s,${TARGET_SYS}-,,`
+	done
+}