aqbanking/aqbanking.patch

Tue, 29 Mar 2011 20:04:34 +0200

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Tue, 29 Mar 2011 20:04:34 +0200
changeset 334
4a34d7a82eab
permissions
-rw-r--r--

Rework package yet again, correcting and introducing new buildconf logic:
Conditionally disable bootstrap stage comparison correctly, correct
english grammar, better find system as(1) and ld(1), indotruce detailed
optimization option messages, more completely guess cpu types, allow
profiled bootstrapping without a preinstalled GCC because many other
compilers have long since implemented 64-bit arithmetic, instruct make
to build sequentially (not in sparallel) when building a profiled
bootstrap as GCC online documents recommend, and generally improve
comment blocks.

The single most important correction in this changeset relates to the
GCC changed optimization policy since at least GCC 4.5, in which -march
is always passed and not always correctly guessed. In the case of this
package, allowing GCC to guess the architecture leads to wild build
errors at various subcomponents (zlib, libgcc, libiberty...) and
bootstrap stages. It seems quite platform specific, and the safest
approach to correcting this seems to be explicitly always specifying the
-march argument when bootstrapping GCC. Because the best choice 'native'
is not available when bootstrapping using a foreign (non GCC) compiler,
a guess is made according to rpmmacros l_platform in that case.

It is questionable as to whether these recent optimization changes
on the part of GCC or this package are compatible with each other,
or if either are complete or correct at all. At least applying these
corrections allows this package to build again in most cases test.

     1 Index: aqbanking-2.3.3/src/libs/aqbanking/Makefile.in
     2 --- aqbanking-2.3.3/src/libs/aqbanking/Makefile.in.orig	2006-01-28 00:56:18 +0100
     3 +++ aqbanking-2.3.3/src/libs/aqbanking/Makefile.in	2006-01-28 09:50:06 +0100
     4 @@ -525,7 +525,7 @@
     5   wcb.c\
     6   msgengine.c
     8 -libaqbanking_la_LIBADD = $(gwenhywfar_libs) \
     9 +libaqbanking_la_LIBADD = \
    10   jobs/libjobs.la \
    11   types/libtypes.la
    13 @@ -537,7 +537,7 @@
    14  libaqbanking_la_DEPENDENCIES = jobs/libjobs.la types/libtypes.la \
    15  	$(am__append_1)
    16  testlib_SOURCES = testlib.c
    17 -testlib_LDADD = libaqbanking.la
    18 +testlib_LDADD = libaqbanking.la $(gwenhywfar_libs)
    19  TESTS = testlib
    20  all: all-recursive
    22 Index: aqbanking-2.3.3/src/plugins/bankinfo/generic/Makefile.in
    23 --- aqbanking-2.3.3/src/plugins/bankinfo/generic/Makefile.in.orig	2006-01-28 00:56:42 +0100
    24 +++ aqbanking-2.3.3/src/plugins/bankinfo/generic/Makefile.in	2006-01-28 09:49:40 +0100
    25 @@ -476,7 +476,7 @@
    26  libbankinfo_la_SOURCES = \
    27   generic.c
    29 -libbankinfo_la_LIBADD = -L$(top_builddir)/src/libs/aqbanking $(aqbanking_internal_libs) $(gwenhywfar_libs)
    30 +libbankinfo_la_LIBADD =
    31  libbankinfo_la_LDFLAGS = $(STRIPALL)
    32  at_files = at/blz.idx at/bic.idx at/namloc.idx at/banks.data
    33  ch_files = ch/blz.idx ch/bic.idx ch/namloc.idx ch/banks.data
    34 Index: openhbci-0.9.18/src/openhbci/openhbci-config.in.in
    35 --- openhbci-0.9.18/src/openhbci/openhbci-config.in.in.orig	2003-05-18 23:46:36 +0200
    36 +++ openhbci-0.9.18/src/openhbci/openhbci-config.in.in	2006-01-28 09:49:40 +0100
    37 @@ -9,7 +9,7 @@
    38  	    result="$result @PROGRAM_INCLUDES@ -I$dir/include"
    39  	    ;;
    40  	--libraries)
    41 -	    result="$result -L$dir/lib @OPENHBCI_LIB@"
    42 +	    result="$result -L$dir/lib @OPENHBCI_LIB@ -lgwenhywfar"
    43  	    ;;
    44          --plugins)
    45              result="$result @PLUGIN_PATH@/@OPENHBCI_SO_VERSION@"
    46 Index: openhbci2-1.9.4/src/openhbci-tng/openhbci2-config.in.in
    47 --- openhbci2-1.9.4/src/openhbci-tng/openhbci2-config.in.in.orig	2004-05-20 03:33:53 +0200
    48 +++ openhbci2-1.9.4/src/openhbci-tng/openhbci2-config.in.in	2006-01-28 09:49:40 +0100
    49 @@ -9,7 +9,7 @@
    50  	    result="$result @PROGRAM_INCLUDES@ -I$dir/include"
    51  	    ;;
    52  	--libraries)
    53 -	    result="$result -L$dir/lib @OPENHBCI_LIB@"
    54 +	    result="$result -L$dir/lib @OPENHBCI_LIB@ -lgwenhywfar"
    55  	    ;;
    56          --plugins)
    57              result="$result @PLUGIN_PATH@/@OPENHBCI_SO_EFFECTIVE_VERSION@"
    58 Index: openhbci2-1.9.4/src/tools/hbcixml/Makefile.in
    59 --- openhbci2-1.9.4/src/tools/hbcixml/Makefile.in.orig	2006-01-20 12:09:55 +0100
    60 +++ openhbci2-1.9.4/src/tools/hbcixml/Makefile.in	2006-01-28 09:49:40 +0100
    61 @@ -218,7 +218,7 @@
    62  INCLUDES = -I../../../ -I../../../openhbci2 @PROGRAM_INCLUDES@ -I../../plugins/msg-xml
    63  noinst_HEADERS = loganalyzer.h
    64  hbcixml_SOURCES = hbcixml.cpp loganalyzer.cpp
    65 -hbcixml_LDADD = -L../../openhbci-tng -L../../openhbci-tng/openhbci-core @PROGRAM_LIBS@ ../../plugins/msg-xml/libmsgxml.la
    66 +hbcixml_LDADD = -L../../openhbci-tng -L../../openhbci-tng/openhbci-core @PROGRAM_LIBS@ ../../plugins/msg-xml/libmsgxml.la $(gwenhywfar_libs)
    67  all: all-am
    69  .SUFFIXES:

mercurial