Annotation of /trunk/fltk/patches/fltk-1.3.3-as-needed.patch
Parent Directory | Revision Log
Revision 2529 -
(hide annotations)
(download)
Thu Jan 15 12:06:05 2015 UTC (9 years, 8 months ago) by niro
File size: 2798 byte(s)
Thu Jan 15 12:06:05 2015 UTC (9 years, 8 months ago) by niro
File size: 2798 byte(s)
-use dyn libs to fis as-needed issues
1 | niro | 2529 | diff -Naur fltk-1.3.3-orig/fltk-config.in fltk-1.3.3/fltk-config.in |
2 | --- fltk-1.3.3-orig/fltk-config.in 2014-12-31 15:43:07.203519633 -0500 | ||
3 | +++ fltk-1.3.3/fltk-config.in 2014-12-31 15:49:01.636277725 -0500 | ||
4 | @@ -54,21 +54,6 @@ | ||
5 | bindir="$selfdir/fluid" | ||
6 | includedir="$selfdir" | ||
7 | libdir="$selfdir/lib" | ||
8 | - | ||
9 | - if test -f "$libdir/libfltk_jpeg.a"; then | ||
10 | - CFLAGS="-I$includedir/jpeg $CFLAGS" | ||
11 | - CXXFLAGS="-I$includedir/jpeg $CXXFLAGS" | ||
12 | - fi | ||
13 | - | ||
14 | - if test -f "$libdir/libfltk_z.a"; then | ||
15 | - CFLAGS="-I$includedir/zlib $CFLAGS" | ||
16 | - CXXFLAGS="-I$includedir/zlib $CXXFLAGS" | ||
17 | - fi | ||
18 | - | ||
19 | - if test -f "$libdir/libfltk_png.a"; then | ||
20 | - CFLAGS="-I$includedir/png $CFLAGS" | ||
21 | - CXXFLAGS="-I$includedir/png $CXXFLAGS" | ||
22 | - fi | ||
23 | fi | ||
24 | |||
25 | if test -d $includedir/FL/images; then | ||
26 | @@ -76,11 +61,6 @@ | ||
27 | CXXFLAGS="-I$includedir/FL/images $CXXFLAGS" | ||
28 | fi | ||
29 | |||
30 | -if test -f "$libdir/libfltk_cairo.a"; then | ||
31 | - CFLAGS="$CAIROFLAGS $CFLAGS" | ||
32 | - CXXFLAGS="$CAIROFLAGS $CXXFLAGS" | ||
33 | -fi | ||
34 | - | ||
35 | # libraries to link with: | ||
36 | LIBNAME="@LIBNAME@" | ||
37 | DSONAME="@DSONAME@" | ||
38 | @@ -230,25 +210,20 @@ | ||
39 | fi | ||
40 | |||
41 | # Calculate needed libraries | ||
42 | -LDSTATIC="$libdir/libfltk.a $LDLIBS" | ||
43 | LDLIBS="-lfltk$SHAREDSUFFIX $LDLIBS" | ||
44 | |||
45 | if test x$use_forms = xyes; then | ||
46 | LDLIBS="-lfltk_forms$SHAREDSUFFIX $LDLIBS" | ||
47 | - LDSTATIC="$libdir/libfltk_forms.a $LDSTATIC" | ||
48 | fi | ||
49 | if test x$use_gl = xyes; then | ||
50 | LDLIBS="-lfltk_gl$SHAREDSUFFIX @GLLIB@ $LDLIBS" | ||
51 | - LDSTATIC="$libdir/libfltk_gl.a @GLLIB@ $LDSTATIC" | ||
52 | fi | ||
53 | if test x$use_images = xyes; then | ||
54 | LDLIBS="-lfltk_images$SHAREDSUFFIX $IMAGELIBS $LDLIBS" | ||
55 | - LDSTATIC="$libdir/libfltk_images.a $STATICIMAGELIBS $LDSTATIC" | ||
56 | fi | ||
57 | |||
58 | if test x$use_cairo = xyes; then | ||
59 | LDLIBS="-lfltk_cairo$SHAREDSUFFIX $CAIROLIBS $LDLIBS" | ||
60 | - LDSTATIC="$libdir/libfltk_cairo.a $CAIROLIBS $LDSTATIC" | ||
61 | fi | ||
62 | |||
63 | LDLIBS="$DSOLINK $LDFLAGS $libs $LDLIBS" | ||
64 | @@ -359,26 +334,26 @@ | ||
65 | fi | ||
66 | |||
67 | if test "$echo_libs" = "yes"; then | ||
68 | - USELIBS="$libdir/libfltk.a" | ||
69 | + USELIBS="$libdir/libfltk.so" | ||
70 | |||
71 | if test x$use_forms = xyes; then | ||
72 | - USELIBS="$libdir/libfltk_forms.a $USELIBS" | ||
73 | + USELIBS="$libdir/libfltk_forms.so $USELIBS" | ||
74 | fi | ||
75 | |||
76 | if test x$use_gl = xyes; then | ||
77 | - USELIBS="$libdir/libfltk_gl.a $USELIBS" | ||
78 | + USELIBS="$libdir/libfltk_gl.so $USELIBS" | ||
79 | fi | ||
80 | |||
81 | if test x$use_cairo = xyes; then | ||
82 | - USELIBS="$libdir/libfltk_cairo.a $USELIBS" | ||
83 | + USELIBS="$libdir/libfltk_cairo.so $USELIBS" | ||
84 | fi | ||
85 | |||
86 | if test x$use_images = xyes; then | ||
87 | - USELIBS="$libdir/libfltk_images.a $USELIBS" | ||
88 | + USELIBS="$libdir/libfltk_images.so $USELIBS" | ||
89 | |||
90 | for lib in fltk_jpeg fltk_png fltk_z; do | ||
91 | - if test -f $libdir/lib$lib.a; then | ||
92 | - USELIBS="$libdir/lib$lib.a $USELIBS" | ||
93 | + if test -f $libdir/lib$lib.so; then | ||
94 | + USELIBS="$libdir/lib$lib.so $USELIBS" | ||
95 | fi | ||
96 | done | ||
97 | fi |