From 7fbe5b56d5ccbf62cfa13f0dcd3611eb10753cc8 Mon Sep 17 00:00:00 2001
From: jkratoch <>
Date: Mon, 1 Feb 2010 01:34:22 +0000
Subject: [PATCH] Separate "rhel" from "epel". Run PIE even for "gdbcvs".

---
 bin/hammock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/hammock b/bin/hammock
index 8102e15..3859c36 100755
--- a/bin/hammock
+++ b/bin/hammock
@@ -96,7 +96,8 @@ sub distro_normalize($;$)
   s{/+$}{};
   s/^.*$/\L$&/s;
   s/^(?:devel|rawhide)\b/fedora-rawhide/;
-  s/^(?:epel|rhel|centos)-?(\d)/epel-$1/;
+  s/^(?:epel|centos)-?(\d)/epel-$1/;
+  s/^(?:rhel)-?(\d)/rhel-$1/;
   s/^(?:f|fedora)-?(\d)/fedora-$1/;
   my @archuse;
   @archuse="" if -d "/var/lib/mock/$_";
@@ -258,7 +259,7 @@ while (@distrouse || keys(%child)) {
     }
     if ($component=~/^rhel(.*)$/) {
       $cvsrepo=$1;
-      $cvsbasedir="RHEL-$1" if $componentdistro=~/^epel-(\d+)$/;
+      $cvsbasedir="RHEL-$1" if $componentdistro=~/^(?:epel|rhel)-(\d+)$/;
       die "$component vs. $componentdistro" if !$cvsbasedir;
       $cvsroot=$rhelcvsroot;
       # EPEL still uses Berkeley DB version 8 while F-11+ (F-10?) uses version 9.
@@ -393,8 +394,7 @@ while (@distrouse || keys(%child)) {
       } else {
 	my @check=($distro=~/-x86_64/ ? qw(-m64 -m32) : -m32);
 	@check=map("check//unix/$_",@check);
-	# FSF GDB has no PIE support.
-	# @check=map({($_,"$_/-fPIE/-pie");} @check);
+	@check=map({($_,"$_/-fPIE/-pie");} @check);
 	# for i in ".join(" ",@check).";do orphanripper make -k \$i || :;done
 	mockrun "cd $baretestsuite; $errs1; errs2; cd gdb; ulimit -c unlimited; orphanripper make -k ".join(" ",@check)." || :; mkdir $out; ".q{for t in sum log;do for file in testsuite*/gdb.$t;do suffix="${file#testsuite.unix.}"; suffix="${suffix%/gdb.$t}"; ln $file}." $out/gdb-$distro".q{$suffix.$t || :; done; done;};
       }
-- 
1.8.3.1