- rel 3; build fixed (patches from gentoo)

[packages/fltk.git] / fltk-link.patch

diff --git a/fltk-link.patch b/fltk-link.patch
index 3844406e21042d5a1b486220daabf7a360764afb..57c82222c6f8246418639a335573305c3f0b5229 100644 (file)
--- a/fltk-link.patch
+++ b/fltk-link.patch
@@ -1,52 +1,3 @@
---- fltk-1.1.4/src/Makefile.orig       2003-08-24 15:09:06.000000000 +0200
-+++ fltk-1.1.4/src/Makefile    2004-04-07 00:16:16.828411328 +0200
-@@ -200,7 +200,7 @@
- 
- libfltk.so.1.1: $(OBJECTS)
-       echo $(DSOCOMMAND) $@ ...
--      $(DSOCOMMAND) $@ $(OBJECTS)
-+      $(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS)
-       $(RM) libfltk.so
-       $(LN) libfltk.so.1.1 libfltk.so
- 
-@@ -236,7 +236,7 @@
- 
- libfltk_forms.so.1.1: $(FLOBJECTS) libfltk.so.1.1
-       echo $(DSOCOMMAND) $@ ...
--      $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk
-+      $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk $(LDLIBS) $(IMAGELIBS)
-       $(RM) libfltk_forms.so
-       $(LN) libfltk_forms.so.1.1 libfltk_forms.so
- 
-@@ -272,7 +272,7 @@
- 
- libfltk_gl.so.1.1: $(GLOBJECTS) libfltk.so.1.1
-       echo $(DSOCOMMAND) $@ ...
--      $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk
-+      $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk $(GLDLIBS)
-       $(RM) libfltk_gl.so
-       $(LN) libfltk_gl.so.1.1 libfltk_gl.so
- 
-@@ -308,7 +308,7 @@
- 
- libfltk_images.so.1.1: $(IMGOBJECTS) libfltk.so.1.1
-       echo $(DSOCOMMAND) $@ ...
--      $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk
-+      $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk $(LDLIBS) $(IMAGELIBS)
-       $(RM) libfltk_images.so
-       $(LN) libfltk_images.so.1.1 libfltk_images.so
- 
---- fltk-1.1.8/configure.in~   2008-03-28 10:38:36.000000000 +0100
-+++ fltk-1.1.8/configure.in    2008-03-28 10:38:50.000000000 +0100
-@@ -179,7 +179,7 @@
-             FLDSONAME="libfltk_forms.so.$FL_API_VERSION"
-             GLDSONAME="libfltk_gl.so.$FL_API_VERSION"
-             IMGDSONAME="libfltk_images.so.$FL_API_VERSION"
--            DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -Wl,-soname,\$@ \$(LDLIBS) -shared -fPIC $DEBUGFLAG -o"
-+            DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -Wl,-soname,\$@ -shared -fPIC $DEBUGFLAG -o"
-           if test "x$libdir" != "x/usr/lib"; then
-                   DSOLINK="-Wl,-rpath,$libdir"
-             fi
 -- fltk-1.1.8/makeinclude.in~  2008-03-28 22:31:50.280354265 +0100
 +++ fltk-1.1.8/makeinclude.in  2008-03-28 22:31:55.920623903 +0100
 @@ -127,7 +127,7 @@