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

Bug#2610: support for m68k-linux



Package: libg++27
Version: 2.7.1-2

Hi!
this diff is needed to get the libg++ compiled on a m68k-linux.
essentially there are two changes: in debian.rules the i486 is
exchanged by $(ArchName) at various places (which in turn is
set to `uname -a` and changed to i486 on all intels).

the other bunch of changes is essentially for the upstream
maintainer. the only thing done is the addition of the missing
configuration (and -files) for m68k-linux. with this changes
the package compiles fine, and make check runs without any
problems. (well, i don't have plot, so i'm not really able
to look at the .pl plot files :-))

jjm

ps: maybe $(ArchName) should better be set to
$(shell dpkg --print-architecture), see my comments
on emacs-19.30 and the hello-1.6 package.

----------------------------------------------------------------------
diff -ru --new-file libg++27-2.7.1.orig/config/mh-m68kpic libg++27-2.7.1/config/mh-m68kpic
--- libg++27-2.7.1.orig/config/mh-m68kpic	Thu Jan  1 01:00:00 1970
+++ libg++27-2.7.1/config/mh-m68kpic	Tue Jun  6 03:34:48 1995
@@ -0,0 +1 @@
+PICFLAG=-fpic
diff -ru --new-file libg++27-2.7.1.orig/config/mt-m68kpic libg++27-2.7.1/config/mt-m68kpic
--- libg++27-2.7.1.orig/config/mt-m68kpic	Thu Jan  1 01:00:00 1970
+++ libg++27-2.7.1/config/mt-m68kpic	Sun Mar 10 16:13:57 1996
@@ -0,0 +1 @@
+PICFLAG_FOR_TARGET=-fpic
diff -ru --new-file libg++27-2.7.1.orig/configure.in libg++27-2.7.1/configure.in
--- libg++27-2.7.1.orig/configure.in	Tue Feb 20 17:18:55 1996
+++ libg++27-2.7.1/configure.in	Sun Mar 10 17:51:14 1996
@@ -111,6 +111,7 @@
   i[345]86-*-sco*)        host_makefile_frag=config/mh-sco ;;
   i[345]86-*-isc*)	  host_makefile_frag=config/mh-sysv ;;
   i[345]86-*-linux*)      host_makefile_frag=config/mh-linux ;;
+  m68k-*-linux*)          host_makefile_frag=config/mh-linux ;;
   i[345]86-*-solaris2*)   host_makefile_frag=config/mh-sysv4 ;;
   i[345]86-*-aix*)	  host_makefile_frag=config/mh-aix386 ;;
   i[345]86-*-go32*)	  host_makefile_frag=config/mh-go32 ;;
diff -ru --new-file libg++27-2.7.1.orig/debian.rules libg++27-2.7.1/debian.rules
--- libg++27-2.7.1.orig/debian.rules	Tue Feb 20 19:06:00 1996
+++ libg++27-2.7.1/debian.rules	Sun Mar 10 16:22:41 1996
@@ -25,9 +25,16 @@
 # The Debian revision of the package (for example, `2').
 d = 2

+# architecture specific settings
+#
+# uname returns i[345]86. only one of them is known by the Makefile
+DefaultIntelArch=i486
+# get the architecture name
+ArchName=`uname -m | sed -e 's/i[345]86/$(DefaultIntelArch)/'`
+
 build:
 # Builds the binary package.
-	./configure --prefix=/usr --enable-shared i486-linux
+	./configure --prefix=/usr --enable-shared $(ArchName)-linux
 	make
 	touch stamp-build

@@ -54,7 +61,7 @@
 	ln -s libg++.so.27.1.0 debian-tmp/usr/lib/libg++.so
 	ln -s libstdc++.so.27.1.0 debian-tmp/usr/lib/libstdc++.so
 	ln -s ../include/g++ debian-tmp/usr/lib/g++-include
-	rm -rf debian-tmp/usr/i486-linux
+	rm -rf debian-tmp/usr/$(ArchName)-linux
 	rm -f debian-tmp/usr/lib/libiberty.a
 	rm -f debian-tmp/usr/info/cfg-paper.info*
 	rm -f debian-tmp/usr/info/configure.info*
diff -ru --new-file libg++27-2.7.1.orig/libg++/configure.in libg++27-2.7.1/libg++/configure.in
--- libg++27-2.7.1.orig/libg++/configure.in	Tue Feb 20 17:18:55 1996
+++ libg++27-2.7.1/libg++/configure.in	Sun Mar 10 16:16:35 1996
@@ -93,6 +93,7 @@
 frags=
 case "${target}" in
   i[345]86-*-linux*) my_target=linux ;;
+  m68k-*-linux*)     my_target=linux ;;
   *-*-solaris)     my_target=solaris2 ;;
   *-*-*)           my_target=${target_cpu}
 esac

--
Juergen Menden                   | Disclaimer: The opinions expressed by me,
tel:    +49 (89) 2051 - 2387     +-----------+ are (usually) not the opinions
e-mail: menden@informatik.tu-muenchen.de     | of anyone else on this planet.

Hi! I'm a .signature virus!  Add me to your .signature and join in the fun!



Reply to: