[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

SuperH fixes



Hello,

I heard dpkg-1.9.0 would be relesed soon.

I have several fixes related to SuperH architecture and wish they
would be included in the new dpkg.  I'm glad if you consider them
(attached).

Regards,
--
YAEGASHI Takeshi <t@keshi.org>


2001-04-24  YAEGASHI Takeshi  <t@keshi.org>

	* archtable: Added SuperH variants: sh[34]{,eb}-linux-gnu.
	* scripts/dpkg-architecture.pl (archtable): Fix typo of sheb-linux.
	  (sub rewrite_gnu_cpu): Handle SuperH variants.
	* scripts/dpkg-buildpackage.sh: Call dpkg-architecture with
	  -a${targetarch}.  ${arch} is usually undefined here and causes
	  confusion when cross-compiling.


Index: archtable
===================================================================
RCS file: /cvs/dpkg/dpkg/archtable,v
retrieving revision 1.17
diff -u -r1.17 archtable
--- archtable	2001/04/23 04:59:57	1.17
+++ archtable	2001/04/24 03:52:25
@@ -37,6 +37,10 @@
 sh-linux-gnu		sh		sh
 sheb-linux-gnu		sheb		sheb
 shel-linux-gnu		sh		sh
+sh3-linux-gnu		sh		sh
+sh4-linux-gnu		sh		sh
+sh3eb-linux-gnu		sheb		sheb
+sh4eb-linux-gnu		sheb		sheb
 hppa-linux-gnu		hppa		hppa
 hppa1.1-linux-gnu	hppa		hppa
 hppa2.0-linux-gnu	hppa		hppa
Index: scripts/dpkg-architecture.pl
===================================================================
RCS file: /cvs/dpkg/dpkg/scripts/dpkg-architecture.pl,v
retrieving revision 1.17
diff -u -r1.17 dpkg-architecture.pl
--- scripts/dpkg-architecture.pl	2001/04/19 15:04:25	1.17
+++ scripts/dpkg-architecture.pl	2001/04/24 03:52:26
@@ -57,7 +57,7 @@
 	    'mips',      'mips-linux',
 	    'mipsel',    'mipsel-linux',
 	    'sh',        'sh-linux',
-	    'shed',      'shed-linux',
+	    'sheb',      'sheb-linux',
 	    'hppa',      'hppa-linux',
 	    'hurd-i386', 'i386-gnu',
 	    's390',	 's390-linux',
@@ -94,6 +94,7 @@
 
 	s/(?:i386|i486|i586|i686|pentium)(.*linux)/i386$1/;
 	s/ppc/powerpc/;
+	s/sh[34]/sh/;
 	return $_;
 }
 
Index: scripts/dpkg-buildpackage.sh
===================================================================
RCS file: /cvs/dpkg/dpkg/scripts/dpkg-buildpackage.sh,v
retrieving revision 1.20
diff -u -r1.20 dpkg-buildpackage.sh
--- scripts/dpkg-buildpackage.sh	2001/04/19 14:31:11	1.20
+++ scripts/dpkg-buildpackage.sh	2001/04/24 03:52:26
@@ -138,7 +138,7 @@
 mustsetvar version "`dpkg-parsechangelog | sed -n 's/^Version: //p'`" "source version"
 if [ -n "$maint" ]; then maintainer="$maint"; 
 else mustsetvar maintainer "`dpkg-parsechangelog | sed -n 's/^Maintainer: //p'`" "source maintainer"; fi
-eval `dpkg-architecture -a${arch} -t${targetgnusystem} -s -f`
+eval `dpkg-architecture -a${targetarch} -t${targetgnusystem} -s -f`
 
 if [ x$sourceonly = x ]; then
 	mustsetvar arch "`dpkg-architecture -a${targetarch} -t${targetgnusystem} -qDEB_BUILD_ARCH`" "build architecture"



Reply to: