Fri, 16 Jan 2009 10:58:21 +0100
Correct and improve code logic, buildconf, and packaging. In particular:
1. Use descriptive variable names <var>libs instead of just <var>.
2. Although Nokia states in all Qt builds that 'NOTE: When linking
against OpenSSL, you can override the default library names
through OPENSSL_LIBS.' and even gives an example, their own
configuration logic rejects such an attempt. Correct this by
hard coding the OpenSSL library string in the configure script.
3. Consistently use the whitespace substitution [\t ] throughout.
4. Patch the buggy INCPATH of SQL plugin Qmake project files.
5. Add the 'x11' configuration variable to the qtconfig Qmake
project using the src/gui/gui.pro file as a model. This is
needed for qtconfig although not in other tools, because
the qtconfig buildconf indirectly includes qt_x11_p.h which
is dependent on X11 headers.
6. Avoid 'ld.so: fatal: hardware capability unsupported: SSE2 AMD_3DNow'
on platforms for which the config.tests/unix/[3dnow|sse2] succeed
although unsopported at run time by testing for the x86-64
instruction set at build time and regulating hardware capabilities.
7. Correctly install the desinger plugin by explicitly building it.
8. Remove custom plugin installation logic which is unnecessary.
9. Correct removal of temporary paths from shared object files.
1 #!/bin/sh
2 ##
3 ## rpm-config -- OpenPKG RPM Library Build Utility
4 ## Copyright (c) 2000-2007 OpenPKG Foundation e.V. <http://openpkg.net/>
5 ## Copyright (c) 2000-2007 Ralf S. Engelschall <http://engelschall.com/>
6 ##
7 ## Permission to use, copy, modify, and distribute this software for
8 ## any purpose with or without fee is hereby granted, provided that
9 ## the above copyright notice and this permission notice appear in all
10 ## copies.
11 ##
12 ## THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
13 ## WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
14 ## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
15 ## IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
16 ## CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
17 ## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
18 ## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
19 ## USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
20 ## ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
21 ## OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
22 ## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
23 ## SUCH DAMAGE.
24 ##
25 ## rpm-config.sh: program
26 ##
28 rpm_version="@l_version@"
29 rpm_cc="@l_cc@"
30 rpm_cppflags="@l_cppflags@"
31 rpm_cflags="@l_cflags@"
32 rpm_ldflags="@l_ldflags@"
33 rpm_libs="@l_libs@"
35 usage="rpm-config"
36 usage="$usage [--cc] [--cppflags] [--cflags] [--ldflags] [--libs]"
37 usage="$usage [--help] [--version]"
38 if [ $# -eq 0 ]; then
39 echo "rpm-config:Error: Invalid option" 1>&2
40 echo "rpm-config:Usage: $usage" 1>&2
41 exit 1
42 fi
44 output=''
45 prev=''
46 for option
47 do
48 if [ ".$prev" != . ]; then
49 eval "$prev=\$option"
50 prev=''
51 continue
52 fi
53 case "$option" in
54 -*=*) optarg=`echo "$option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
55 *) optarg='' ;;
56 esac
57 case "$option" in
58 --help|-h)
59 echo "Usage: $usage"
60 exit 0
61 ;;
62 --version|-v)
63 echo "OpenPKG RPM $rpm_version"
64 exit 0
65 ;;
66 --cc)
67 output="$output $rpm_cc"
68 ;;
69 --cppflags)
70 output="$output $rpm_cppflags"
71 ;;
72 --cflags)
73 output="$output $rpm_cflags"
74 ;;
75 --ldflags)
76 output="$output $rpm_ldflags"
77 ;;
78 --libs)
79 output="$output $rpm_libs"
80 ;;
81 * )
82 echo "rpm-config:Error: Invalid option" 1>&2
83 echo "rpm-config:Usage: $usage" 1>&2
84 exit 1;
85 ;;
86 esac
87 done
88 if [ ".$prev" != . ]; then
89 echo "rpm-config:Error: missing argument to --`echo $prev | sed 's/_/-/g'`" 1>&2
90 exit 1
91 fi
93 if [ ".$output" != . ]; then
94 echo "$output" | sed -e 's/^ *//' -e 's/ *$//'
95 fi