Bug#41576: dpkg for mips + cross compile fix

To: Ulf Carlsson <ulfc@thepuffingroup.com>, 41576@bugs.debian.org
Subject: Bug#41576: dpkg for mips + cross compile fix
From: Marcus Brinkmann <Marcus.Brinkmann@ruhr-uni-bochum.de>
Date: Sun, 25 Jul 1999 03:06:41 +0200
Message-id: <[🔎] 19990725030640.A629@ulysses.ulysses.de>
Reply-to: Marcus Brinkmann <Marcus.Brinkmann@ruhr-uni-bochum.de>, 41576@bugs.debian.org
In-reply-to: <[🔎] 19990718145353.A7165@thepuffingroup.com>; from Ulf Carlsson on Sun, Jul 18, 1999 at 02:53:54PM -0400
References: <[🔎] 19990718145353.A7165@thepuffingroup.com>

On Sun, Jul 18, 1999 at 02:53:54PM -0400, Ulf Carlsson wrote:
> 
> I had to modify dpkg in order to make it cross compile (LOCALEDIR wasn't defined
> correctly otherwise since dpkg-cross overrides CFLAGS).  I have also added mips
> to the archtable.

Right, but main/Makefile.am is not sufficient for dpkg 1.4.1.6. I attach a
full patch that fixes all LOCALEDIR problems wtr cross compilation (and
THANKS Ulf for finding out what was causing this damn problem I had when
cross compiling dpkg for the Hurd).

Thanks,
Marcus

-- 
`Rhubarb is no Egyptian god.' Debian http://www.debian.org   finger brinkmd@ 
Marcus Brinkmann              GNU    http://www.gnu.org     master.debian.org
Marcus.Brinkmann@ruhr-uni-bochum.de                        for public  PGP Key
http://homepage.ruhr-uni-bochum.de/Marcus.Brinkmann/       PGP Key ID 36E7CD09

  * */Makefile.am: Cross compile fix by Ulf Carlsson (see #41576).

diff -ru ../dpkg-1.4.1.6/dpkg-deb/Makefile.am dpkg-deb/Makefile.am
--- ../dpkg-1.4.1.6/dpkg-deb/Makefile.am	Sun Nov  1 17:04:03 1998
+++ dpkg-deb/Makefile.am	Sat Jul 24 20:37:50 1999
@@ -8,7 +8,7 @@
 
 ## Various options
 
-CFLAGS			= @CFLAGS@ @CWARNS@ -g $(XCFLAGS) -DLOCALEDIR=\"$(localedir)\"
+CFLAGS			= @CFLAGS@ @CWARNS@ -g $(XCFLAGS)
 OPTCFLAGS		= @CFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCFLAGS)
 LDFLAGS			= @LDFLAGS@ $(XLDFLAGS)
 LIBS			= @INTLLIBS@ @LIBS@ $(XLIBS)
@@ -18,7 +18,8 @@
 
 DEFS			= -I$(top_srcdir)/include -I$(top_srcdir) -I$(srcdir) \
 			  -I$(top_builddir) -I$(top_builddir)/include -I. \
-			  -I$(top_srcdir)/intl -I$(top_builddir)/intl @DEFS@
+			  -I$(top_srcdir)/intl -I$(top_builddir)/intl \
+			  -DLOCALEDIR=\"$(localedir)\" @DEFS@
 
 ## Automake variables
 
diff -ru ../dpkg-1.4.1.6/dpkg-deb/Makefile.in dpkg-deb/Makefile.in
--- ../dpkg-1.4.1.6/dpkg-deb/Makefile.in	Wed Jul  7 01:00:46 1999
+++ dpkg-deb/Makefile.in	Sat Jul 24 20:48:27 1999
@@ -105,7 +105,7 @@
 
 localedir = $(datadir)/locale
 
-CFLAGS = @CFLAGS@ @CWARNS@ -g $(XCFLAGS) -DLOCALEDIR=\"$(localedir)\"
+CFLAGS = @CFLAGS@ @CWARNS@ -g $(XCFLAGS)
 OPTCFLAGS = @CFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCFLAGS)
 LDFLAGS = @LDFLAGS@ $(XLDFLAGS)
 LIBS = @INTLLIBS@ @LIBS@ $(XLIBS)
@@ -113,7 +113,7 @@
 CXXFLAGS = @CXXFLAGS@ @CWARNS@ -g $(XCXXFLAGS)
 OPTCXXFLAGS = @CXXFLAGS @OPTCFLAGS@ @CWARNS@ -g $(XCXXFLAGS)
 
-DEFS = -I$(top_srcdir)/include -I$(top_srcdir) -I$(srcdir) 			  -I$(top_builddir) -I$(top_builddir)/include -I. 			  -I$(top_srcdir)/intl -I$(top_builddir)/intl @DEFS@
+DEFS = -I$(top_srcdir)/include -I$(top_srcdir) -I$(srcdir) 			  -I$(top_builddir) -I$(top_builddir)/include -I. 			  -I$(top_srcdir)/intl -I$(top_builddir)/intl 			  -DLOCALEDIR=\"$(localedir)\" @DEFS@
 
 
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
diff -ru ../dpkg-1.4.1.6/dselect/Makefile.am dselect/Makefile.am
--- ../dpkg-1.4.1.6/dselect/Makefile.am	Sun Nov  1 17:04:17 1998
+++ dselect/Makefile.am	Sat Jul 24 20:38:32 1999
@@ -8,17 +8,18 @@
 
 ## Various options
 
-CFLAGS			= @CFLAGS@ @CWARNS@ -g $(XCFLAGS) -DLOCALEDIR=\"$(localedir)\"
-OPTCFLAGS		= @CFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCFLAGS) -DLOCALEDIR=\"$(localedir)\"
+CFLAGS			= @CFLAGS@ @CWARNS@ -g $(XCFLAGS)
+OPTCFLAGS		= @CFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCFLAGS)
 LDFLAGS			= @LDFLAGS@ $(XLDFLAGS)
 LIBS			= @INTLLIBS@ @LIBS@ $(XLIBS)
 
-CXXFLAGS		= @CXXFLAGS@ @CWARNS@ -g $(XCXXFLAGS) -DLOCALEDIR=\"$(localedir)\"
-OPTCXXFLAGS		= @CXXFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCXXFLAGS) -DLOCALEDIR=\"$(localedir)\"
+CXXFLAGS		= @CXXFLAGS@ @CWARNS@ -g $(XCXXFLAGS)
+OPTCXXFLAGS		= @CXXFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCXXFLAGS)
 
 DEFS			= -I$(top_srcdir)/include -I$(top_srcdir) -I$(srcdir) \
 			  -I$(top_builddir) -I$(top_builddir)/include -I. \
-			  -I$(top_srcdir)/intl -I$(top_builddir)/intl @DEFS@
+			  -I$(top_srcdir)/intl -I$(top_builddir)/intl \
+			  -DLOCALEDIR=\"$(localedir)\" @DEFS@
 ## Automake variables
 
 bin_PROGRAMS		= dselect
diff -ru ../dpkg-1.4.1.6/dselect/Makefile.in dselect/Makefile.in
--- ../dpkg-1.4.1.6/dselect/Makefile.in	Wed Jul  7 01:00:47 1999
+++ dselect/Makefile.in	Sat Jul 24 20:48:30 1999
@@ -105,15 +105,15 @@
 
 localedir = $(datadir)/locale
 
-CFLAGS = @CFLAGS@ @CWARNS@ -g $(XCFLAGS) -DLOCALEDIR=\"$(localedir)\"
-OPTCFLAGS = @CFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCFLAGS) -DLOCALEDIR=\"$(localedir)\"
+CFLAGS = @CFLAGS@ @CWARNS@ -g $(XCFLAGS)
+OPTCFLAGS = @CFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCFLAGS)
 LDFLAGS = @LDFLAGS@ $(XLDFLAGS)
 LIBS = @INTLLIBS@ @LIBS@ $(XLIBS)
 
-CXXFLAGS = @CXXFLAGS@ @CWARNS@ -g $(XCXXFLAGS) -DLOCALEDIR=\"$(localedir)\"
-OPTCXXFLAGS = @CXXFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCXXFLAGS) -DLOCALEDIR=\"$(localedir)\"
+CXXFLAGS = @CXXFLAGS@ @CWARNS@ -g $(XCXXFLAGS)
+OPTCXXFLAGS = @CXXFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCXXFLAGS)
 
-DEFS = -I$(top_srcdir)/include -I$(top_srcdir) -I$(srcdir) 			  -I$(top_builddir) -I$(top_builddir)/include -I. 			  -I$(top_srcdir)/intl -I$(top_builddir)/intl @DEFS@
+DEFS = -I$(top_srcdir)/include -I$(top_srcdir) -I$(srcdir) 			  -I$(top_builddir) -I$(top_builddir)/include -I. 			  -I$(top_srcdir)/intl -I$(top_builddir)/intl 			  -DLOCALEDIR=\"$(localedir)\" @DEFS@
 
 
 bin_PROGRAMS = dselect
diff -ru ../dpkg-1.4.1.6/main/Makefile.am main/Makefile.am
--- ../dpkg-1.4.1.6/main/Makefile.am	Sun Nov  1 17:06:12 1998
+++ main/Makefile.am	Sat Jul 24 20:30:50 1999
@@ -8,17 +8,18 @@
 
 ## Various options
 
-CFLAGS			= @CFLAGS@ @CWARNS@ -g $(XCFLAGS) -DLOCALEDIR=\"$(localedir)\"
-OPTCFLAGS		= @CFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCFLAGS) -DLOCALEDIR=\"$(localedir)\"
+CFLAGS			= @CFLAGS@ @CWARNS@ -g $(XCFLAGS)
+OPTCFLAGS		= @CFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCFLAGS)
 LDFLAGS			= @LDFLAGS@ $(XLDFLAGS)
 LIBS			= @INTLLIBS@ @LIBS@ $(XLIBS)
 
-CXXFLAGS		= @CXXFLAGS@ @CWARNS@ -g $(XCXXFLAGS) -DLOCALEDIR=\"$(localedir)\"
-OPTCXXFLAGS		= @CXXFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCXXFLAGS) -DLOCALEDIR=\"$(localedir)\"
+CXXFLAGS		= @CXXFLAGS@ @CWARNS@ -g $(XCXXFLAGS)
+OPTCXXFLAGS		= @CXXFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCXXFLAGS)
 
 DEFS			= -I$(top_srcdir)/include -I$(top_srcdir) -I$(srcdir) \
 			  -I$(top_builddir) -I$(top_builddir)/include -I. \
-			  -I$(top_srcdir)/intl -I$(top_builddir)/intl @DEFS@
+			  -I$(top_srcdir)/intl -I$(top_builddir)/intl \
+			  -DLOCALEDIR=\"$(localedir)\" @DEFS@
 
 ## Automake variables
 
diff -ru ../dpkg-1.4.1.6/main/Makefile.in main/Makefile.in
--- ../dpkg-1.4.1.6/main/Makefile.in	Wed Jul  7 01:00:48 1999
+++ main/Makefile.in	Sat Jul 24 20:48:33 1999
@@ -105,15 +105,15 @@
 
 localedir = $(datadir)/locale
 
-CFLAGS = @CFLAGS@ @CWARNS@ -g $(XCFLAGS) -DLOCALEDIR=\"$(localedir)\"
-OPTCFLAGS = @CFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCFLAGS) -DLOCALEDIR=\"$(localedir)\"
+CFLAGS = @CFLAGS@ @CWARNS@ -g $(XCFLAGS)
+OPTCFLAGS = @CFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCFLAGS)
 LDFLAGS = @LDFLAGS@ $(XLDFLAGS)
 LIBS = @INTLLIBS@ @LIBS@ $(XLIBS)
 
-CXXFLAGS = @CXXFLAGS@ @CWARNS@ -g $(XCXXFLAGS) -DLOCALEDIR=\"$(localedir)\"
-OPTCXXFLAGS = @CXXFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCXXFLAGS) -DLOCALEDIR=\"$(localedir)\"
+CXXFLAGS = @CXXFLAGS@ @CWARNS@ -g $(XCXXFLAGS)
+OPTCXXFLAGS = @CXXFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCXXFLAGS)
 
-DEFS = -I$(top_srcdir)/include -I$(top_srcdir) -I$(srcdir) 			  -I$(top_builddir) -I$(top_builddir)/include -I. 			  -I$(top_srcdir)/intl -I$(top_builddir)/intl @DEFS@
+DEFS = -I$(top_srcdir)/include -I$(top_srcdir) -I$(srcdir) 			  -I$(top_builddir) -I$(top_builddir)/include -I. 			  -I$(top_srcdir)/intl -I$(top_builddir)/intl 			  -DLOCALEDIR=\"$(localedir)\" @DEFS@
 
 
 bin_PROGRAMS = dpkg
diff -ru ../dpkg-1.4.1.6/md5sum/Makefile.am md5sum/Makefile.am
--- ../dpkg-1.4.1.6/md5sum/Makefile.am	Sun Nov  1 17:06:47 1998
+++ md5sum/Makefile.am	Sat Jul 24 20:39:07 1999
@@ -8,17 +8,18 @@
 
 ## Various options
 
-CFLAGS			= @CFLAGS@ @CWARNS@ -g $(XCFLAGS) -DLOCALEDIR=\"$(localedir)\"
-OPTCFLAGS		= @CFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCFLAGS) -DLOCALEDIR=\"$(localedir)\"
+CFLAGS			= @CFLAGS@ @CWARNS@ -g $(XCFLAGS)
+OPTCFLAGS		= @CFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCFLAGS)
 LDFLAGS			= @LDFLAGS@ $(XLDFLAGS)
 LIBS			= @INTLLIBS@ @LIBS@ $(XLIBS)
 
-CXXFLAGS		= @CXXFLAGS@ @CWARNS@ -g $(XCXXFLAGS) -DLOCALEDIR=\"$(localedir)\"
-OPTCXXFLAGS		= @CXXFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCXXFLAGS) -DLOCALEDIR=\"$(localedir)\"
+CXXFLAGS		= @CXXFLAGS@ @CWARNS@ -g $(XCXXFLAGS)
+OPTCXXFLAGS		= @CXXFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCXXFLAGS)
 
 DEFS			= -I$(top_srcdir)/include -I$(top_srcdir) -I$(srcdir) \
 			  -I$(top_builddir) -I$(top_builddir)/include -I. \
-			  -I$(top_srcdir)/intl -I$(top_builddir)/intl @DEFS@
+			  -I$(top_srcdir)/intl -I$(top_builddir)/intl \
+			  -DLOCALEDIR=\"$(localedir)\" @DEFS@
 
 MAINTAINERCLEANFILES	= $(srcdir)/Makefile.in
 
diff -ru ../dpkg-1.4.1.6/md5sum/Makefile.in md5sum/Makefile.in
--- ../dpkg-1.4.1.6/md5sum/Makefile.in	Wed Jul  7 01:00:48 1999
+++ md5sum/Makefile.in	Sat Jul 24 20:48:32 1999
@@ -105,15 +105,15 @@
 
 localedir = $(datadir)/locale
 
-CFLAGS = @CFLAGS@ @CWARNS@ -g $(XCFLAGS) -DLOCALEDIR=\"$(localedir)\"
-OPTCFLAGS = @CFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCFLAGS) -DLOCALEDIR=\"$(localedir)\"
+CFLAGS = @CFLAGS@ @CWARNS@ -g $(XCFLAGS)
+OPTCFLAGS = @CFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCFLAGS)
 LDFLAGS = @LDFLAGS@ $(XLDFLAGS)
 LIBS = @INTLLIBS@ @LIBS@ $(XLIBS)
 
-CXXFLAGS = @CXXFLAGS@ @CWARNS@ -g $(XCXXFLAGS) -DLOCALEDIR=\"$(localedir)\"
-OPTCXXFLAGS = @CXXFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCXXFLAGS) -DLOCALEDIR=\"$(localedir)\"
+CXXFLAGS = @CXXFLAGS@ @CWARNS@ -g $(XCXXFLAGS)
+OPTCXXFLAGS = @CXXFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCXXFLAGS)
 
-DEFS = -I$(top_srcdir)/include -I$(top_srcdir) -I$(srcdir) 			  -I$(top_builddir) -I$(top_builddir)/include -I. 			  -I$(top_srcdir)/intl -I$(top_builddir)/intl @DEFS@
+DEFS = -I$(top_srcdir)/include -I$(top_srcdir) -I$(srcdir) 			  -I$(top_builddir) -I$(top_builddir)/include -I. 			  -I$(top_srcdir)/intl -I$(top_builddir)/intl 			  -DLOCALEDIR=\"$(localedir)\" @DEFS@
 
 
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
diff -ru ../dpkg-1.4.1.6/split/Makefile.am split/Makefile.am
--- ../dpkg-1.4.1.6/split/Makefile.am	Sun Nov  1 17:08:08 1998
+++ split/Makefile.am	Sat Jul 24 20:47:29 1999
@@ -9,18 +9,19 @@
 
 ## Various options
 
-CFLAGS			= @CFLAGS@ @CWARNS@ -g $(XCFLAGS) -DLOCALEDIR=\"$(localedir)\"
-OPTCFLAGS		= @CFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCFLAGS) -DLOCALEDIR=\"$(localedir)\"
+CFLAGS			= @CFLAGS@ @CWARNS@ -g $(XCFLAGS)
+OPTCFLAGS		= @CFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCFLAGS)
 LDFLAGS			= @LDFLAGS@ $(XLDFLAGS)
 LIBS			= @INTLLIBS@ @LIBS@ $(XLIBS)
 
-CXXFLAGS		= @CXXFLAGS@ @CWARNS@ -g $(XCXXFLAGS) -DLOCALEDIR=\"$(localedir)\"
-OPTCXXFLAGS		= @CXXFLAGS @OPTCFLAGS@ @CWARNS@ -g $(XCXXFLAGS) -DLOCALEDIR=\"$(localedir)\"
+CXXFLAGS		= @CXXFLAGS@ @CWARNS@ -g $(XCXXFLAGS)
+OPTCXXFLAGS		= @CXXFLAGS @OPTCFLAGS@ @CWARNS@ -g $(XCXXFLAGS)
 
 DEFS			= -I$(top_srcdir)/include -I$(top_srcdir) -I$(srcdir) \
 			  -I$(top_builddir) -I$(top_builddir)/include -I. \
 			  -I$(top_srcdir)/intl -I$(top_builddir)/intl @DEFS@ \
-			  -DMKSPLITSCRIPT=\"$(pkglibdir)/mksplit\"
+			  -DMKSPLITSCRIPT=\"$(pkglibdir)/mksplit\" \
+			  -DLOCALEDIR=\"$(localedir)\"
 
 ## Automake variables
 
diff -ru ../dpkg-1.4.1.6/split/Makefile.in split/Makefile.in
--- ../dpkg-1.4.1.6/split/Makefile.in	Wed Jul  7 01:00:47 1999
+++ split/Makefile.in	Sat Jul 24 20:48:31 1999
@@ -105,15 +105,15 @@
 pkglibdir = $(libdir)/@PACKAGE@
 localedir = $(datadir)/locale
 
-CFLAGS = @CFLAGS@ @CWARNS@ -g $(XCFLAGS) -DLOCALEDIR=\"$(localedir)\"
-OPTCFLAGS = @CFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCFLAGS) -DLOCALEDIR=\"$(localedir)\"
+CFLAGS = @CFLAGS@ @CWARNS@ -g $(XCFLAGS)
+OPTCFLAGS = @CFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCFLAGS)
 LDFLAGS = @LDFLAGS@ $(XLDFLAGS)
 LIBS = @INTLLIBS@ @LIBS@ $(XLIBS)
 
-CXXFLAGS = @CXXFLAGS@ @CWARNS@ -g $(XCXXFLAGS) -DLOCALEDIR=\"$(localedir)\"
-OPTCXXFLAGS = @CXXFLAGS @OPTCFLAGS@ @CWARNS@ -g $(XCXXFLAGS) -DLOCALEDIR=\"$(localedir)\"
+CXXFLAGS = @CXXFLAGS@ @CWARNS@ -g $(XCXXFLAGS)
+OPTCXXFLAGS = @CXXFLAGS @OPTCFLAGS@ @CWARNS@ -g $(XCXXFLAGS)
 
-DEFS = -I$(top_srcdir)/include -I$(top_srcdir) -I$(srcdir) 			  -I$(top_builddir) -I$(top_builddir)/include -I. 			  -I$(top_srcdir)/intl -I$(top_builddir)/intl @DEFS@ 			  -DMKSPLITSCRIPT=\"$(pkglibdir)/mksplit\"
+DEFS = -I$(top_srcdir)/include -I$(top_srcdir) -I$(srcdir) 			  -I$(top_builddir) -I$(top_builddir)/include -I. 			  -I$(top_srcdir)/intl -I$(top_builddir)/intl @DEFS@ 			  -DMKSPLITSCRIPT=\"$(pkglibdir)/mksplit\" 			  -DLOCALEDIR=\"$(localedir)\"
 
 
 bin_PROGRAMS = dpkg-split

Reply to:

Follow-Ups:
- Bug#41576: dpkg for mips + cross compile fix
  - From: Ulf Carlsson <ulfc@thepuffingroup.com>

References:
- Bug#41576: dpkg for mips + cross compile fix
  - From: Ulf Carlsson <ulfc@thepuffingroup.com>

Prev by Date: Bug#40977: strace output of dpkg -i
Next by Date: Re: your dpkg tree
Previous by thread: Bug#41576: dpkg for mips + cross compile fix
Next by thread: Bug#41576: dpkg for mips + cross compile fix
Index(es):
- Date
- Thread