From 47be081dc18f47e8b4955721c3db3812adf475d9 Mon Sep 17 00:00:00 2001 From: Marius Mauch Date: Fri, 24 Mar 2006 18:14:00 +0000 Subject: Replacing arch specific make.conf files with patches for the fallback make.conf which should be applied in the ebuild. Add a helper script to update patches if the main make.conf is changed. svn path=/main/trunk/; revision=2987 --- make.conf-repatch.sh | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 make.conf-repatch.sh (limited to 'make.conf-repatch.sh') diff --git a/make.conf-repatch.sh b/make.conf-repatch.sh new file mode 100644 index 000000000..6589e6b62 --- /dev/null +++ b/make.conf-repatch.sh @@ -0,0 +1,40 @@ +#!/bin/bash + +die() { + echo "ERROR: $*" > /dev/stderr + patch -p0 make.conf < make.conf.diff + exit 1 +} + +if [ ! -f "make.conf" -o ! -f "make.conf.x86.diff" -o ! -d ".svn" ]; then + echo "ERROR: current directory is invalid" > /dev/stderr + exit 1 +fi + +svn diff make.conf > make.conf.diff +svn revert make.conf + +for x in make.conf.*.diff; do + archs="$archs $(basename ${x:10} .diff)" +done + + +for arch in $archs; do + echo "* Patching $arch" + cp make.conf make.conf.$arch || die "copy failed" + patch -p0 make.conf.$arch < make.conf.${arch}.diff > /dev/null || die "arch-patch failed" + patch -p0 make.conf.$arch < make.conf.diff > /dev/null || die "patch failed" +done + +echo "* Re-patching make.conf" +patch -p0 make.conf < make.conf.diff > /dev/null || die "repatch failed" + +for arch in $archs; do + echo "* Creating diff for $arch" + diff -u make.conf make.conf.$arch > make.conf.${arch}.diff + [ -z "${KEEP_ARCH_MAKE_CONF}" ] && rm -f make.conf.$arch make.conf.${arch}.orig +done + +rm make.conf.diff + +echo "Done" \ No newline at end of file -- cgit v1.2.3-1-g7c22