[packages/rpm.git] / rpm-builddir-readlink.patch

--- rpm-4.5/scripts/find-debuginfo.sh~	2010-01-27 19:25:48.000000000 +0200
+++ rpm-4.5/scripts/find-debuginfo.sh	2010-01-27 20:23:37.279516094 +0200
@@ -24,6 +24,11 @@
 strict=false
 
 RPM_BUILD_DIR="`pwd`"
+# canon RPM_BUILD_DIR, the DW_AT_comp_dir in ELF objects is real a real path
+# and debugedit will ignore them as they are out of build dir.
+RPM_BUILD_DIR=$(readlink -f "$RPM_BUILD_DIR")
+echo "RPM_BUILD_DIR=$RPM_BUILD_DIR"
+
 BUILDDIR=.
 out=debugfiles.list
 nout=0
@@ -201,6 +203,11 @@
     $strict && exit 2
   fi
 
+  if [ ! -s "$SOURCEFILE" ]; then
+    echo >&2 "*** ${strict_error}: no sources found for $f (stripped without sourcefile information?)"
+    $strict && exit 2
+  fi
+
   [ -x /usr/bin/gdb-add-index ] && /usr/bin/gdb-add-index "$f" > /dev/null 2>&1
 
   # A binary already copied into /usr/lib/debug doesn't get stripped,
Commit	Line	Data
a3809792 JR	1	--- rpm-4.5/scripts/find-debuginfo.sh~ 2010-01-27 19:25:48.000000000 +0200
	2	+++ rpm-4.5/scripts/find-debuginfo.sh 2010-01-27 20:23:37.279516094 +0200
	3	@@ -24,6 +24,11 @@
a3809792 JR	4	strict=false
a3809792 JR	5
26ea8a78	6	RPM_BUILD_DIR="`pwd`"
a3809792 JR	7	+# canon RPM_BUILD_DIR, the DW_AT_comp_dir in ELF objects is real a real path
	8	+# and debugedit will ignore them as they are out of build dir.
	9	+RPM_BUILD_DIR=$(readlink -f "$RPM_BUILD_DIR")
	10	+echo "RPM_BUILD_DIR=$RPM_BUILD_DIR"
	11	+
	12	BUILDDIR=.
	13	out=debugfiles.list
	14	nout=0
	15	@@ -201,6 +203,11 @@
	16	$strict && exit 2
	17	fi
	18
	19	+ if [ ! -s "$SOURCEFILE" ]; then
	20	+ echo >&2 "*** ${strict_error}: no sources found for $f (stripped without sourcefile information?)"
	21	+ $strict && exit 2
	22	+ fi
	23	+
26ea8a78 JR	24	[ -x /usr/bin/gdb-add-index ] && /usr/bin/gdb-add-index "$f" > /dev/null 2>&1
26ea8a78 JR	25
a3809792	26	# A binary already copied into /usr/lib/debug doesn't get stripped,