SOURCES: fltk-link.patch - updated.
pluto
pluto at pld-linux.org
Thu Aug 17 10:25:27 CEST 2006
Author: pluto Date: Thu Aug 17 08:25:27 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated.
---- Files affected:
SOURCES:
fltk-link.patch (1.4 -> 1.5)
---- Diffs:
================================================================
Index: SOURCES/fltk-link.patch
diff -u SOURCES/fltk-link.patch:1.4 SOURCES/fltk-link.patch:1.5
--- SOURCES/fltk-link.patch:1.4 Thu Jan 13 08:01:01 2005
+++ SOURCES/fltk-link.patch Thu Aug 17 10:25:22 2006
@@ -31,8 +31,8 @@
libfltk_images.so.1.1: $(IMGOBJECTS) libfltk.so.1.1
echo $(DSOCOMMAND) $@ ...
-- $(DSOCOMMAND) $@ $(IMGOBJECTS) $(IMAGELIBS) -L. -lfltk
-+ $(DSOCOMMAND) $@ $(IMGOBJECTS) $(IMAGELIBS) -L. -lfltk $(LDLIBS) $(IMAGELIBS)
+- $(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
@@ -47,27 +47,3 @@
if test "x$libdir" != "x/usr/lib"; then
DSOLINK="-Wl,-rpath,$libdir"
fi
-@@ -653,22 +653,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"
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/fltk-link.patch?r1=1.4&r2=1.5&f=u
More information about the pld-cvs-commit
mailing list