Re: Bug#639720: Simplified build and #639287: Updated patch for GNU/Hurd
On Tue, 2011-08-30 at 10:50 +0200, Svante Signell wrote:
> On Tue, 2011-08-30 at 10:25 +0200, Francesco P. Lovergine wrote:
> > On Mon, Aug 29, 2011 at 07:48:15PM +0200, Svante Signell wrote:
> > > Package: libhdf4
> > > Version: 4.2r4-12
> > > Severity: normal
> > > Tags: patch
> ...
>
> > I'm perfectly aware of the possibility to run autotools on fly in rules.
> > I simply disagree about that for a few reasons which can be summarized
> > in a simple way: doing that exposes to more FTBS errors during the
> > development cycle (when autotools versions change)
> > than doing it once with a known working set of tools when (and only when)
> > it is strictly required.
> >
> > It is the same reason that motivates me to use maintainer mode in
> > my own set of automake scripts for all programs I write.
Samuel, this answers your Message #10 on bug #639287.
> I know that there are issues with the autotools, but keeping patches
> 3.3MB (compared to 68k) with a _lot_ of stuff that can be generated is
> not reasonable, at least in my (and other peoples opinion). The patch has
> been build tested on both Linux and Hurd.
See above.
> From what I recall this
> software will be replaced by hdf5, when it moves from experimental,
> right?
According to the DM, libhdf4 will be continued together with hdf5?
> Anyway, I will create a new patch for bug #639287 to make it build for
> GNU/Hurd keeping the big patches (especially autotools), and make it as
> minimal as possible.
Attached is a minimal patch set to make libhdf4 build under GNU/Hurd.
Three patches are supplied, updating the original patches kfreebsd,
shared_fortran and autotools. Hopefully these can be applied to enable
the build of mathgl later on.
Thanks!
Index: libhdf4-4.2r4/HDF4/configure.ac
===================================================================
--- libhdf4-4.2r4.orig/HDF4/configure.ac 2010-01-14 11:15:49.000000000 +0100
+++ libhdf4-4.2r4/HDF4/configure.ac 2010-01-14 11:16:47.000000000 +0100
@@ -677,7 +677,7 @@
mips*-sgi-irix6_32*) BAR="irix32" ;;
mips*-sgi-irix5*) BAR="irix5" ;;
mips*-sgi-irix4*) BAR="irix4" ;;
- *-linux*) BAR="linux" ;;
+ *-linux*|*-k*bsd*-gnu|*-gnu*)BAR="linux" ;;
*-freebsd*) BAR="fbsd" ;;
ia64-*-*) BAR="ia64" ;;
*-ibm-aix*) BAR="aix" ;;
--- libhdf4-4.2r4.orig/debian/patches/shared_fortran 2011-08-24 19:18:50.000000000 +0200
+++ libhdf4-4.2r4/debian/patches/shared_fortran 2011-08-30 13:07:30.000000000 +0200
@@ -31990,7 +31990,7 @@
;;
- linux* | k*bsd*-gnu)
-+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
@@ -32191,7 +32191,7 @@
openbsd*)
with_gnu_ld=no
;;
-+ linux* | k*bsd*-gnu)
++ linux* | k*bsd*-gnu | gnu*)
+ link_all_deplibs=no
+ ;;
esac
@@ -32473,7 +32473,7 @@
# This must be Linux ELF.
-linux* | k*bsd*-gnu)
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -33777,7 +33777,7 @@
cygwin* | mingw* | cegcc*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
;;
-+ linux* | k*bsd*-gnu)
++ linux* | k*bsd*-gnu | gnu*)
+ link_all_deplibs_CXX=no
+ ;;
*)
@@ -33857,7 +33857,7 @@
# This must be Linux ELF.
-linux* | k*bsd*-gnu)
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -34224,7 +34224,7 @@
openbsd*)
with_gnu_ld=no
;;
-+ linux* | k*bsd*-gnu)
++ linux* | k*bsd*-gnu | gnu*)
+ link_all_deplibs_F77=no
+ ;;
esac
@@ -34491,7 +34491,7 @@
# This must be Linux ELF.
-linux* | k*bsd*-gnu)
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu| gnu*)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -35151,7 +35151,7 @@
mips*-sgi-irix5*) BAR="irix5" ;;
mips*-sgi-irix4*) BAR="irix4" ;;
- *-linux*) BAR="linux" ;;
-+ *-linux*|*-k*bsd*-gnu)BAR="linux" ;;
++ *-linux*|*-k*bsd*-gnu | *-gnu*)BAR="linux" ;;
*-freebsd*) BAR="fbsd" ;;
ia64-*-*) BAR="ia64" ;;
*-ibm-aix*) BAR="aix" ;;
--- libhdf4-4.2r4.orig/debian/patches/autotools 2011-08-24 19:18:50.000000000 +0200
+++ libhdf4-4.2r4/debian/patches/autotools 2011-08-30 13:24:24.000000000 +0200
@@ -31960,7 +31960,7 @@
;;
- linux* | k*bsd*-gnu)
-+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
@@ -32161,7 +32161,7 @@
openbsd*)
with_gnu_ld=no
;;
-+ linux* | k*bsd*-gnu)
++ linux* | k*bsd*-gnu | gnu*)
+ link_all_deplibs=no
+ ;;
esac
@@ -32443,7 +32443,7 @@
# This must be Linux ELF.
-linux* | k*bsd*-gnu)
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -33747,7 +33747,7 @@
cygwin* | mingw* | cegcc*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
;;
-+ linux* | k*bsd*-gnu)
++ linux* | k*bsd*-gnu | gnu*)
+ link_all_deplibs_CXX=no
+ ;;
*)
@@ -33827,7 +33827,7 @@
# This must be Linux ELF.
-linux* | k*bsd*-gnu)
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -34194,7 +34194,7 @@
openbsd*)
with_gnu_ld=no
;;
-+ linux* | k*bsd*-gnu)
++ linux* | k*bsd*-gnu | gnu*)
+ link_all_deplibs_F77=no
+ ;;
esac
@@ -34461,7 +34461,7 @@
# This must be Linux ELF.
-linux* | k*bsd*-gnu)
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -35121,7 +35121,7 @@
mips*-sgi-irix5*) BAR="irix5" ;;
mips*-sgi-irix4*) BAR="irix4" ;;
- *-linux*) BAR="linux" ;;
-+ *-linux*|*-k*bsd*-gnu)BAR="linux" ;;
++ *-linux*|*-k*bsd*-gnu | *-gnu*)BAR="linux" ;;
*-freebsd*) BAR="fbsd" ;;
ia64-*-*) BAR="ia64" ;;
*-ibm-aix*) BAR="aix" ;;
Reply to: