Bug#775942: FTCBFS for multilib enabled architectures

2015-01-21 Thread Helmut Grohne
Source: expat
Version: 2.1.0-6
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap

Trying to cross build expat for e.g. powerpc results in a build failure
during dh_strip. It built lib64expat1 using "gcc -m64" which produced
amd64 objects instead of ppc64 objects which powerpc-linux-gnu-strip
does not understand.

I am attaching a patch that changes the build inject a suitable CC
variable which makes cross building expat work.

Helmut
diff -Nru expat-2.1.0/debian/changelog expat-2.1.0/debian/changelog
--- expat-2.1.0/debian/changelog2014-06-04 17:55:11.0 +0200
+++ expat-2.1.0/debian/changelog2015-01-20 22:55:42.0 +0100
@@ -1,3 +1,10 @@
+expat (2.1.0-6.1) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * Also use a cross compiler for multilib builds. (Closes: #-1)
+
+ -- Helmut Grohne   Tue, 20 Jan 2015 22:55:26 +0100
+
 expat (2.1.0-6) unstable; urgency=low
 
   * Really do the Ubuntu sync (closes: #748250).
diff -Nru expat-2.1.0/debian/rules expat-2.1.0/debian/rules
--- expat-2.1.0/debian/rules2014-06-04 17:54:08.0 +0200
+++ expat-2.1.0/debian/rules2015-01-20 22:55:23.0 +0100
@@ -32,6 +32,10 @@
HOST64FLAG = --host=s390x-linux-gnu
 endif
 
+ifeq ($(origin CC),default)
+CC = $(DEB_HOST_GNU_TYPE)-cc
+endif
+
 # -pthread -D_REENTRANT #551079
 CFLAGS  = `dpkg-buildflags --get CFLAGS`
 CFLAGS  += -Wall
@@ -65,13 +69,13 @@
 
 build64/config.status: config-common-stamp
dh_testdir
-   (mkdir -p $(@D); cd $(@D); CFLAGS="-m64 $(CFLAGS)" 
CPPFLAGS="$(CPPFLAGS)"  LDFLAGS="$(LDFLAGS)" \
+   (mkdir -p $(@D); cd $(@D); CC="$(CC) -m64" CFLAGS="$(CFLAGS)" 
CPPFLAGS="$(CPPFLAGS)"  LDFLAGS="$(LDFLAGS)" \
 ../configure $(CONFFLAGS) $(HOST64FLAG) --prefix=/usr 
--mandir=\$${prefix}/share/man \
 --libdir=\$${prefix}/lib64)
 
 buildw64/config.status: config-common-stamp
dh_testdir
-   (mkdir -p $(@D); cd $(@D); CFLAGS="-m64 $(CFLAGS) -DXML_UNICODE" 
CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \
+   (mkdir -p $(@D); cd $(@D); CC="$(CC) -m64" CFLAGS="$(CFLAGS) 
-DXML_UNICODE" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \
 ../configure $(CONFFLAGS) $(HOST64FLAG) --prefix=/usr 
--mandir=\$${prefix}/share/man \
 --libdir=\$${prefix}/lib64)
 


Bug#775942: FTCBFS for multilib enabled architectures

2015-01-24 Thread Guillem Jover
Hi!

On Wed, 2015-01-21 at 20:07:54 +0100, Helmut Grohne wrote:
> Source: expat
> Version: 2.1.0-6
> Tags: patch
> User: helm...@debian.org
> Usertags: rebootstrap

> Trying to cross build expat for e.g. powerpc results in a build failure
> during dh_strip. It built lib64expat1 using "gcc -m64" which produced
> amd64 objects instead of ppc64 objects which powerpc-linux-gnu-strip
> does not understand.
> 
> I am attaching a patch that changes the build inject a suitable CC
> variable which makes cross building expat work.

Alternatively, the multilib packages could just be dropped (at least in
experimental), given that the only package currently Build-Depending on
them in the archive (gdb for its gdb64 package) has now stopped building
the package and I expect should stop Build-Depending on it soon in
experimental. This way we simplify our build processes, and move
further into using proper multiarch.

Attached patch does exactly that (only build tested).

(See #775948 for the progress on this.)

Thanks,
Guillem
From da7d62885bdae71742dc670c9c040b6873912391 Mon Sep 17 00:00:00 2001
From: Guillem Jover 
Date: Sat, 24 Jan 2015 19:39:30 +0100
Subject: [PATCH] Remove now unused multilib packages

Closes: #775942
---
 debian/control | 31 +--
 debian/lib64expat1-dev.install |  2 --
 debian/lib64expat1.install |  1 -
 debian/lib64expat1.shlibs  |  2 --
 debian/rules   | 41 +++--
 5 files changed, 4 insertions(+), 73 deletions(-)
 delete mode 100644 debian/lib64expat1-dev.install
 delete mode 100644 debian/lib64expat1.install
 delete mode 100644 debian/lib64expat1.shlibs

diff --git a/debian/control b/debian/control
index ec558f5..315ade5 100644
--- a/debian/control
+++ b/debian/control
@@ -4,40 +4,11 @@ Priority: optional
 Maintainer: Laszlo Boszormenyi (GCS) 
 Standards-Version: 3.9.5
 Build-Depends: debhelper (>= 9), docbook-to-man, dh-autoreconf,
- dpkg-dev (>= 1.16.0),
- gcc-multilib [i386 powerpc sparc s390]
+ dpkg-dev (>= 1.16.0)
 Homepage: http://expat.sourceforge.net
 Vcs-Browser: http://svn.debian.org/wsvn/debian-xml-sgml/packages/expat/trunk/
 Vcs-Svn: svn://svn.debian.org/svn/debian-xml-sgml/packages/expat/trunk/
 
-Package: lib64expat1-dev
-Section: libdevel
-Architecture: i386 powerpc sparc s390
-Depends: ${misc:Depends}, lib64expat1 (= ${binary:Version}), libexpat1-dev, gcc-multilib
-Description: XML parsing C library - development kit (64bit)
- This package contains the header file and development libraries of
- expat, the C library for parsing XML.  Expat is a stream oriented XML
- parser.  This means that you register handlers with the parser prior
- to starting the parse.  These handlers are called when the parser
- discovers the associated structures in the document being parsed.  A
- start tag is an example of the kind of structures for which you may
- register handlers.
- .
- This package includes the development support files for building 64 bit
- applications.
-
-Package: lib64expat1
-Section: libs
-Architecture: i386 powerpc sparc s390
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: XML parsing C library - runtime library (64bit)
- This package contains the runtime, shared library of expat, the C
- library for parsing XML. Expat is a stream-oriented parser in
- which an application registers handlers for things the parser
- might find in the XML document (like start tags).
- .
- This package includes the 64 bit version of the shared library.
-
 Package: libexpat1-dev
 Section: libdevel
 Architecture: any
diff --git a/debian/lib64expat1-dev.install b/debian/lib64expat1-dev.install
deleted file mode 100644
index 34c5ecb..000
--- a/debian/lib64expat1-dev.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib64/*.a
-usr/lib64/*.so
diff --git a/debian/lib64expat1.install b/debian/lib64expat1.install
deleted file mode 100644
index 2c53d54..000
--- a/debian/lib64expat1.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib64/*.so.*
diff --git a/debian/lib64expat1.shlibs b/debian/lib64expat1.shlibs
deleted file mode 100644
index ed55770..000
--- a/debian/lib64expat1.shlibs
+++ /dev/null
@@ -1,2 +0,0 @@
-libexpat 1 lib64expat1 (>= 2.0.1)
-libexpatw 1 lib64expat1 (>= 2.0.1)
diff --git a/debian/rules b/debian/rules
index 31909df..0fe365b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,27 +11,12 @@ DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_HOST_ARCH  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
-BUILD64 = $(filter $(DEB_HOST_ARCH), i386 powerpc sparc s390)
-
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
 	CONFFLAGS = --build=$(DEB_HOST_GNU_TYPE)
 else
 	CONFFLAGS = --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
 endif
 
-ifeq ($(DEB_HOST_ARCH),i386)
-	HOST64FLAG = --host=x86_64-linux-gnu
-endif
-ifeq ($(DEB_HOST_ARCH),powerpc)
-	HOST64FLAG = --host=ppc64-linux-gnu
-e

Bug#775942: FTCBFS for multilib enabled architectures

2016-03-12 Thread Manuel A. Fernandez Montecelo

Hi,

2015-01-24 18:43 Guillem Jover:

Hi!

On Wed, 2015-01-21 at 20:07:54 +0100, Helmut Grohne wrote:

Source: expat
Version: 2.1.0-6
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap



Trying to cross build expat for e.g. powerpc results in a build failure
during dh_strip. It built lib64expat1 using "gcc -m64" which produced
amd64 objects instead of ppc64 objects which powerpc-linux-gnu-strip
does not understand.

I am attaching a patch that changes the build inject a suitable CC
variable which makes cross building expat work.


Alternatively, the multilib packages could just be dropped (at least in
experimental), given that the only package currently Build-Depending on
them in the archive (gdb for its gdb64 package) has now stopped building
the package and I expect should stop Build-Depending on it soon in
experimental. This way we simplify our build processes, and move
further into using proper multiarch.

Attached patch does exactly that (only build tested).


Would be possible to drop these packages now?

There are some ports in the works right now that would probably benefit
from this.


Cheers.
--
Manuel A. Fernandez Montecelo 



Bug#775942: FTCBFS for multilib enabled architectures

2016-03-12 Thread GCS
On Sat, Mar 12, 2016 at 2:27 PM, Manuel A. Fernandez Montecelo
 wrote:
> 2015-01-24 18:43 Guillem Jover:
>> Alternatively, the multilib packages could just be dropped (at least in
>> experimental), given that the only package currently Build-Depending on
>> them in the archive (gdb for its gdb64 package) has now stopped building
>> the package and I expect should stop Build-Depending on it soon in
>> experimental. This way we simplify our build processes, and move
>> further into using proper multiarch.
>>
>> Attached patch does exactly that (only build tested).
>
> Would be possible to drop these packages now?
>
> There are some ports in the works right now that would probably benefit
> from this.
 A new release is expected soon, will drop the packages then.
Otherwise I'll drop those anyway in some days.

Regards,
Laszlo/GCS



Bug#775942: FTCBFS for multilib enabled architectures

2016-03-12 Thread Manuel A. Fernandez Montecelo

2016-03-12 16:08 László Böszörményi (GCS):

On Sat, Mar 12, 2016 at 2:27 PM, Manuel A. Fernandez Montecelo
 wrote:

2015-01-24 18:43 Guillem Jover:

Alternatively, the multilib packages could just be dropped (at least in
experimental), given that the only package currently Build-Depending on
them in the archive (gdb for its gdb64 package) has now stopped building
the package and I expect should stop Build-Depending on it soon in
experimental. This way we simplify our build processes, and move
further into using proper multiarch.

Attached patch does exactly that (only build tested).


Would be possible to drop these packages now?

There are some ports in the works right now that would probably benefit
from this.

A new release is expected soon, will drop the packages then.
Otherwise I'll drop those anyway in some days.


That's great to hear, thanks!

--
Manuel A. Fernandez Montecelo 



Bug#775942: FTCBFS for multilib enabled architectures

2017-12-15 Thread Manuel A. Fernandez Montecelo

Hi László,

2016-03-12 17:16 Manuel A. Fernandez Montecelo:

2016-03-12 16:08 László Böszörményi (GCS):

On Sat, Mar 12, 2016 at 2:27 PM, Manuel A. Fernandez Montecelo
 wrote:

2015-01-24 18:43 Guillem Jover:

Alternatively, the multilib packages could just be dropped (at least in
experimental), given that the only package currently Build-Depending on
them in the archive (gdb for its gdb64 package) has now stopped building
the package and I expect should stop Build-Depending on it soon in
experimental. This way we simplify our build processes, and move
further into using proper multiarch.

Attached patch does exactly that (only build tested).


Would be possible to drop these packages now?

There are some ports in the works right now that would probably benefit
from this.

A new release is expected soon, will drop the packages then.
Otherwise I'll drop those anyway in some days.


That's great to hear, thanks!


So after more than a year and a release later, maybe it's a good time to
drop the packages now.

According to popcon, the number of installations of these packages are
in the noise, while libexpat1 is almost 100%.

If you are busy or something I'd like to do an NMU in the next few days.
Since you were OK with that option at the time, I guess that it's still
OK on your side.


Cheers.
--
Manuel A. Fernandez Montecelo 



Bug#775942: FTCBFS for multilib enabled architectures

2017-12-15 Thread GCS
Control: tags -1 +pending

Hi Manuel,

On Fri, Dec 15, 2017 at 11:58 PM, Manuel A. Fernandez Montecelo
 wrote:
> 2016-03-12 17:16 Manuel A. Fernandez Montecelo:
>> 2016-03-12 16:08 László Böszörményi (GCS):
>>> On Sat, Mar 12, 2016 at 2:27 PM, Manuel A. Fernandez Montecelo
>>>  wrote:
 Would be possible to drop these packages now?

>>> A new release is expected soon, will drop the packages then.
>>> Otherwise I'll drop those anyway in some days.
>>
>> That's great to hear, thanks!
>
> So after more than a year and a release later, maybe it's a good time to
> drop the packages now.
 Yup, I'm working on the update. Hopefully I'll finish it in the
upcoming weekend.

Cheers,
Laszlo/GCS



Bug#775942: FTCBFS for multilib enabled architectures

2017-12-15 Thread Manuel A. Fernandez Montecelo
2017-12-16 0:02 GMT+01:00 László Böszörményi (GCS) :
> Control: tags -1 +pending
>
> Hi Manuel,
>
> On Fri, Dec 15, 2017 at 11:58 PM, Manuel A. Fernandez Montecelo
>  wrote:
>> 2016-03-12 17:16 Manuel A. Fernandez Montecelo:
>>> 2016-03-12 16:08 László Böszörményi (GCS):
 On Sat, Mar 12, 2016 at 2:27 PM, Manuel A. Fernandez Montecelo
  wrote:
> Would be possible to drop these packages now?
>
 A new release is expected soon, will drop the packages then.
 Otherwise I'll drop those anyway in some days.
>>>
>>> That's great to hear, thanks!
>>
>> So after more than a year and a release later, maybe it's a good time to
>> drop the packages now.
>  Yup, I'm working on the update. Hopefully I'll finish it in the
> upcoming weekend.

Ah, it's good then, thanks.


Cheers.
-- 
Manuel A. Fernandez Montecelo 



Bug#775942: FTCBFS for multilib enabled architectures

2017-12-16 Thread Manuel A. Fernandez Montecelo
Thanks for fixing the issue!

-- 
Manuel A. Fernandez Montecelo