- rel 3; build fixed (patches from gentoo)

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

diff --git a/fltk-link.patch b/fltk-link.patch
index 3fe34b0d59967444bd80d894b2085a427228fbc6..57c82222c6f8246418639a335573305c3f0b5229 100644 (file)
--- a/fltk-link.patch
+++ b/fltk-link.patch
@@ -1,82 +1,45 @@
---- fltk-1.1.3/src/Makefile.orig       2003-01-30 22:43:17.000000000 +0100
-+++ fltk-1.1.3/src/Makefile    2003-05-16 21:53:12.000000000 +0200
-@@ -200,7 +200,7 @@
- 
- libfltk.so.1.1: $(OBJECTS)
-       echo $(DSOCOMMAND) $@ ...
--      $(DSOCOMMAND) $@ $(OBJECTS) $(IMAGELIBS)
-+      $(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS)
-       -$(RM) libfltk.so
-       $(LN) libfltk.so.1.1 libfltk.so
- 
-@@ -230,9 +230,9 @@
-       $(LIBCOMMAND) $@ $(FLOBJECTS)
-       $(RANLIB) $@
- 
--libfltk_forms.so.1.1: $(FLOBJECTS)
-+libfltk_forms.so.1.1: $(FLOBJECTS) libfltk.so.1.1
-       echo $(DSOCOMMAND) $@ ...
--      $(DSOCOMMAND) $@ $(FLOBJECTS)
-+      $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk $(LDLIBS) $(IMAGELIBS)
-       -$(RM) libfltk_forms.so
-       $(LN) libfltk_forms.so.1.1 libfltk_forms.so
- 
-@@ -262,9 +262,9 @@
-       $(LIBCOMMAND) $@ $(GLOBJECTS)
-       $(RANLIB) $@
- 
--libfltk_gl.so.1.1: $(GLOBJECTS)
-+libfltk_gl.so.1.1: $(GLOBJECTS) libfltk.so.1.1
-       echo $(DSOCOMMAND) $@ ...
--      $(DSOCOMMAND) $@ $(GLOBJECTS)
-+      $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk $(GLDLIBS)
-       -$(RM) libfltk_gl.so
-       $(LN) libfltk_gl.so.1.1 libfltk_gl.so
- 
-@@ -294,9 +294,9 @@
-       $(LIBCOMMAND) $@ $(IMGOBJECTS)
-       $(RANLIB) $@
- 
--libfltk_images.so.1.1: $(IMGOBJECTS)
-+libfltk_images.so.1.1: $(IMGOBJECTS) libfltk.so.1.1
-       echo $(DSOCOMMAND) $@ ...
--      $(DSOCOMMAND) $@ $(IMGOBJECTS)
-+      $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. -lfltk $(LDLIBS) $(IMAGELIBS)
-       -$(RM) libfltk_images.so
-       $(LN) libfltk_images.so.1.1 libfltk_images.so
- 
---- fltk-1.1.3/configure.in.orig       2003-01-30 22:38:18.000000000 +0100
-+++ fltk-1.1.3/configure.in    2003-05-16 21:46:27.000000000 +0200
-@@ -169,7 +169,7 @@
-             FLDSONAME="libfltk_forms.so.$FL_API_VERSION"
-             GLDSONAME="libfltk_gl.so.$FL_API_VERSION"
-             IMGDSONAME="libfltk_images.so.$FL_API_VERSION"
--            DSOCOMMAND="\$(CXX) -Wl,-soname,\$@ \$(LDLIBS) -shared -fPIC $DEBUGFLAG -o"
-+            DSOCOMMAND="\$(CXX) -Wl,-soname,\$@ -shared -fPIC $DEBUGFLAG -o"
-           if test "$libdir" != "/usr/lib"; then
-                   DSOLINK="-Wl,-rpath,$libdir"
-             fi
-@@ -649,22 +649,7 @@
-     # Previous versions of GCC do not have the reliance on the stdc++
-     # or g++ libraries, so the extra supc++ library is not needed.
- 
--    AC_MSG_CHECKING(if libsupc++ is required)
--
--    SUPC="`$CXX -print-file-name=libsupc++.a 2>/dev/null`"
--    case "$SUPC" in
--      libsupc++.a*)
--          # Library not found, so this is and older GCC...
--          AC_MSG_RESULT(no)
--          ;;
--      *)
--            # This is gcc 3.x, and it knows of libsupc++, so we need it
--            LIBS="$LIBS -lsupc++"
--            AC_MSG_RESULT(yes)
--          ;;
--    esac
--
--    CXX="$CC"
-+    # PLD: we link all C++ programs against the same version of shared libstdc++.
- 
-     # Show all standard warnings + unused variables when compiling...
-     OPTIM="-Wall -Wunused $OPTIM"
+-- 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 @@
+ UNINSTALL_DESKTOP = @UNINSTALL_DESKTOP@
+ 
+ # Be quiet when building...
+-.SILENT:
++#.SILENT:
+ 
+ # Build commands and filename extensions...
+ .SUFFIXES:    .0 .1 .3 .6 .c .cxx .h .fl .man .o .z $(EXEEXT)
+--- fltk-1.1.8/src/Makefile~   2008-03-28 22:40:13.774424155 +0100
++++ fltk-1.1.8/src/Makefile    2008-03-28 22:46:26.665583815 +0100
+@@ -494,16 +494,16 @@
+       -$(INSTALL_DIR) $(DESTDIR)$(libdir)
+       -$(INSTALL_DIR) $(DESTDIR)$(bindir)
+       $(RM) $(DESTDIR)$(libdir)/$(LIBNAME)
++      $(RANLIB) $(LIBNAME)
++      $(RANLIB) $(FLLIBNAME)
++      $(RANLIB) $(IMGLIBNAME)
+       $(INSTALL_LIB) $(LIBNAME) $(DESTDIR)$(libdir)
+       $(INSTALL_LIB) $(FLLIBNAME) $(DESTDIR)$(libdir)
+       $(INSTALL_LIB) $(IMGLIBNAME) $(DESTDIR)$(libdir)
+-      $(RANLIB) $(DESTDIR)$(libdir)/$(LIBNAME)
+-      $(RANLIB) $(DESTDIR)$(libdir)/$(FLLIBNAME)
+       if test x$(GLLIBNAME) != x; then \
++              $(RANLIB) $(GLLIBNAME); \
+               $(INSTALL_LIB) $(GLLIBNAME) $(DESTDIR)$(libdir); \
+-              $(RANLIB) $(DESTDIR)$(libdir)/$(GLLIBNAME); \
+       fi
+-      $(RANLIB) $(DESTDIR)$(libdir)/$(IMGLIBNAME)
+       if test x$(DSONAME) = xlibfltk.so.1.1; then\
+               $(RM) $(DESTDIR)$(libdir)/libfltk.so*;\
+               $(INSTALL_LIB) libfltk.so.1.1 $(DESTDIR)$(libdir); \
+--- fltk-1.1.8/configure.in~   2008-03-28 23:00:54.660412250 +0100
++++ fltk-1.1.8/configure.in    2008-03-28 23:15:59.012846871 +0100
+@@ -225,7 +225,7 @@
+           ;;
+     esac
+ 
+-    LINKSHARED="-L../src -lfltk_images$SHAREDSUFFIX -lfltk_forms$SHAREDSUFFIX -lfltk$SHAREDSUFFIX"
++    LINKSHARED="-l:../src/libfltk_images.so -l:../src/libfltk_forms.so -l:../src/libfltk.so"
+ else
+     DSOCOMMAND="echo"
+     DSOLINK=""