Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/fltk/patches/fltk-1.3.2-as-needed.patch

    Contents of /trunk/fltk/patches/fltk-1.3.2-as-needed.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 2081 - (show annotations) (download)
    Tue Feb 19 09:33:44 2013 UTC (11 years, 2 months ago) by niro
    File size: 5672 byte(s) 
    -fltk patches
    1 cairo/Makefile | 4 ++--
    2 configure.in | 9 +++------
    3 src/Makefile | 24 ++++++++++++------------
    4 3 files changed, 17 insertions(+), 20 deletions(-)
    5
    6 diff --git a/cairo/Makefile b/cairo/Makefile
    7 index 3cefc9f..445cd9c 100644
    8 --- a/cairo/Makefile
    9 +++ b/cairo/Makefile
    10 @@ -48,13 +48,13 @@ $(CAIROLIBNAME): $(CAIROOBJECTS)
    11
    12 libfltk_cairo.so.1.3: $(CAIROOBJECTS) ../src/libfltk.so.1.3
    13 echo $(DSOCOMMAND) $@ ...
    14 - $(DSOCOMMAND) $@ $(CAIROOBJECTS) -L../src -lfltk
    15 + $(DSOCOMMAND) $@ $(CAIROOBJECTS) -L../src -lfltk $(CAIROLIBS)
    16 $(RM) libfltk_cairo.so
    17 $(LN) $(CAIRODSONAME) libfltk_cairo.so
    18
    19 libfltk_cairo.sl.1.3: $(CAIROOBJECTS) ../src/libfltk.sl.1.3
    20 echo $(DSOCOMMAND) $@ ...
    21 - $(DSOCOMMAND) $@ $(CAIROOBJECTS) -L../src -lfltk
    22 + $(DSOCOMMAND) $@ $(CAIROOBJECTS) -L../src -lfltk $(CAIROLIBS)
    23 $(RM) libfltk_cairo.sl
    24 $(LN) libfltk_cairo.sl.1.3 libfltk_cairo.sl
    25
    26 diff --git a/configure.in b/configure.in
    27 index 762d3f9..56a5d97 100644
    28 --- a/configure.in
    29 +++ b/configure.in
    30 @@ -166,7 +166,7 @@ else
    31 dnl we do not rely on pkg-config .
    32 CAIRODIR="cairo"
    33 CAIROFLAGS="`pkg-config --cflags cairo`"
    34 - CAIROLIBS="-lcairo -lpixman-1"
    35 + CAIROLIBS="`pkg-config --libs cairo pixman-1`"
    36 CXXFLAGS="$CAIROFLAGS $CXXFLAGS"
    37 LINKFLTKCAIRO="../lib/libfltk_cairo.a"
    38 FLTKCAIROOPTION="-L ../cairo -lfltk_cairo$SHAREDSUFFIX"
    39 @@ -280,10 +280,7 @@ if test x$enable_shared = xyes; then
    40 GLDSONAME="libfltk_gl.so.$FL_API_VERSION"
    41 IMGDSONAME="libfltk_images.so.$FL_API_VERSION"
    42 CAIRODSONAME="libfltk_cairo.so.$FL_API_VERSION"
    43 - DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -Wl,-soname,\$@ \$(LDLIBS) -shared -fPIC $DEBUGFLAG -o"
    44 - if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/usr/lib64"; then
    45 - DSOLINK="-Wl,-rpath,$libdir"
    46 - fi
    47 + DSOCOMMAND="\$(CXX) \$(DSOFLAGS) \$(LDFLAGS) -Wl,-soname,\$@ -shared -fPIC $DEBUGFLAG -o"
    48 ;;
    49 AIX*)
    50 DSONAME="libfltk_s.a"
    51 diff --git a/src/Makefile b/src/Makefile
    52 index 7806854..a43106e 100644
    53 --- a/src/Makefile
    54 +++ b/src/Makefile
    55 @@ -240,13 +240,13 @@ $(LIBNAME): $(OBJECTS)
    56
    57 libfltk.so.1.3: $(OBJECTS)
    58 echo $(DSOCOMMAND) $@ ...
    59 - $(DSOCOMMAND) $@ $(OBJECTS)
    60 + $(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS)
    61 $(RM) libfltk.so
    62 $(LN) libfltk.so.1.3 libfltk.so
    63
    64 libfltk.sl.1.3: $(OBJECTS)
    65 echo $(DSOCOMMAND) $@ ...
    66 - $(DSOCOMMAND) $@ $(OBJECTS)
    67 + $(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS)
    68 $(RM) libfltk.sl
    69 $(LN) libfltk.sl.1.3 libfltk.sl
    70
    71 @@ -262,7 +262,7 @@ libfltk.1.3.dylib: $(OBJECTS)
    72
    73 libfltk_s.a: $(OBJECTS)
    74 echo $(DSOCOMMAND) libfltk_s.o ...
    75 - $(DSOCOMMAND) libfltk_s.o $(OBJECTS) $(IMAGELIBS)
    76 + $(DSOCOMMAND) libfltk_s.o $(OBJECTS) $(IMAGELIBS) $(LDLIBS)
    77 echo $(LIBCOMMAND) libfltk_s.a libfltk_s.o
    78 $(RM) $@
    79 $(LIBCOMMAND) libfltk_s.a libfltk_s.o
    80 @@ -276,13 +276,13 @@ $(FLLIBNAME): $(FLOBJECTS)
    81
    82 libfltk_forms.so.1.3: $(FLOBJECTS) libfltk.so.1.3
    83 echo $(DSOCOMMAND) $@ ...
    84 - $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk
    85 + $(DSOCOMMAND) $@ $(FLOBJECTS) $(LDLIBS) -L. -lfltk
    86 $(RM) libfltk_forms.so
    87 $(LN) libfltk_forms.so.1.3 libfltk_forms.so
    88
    89 libfltk_forms.sl.1.3: $(FLOBJECTS) libfltk.sl.1.3
    90 echo $(DSOCOMMAND) $@ ...
    91 - $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk
    92 + $(DSOCOMMAND) $@ $(FLOBJECTS) $(LDLIBS) -L. -lfltk
    93 $(RM) libfltk_forms.sl
    94 $(LN) libfltk_forms.sl.1.3 libfltk_forms.sl
    95
    96 @@ -298,7 +298,7 @@ libfltk_forms.1.3.dylib: $(FLOBJECTS) libfltk.1.3.dylib
    97
    98 libfltk_forms_s.a: $(FLOBJECTS)
    99 echo $(DSOCOMMAND) libfltk_forms_s.o ...
    100 - $(DSOCOMMAND) libfltk_forms_s.o $(FLOBJECTS)
    101 + $(DSOCOMMAND) libfltk_forms_s.o $(FLOBJECTS) $(LDLIBS)
    102 echo $(LIBCOMMAND) libfltk_forms_s.a libfltk_forms_s.o
    103 $(RM) $@
    104 $(LIBCOMMAND) libfltk_forms_s.a libfltk_forms_s.o
    105 @@ -312,13 +312,13 @@ $(GLLIBNAME): $(GLOBJECTS)
    106
    107 libfltk_gl.so.1.3: $(GLOBJECTS) libfltk.so.1.3
    108 echo $(DSOCOMMAND) $@ ...
    109 - $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk
    110 + $(DSOCOMMAND) $@ $(GLOBJECTS) $(LDLIBS) -L. -lfltk $(GLDLIBS) $(GLLIB)
    111 $(RM) libfltk_gl.so
    112 $(LN) libfltk_gl.so.1.3 libfltk_gl.so
    113
    114 libfltk_gl.sl.1.3: $(GLOBJECTS) libfltk.sl.1.3
    115 echo $(DSOCOMMAND) $@ ...
    116 - $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk
    117 + $(DSOCOMMAND) $@ $(GLOBJECTS) $(LDLIBS) -L. -lfltk
    118 $(RM) libfltk_gl.sl
    119 $(LN) libfltk_gl.sl.1.3 libfltk_gl.sl
    120
    121 @@ -334,7 +334,7 @@ libfltk_gl.1.3.dylib: $(GLOBJECTS) libfltk.1.3.dylib
    122
    123 libfltk_gl_s.a: $(GLOBJECTS)
    124 echo $(DSOCOMMAND) libfltk_gl_s.o ...
    125 - $(DSOCOMMAND) libfltk_gl_s.o $(GLOBJECTS)
    126 + $(DSOCOMMAND) libfltk_gl_s.o $(GLOBJECTS) $(LDLIBS) $(GLLIB)
    127 echo $(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o
    128 $(RM) $@
    129 $(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o
    130 @@ -348,13 +348,13 @@ $(IMGLIBNAME): $(IMGOBJECTS)
    131
    132 libfltk_images.so.1.3: $(IMGOBJECTS) libfltk.so.1.3
    133 echo $(DSOCOMMAND) $@ ...
    134 - $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk
    135 + $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) $(LDLIBS) -lfltk
    136 $(RM) libfltk_images.so
    137 $(LN) libfltk_images.so.1.3 libfltk_images.so
    138
    139 libfltk_images.sl.1.3: $(IMGOBJECTS) libfltk.sl.1.3
    140 echo $(DSOCOMMAND) $@ ...
    141 - $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk
    142 + $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) $(LDLIBS) -lfltk
    143 $(RM) libfltk_images.sl
    144 $(LN) libfltk_images.sl.1.3 libfltk_images.sl
    145
    146 @@ -370,7 +370,7 @@ libfltk_images.1.3.dylib: $(IMGOBJECTS) libfltk.1.3.dylib
    147
    148 libfltk_images_s.a: $(IMGOBJECTS)
    149 echo $(DSOCOMMAND) libfltk_images_s.o ...
    150 - $(DSOCOMMAND) libfltk_images_s.o $(IMGOBJECTS)
    151 + $(DSOCOMMAND) libfltk_images_s.o $(IMGOBJECTS) $(LDLIBS)
    152 echo $(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o
    153 $(RM) $@
    154 $(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o