fltk-1.1.9-as-needed.patch

   1 diff -Nur fltk-1.1.9.orig/configure.in fltk-1.1.9/configure.in
   2 --- fltk-1.1.9.orig/configure.in        2009-01-08 17:53:52.000000000 +0000
   3 +++ fltk-1.1.9/configure.in     2009-01-09 14:11:39.000000000 +0000
   4 @@ -179,10 +179,7 @@
   5              FLDSONAME="libfltk_forms.so.$FL_API_VERSION"
   6              GLDSONAME="libfltk_gl.so.$FL_API_VERSION"
   7              IMGDSONAME="libfltk_images.so.$FL_API_VERSION"
   8 -            DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -Wl,-soname,\$@ \$(LDLIBS) -shared -fPIC $DEBUGFLAG -o"
   9 -           if test "x$libdir" != "x/usr/lib"; then
  10 -                   DSOLINK="-Wl,-rpath,$libdir"
  11 -            fi
  12 +            DSOCOMMAND="\$(CXX) \$(DSOFLAGS) \$(LDFLAGS) -Wl,-soname,\$@ -shared -fPIC $DEBUGFLAG -o"
  13             ;;
  14         AIX*)
  15              DSONAME="libfltk_s.a"
  16 diff -Nur fltk-1.1.9.orig/src/Makefile fltk-1.1.9/src/Makefile
  17 --- fltk-1.1.9.orig/src/Makefile        2009-01-08 17:53:51.000000000 +0000
  18 +++ fltk-1.1.9/src/Makefile     2009-01-09 14:08:53.000000000 +0000
  19 @@ -210,13 +210,13 @@
  20
  21  libfltk.so.1.1: $(OBJECTS)
  22         echo $(DSOCOMMAND) $@ ...
  23 -       $(DSOCOMMAND) $@ $(OBJECTS)
  24 +       $(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS)
  25         $(RM) libfltk.so
  26         $(LN) libfltk.so.1.1 libfltk.so
  27
  28  libfltk.sl.1.1: $(OBJECTS)
  29         echo $(DSOCOMMAND) $@ ...
  30 -       $(DSOCOMMAND) $@ $(OBJECTS)
  31 +       $(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS)
  32         $(RM) libfltk.sl
  33         $(LN) libfltk.sl.1.1 libfltk.sl
  34
  35 @@ -232,7 +232,7 @@
  36
  37  libfltk_s.a: $(OBJECTS)
  38         echo $(DSOCOMMAND) libfltk_s.o ...
  39 -       $(DSOCOMMAND) libfltk_s.o $(OBJECTS) $(IMAGELIBS)
  40 +       $(DSOCOMMAND) libfltk_s.o $(OBJECTS) $(IMAGELIBS) $(LDLIBS)
  41         echo $(LIBCOMMAND) libfltk_s.a libfltk_s.o
  42         $(RM) $@
  43         $(LIBCOMMAND) libfltk_s.a libfltk_s.o
  44 @@ -246,13 +246,13 @@
  45
  46  libfltk_forms.so.1.1: $(FLOBJECTS) libfltk.so.1.1
  47         echo $(DSOCOMMAND) $@ ...
  48 -       $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk
  49 +       $(DSOCOMMAND) $@ $(FLOBJECTS) $(LDLIBS) -L. -lfltk
  50         $(RM) libfltk_forms.so
  51         $(LN) libfltk_forms.so.1.1 libfltk_forms.so
  52
  53  libfltk_forms.sl.1.1: $(FLOBJECTS) libfltk.sl.1.1
  54         echo $(DSOCOMMAND) $@ ...
  55 -       $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk
  56 +       $(DSOCOMMAND) $@ $(FLOBJECTS) $(LDLIBS) -L. -lfltk
  57         $(RM) libfltk_forms.sl
  58         $(LN) libfltk_forms.sl.1.1 libfltk_forms.sl
  59
  60 @@ -268,7 +268,7 @@
  61
  62  libfltk_forms_s.a: $(FLOBJECTS)
  63         echo $(DSOCOMMAND) libfltk_forms_s.o ...
  64 -       $(DSOCOMMAND) libfltk_forms_s.o $(FLOBJECTS)
  65 +       $(DSOCOMMAND) libfltk_forms_s.o $(FLOBJECTS) $(LDLIBS)
  66         echo $(LIBCOMMAND) libfltk_forms_s.a libfltk_forms_s.o
  67         $(RM) $@
  68         $(LIBCOMMAND) libfltk_forms_s.a libfltk_forms_s.o
  69 @@ -282,13 +282,13 @@
  70
  71  libfltk_gl.so.1.1: $(GLOBJECTS) libfltk.so.1.1
  72         echo $(DSOCOMMAND) $@ ...
  73 -       $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk
  74 +       $(DSOCOMMAND) $@ $(GLOBJECTS) $(LDLIBS) -L. -lfltk
  75         $(RM) libfltk_gl.so
  76         $(LN) libfltk_gl.so.1.1 libfltk_gl.so
  77
  78  libfltk_gl.sl.1.1: $(GLOBJECTS) libfltk.sl.1.1
  79         echo $(DSOCOMMAND) $@ ...
  80 -       $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk
  81 +       $(DSOCOMMAND) $@ $(GLOBJECTS) $(LDLIBS) -L. -lfltk
  82         $(RM) libfltk_gl.sl
  83         $(LN) libfltk_gl.sl.1.1 libfltk_gl.sl
  84
  85 @@ -304,7 +304,7 @@
  86
  87  libfltk_gl_s.a: $(GLOBJECTS)
  88         echo $(DSOCOMMAND) libfltk_gl_s.o ...
  89 -       $(DSOCOMMAND) libfltk_gl_s.o $(GLOBJECTS)
  90 +       $(DSOCOMMAND) libfltk_gl_s.o $(GLOBJECTS) $(LDLIBS)
  91         echo $(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o
  92         $(RM) $@
  93         $(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o
  94 @@ -318,13 +318,13 @@
  95
  96  libfltk_images.so.1.1: $(IMGOBJECTS) libfltk.so.1.1
  97         echo $(DSOCOMMAND) $@ ...
  98 -       $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk
  99 +       $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) $(LDLIBS) -lfltk
 100         $(RM) libfltk_images.so
 101         $(LN) libfltk_images.so.1.1 libfltk_images.so
 102
 103  libfltk_images.sl.1.1: $(IMGOBJECTS) libfltk.sl.1.1
 104         echo $(DSOCOMMAND) $@ ...
 105 -       $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk
 106 +       $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) $(LDLIBS) -lfltk
 107         $(RM) libfltk_images.sl
 108         $(LN) libfltk_images.sl.1.1 libfltk_images.sl
 109
 110 @@ -340,7 +340,7 @@
 111
 112  libfltk_images_s.a: $(IMGOBJECTS)
 113         echo $(DSOCOMMAND) libfltk_images_s.o ...
 114 -       $(DSOCOMMAND) libfltk_images_s.o $(IMGOBJECTS)
 115 +       $(DSOCOMMAND) libfltk_images_s.o $(IMGOBJECTS) $(LDLIBS)
 116         echo $(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o
 117         $(RM) $@
 118         $(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o