Author: witekfl Date: Sun Dec 11 21:05:15 2011 GMT Module: packages Tag: HEAD ---- Log message: - new, patch for 1.3.0
---- Files affected: packages/fltk: fltk-1.3.0-as-needed.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/fltk/fltk-1.3.0-as-needed.patch diff -u /dev/null packages/fltk/fltk-1.3.0-as-needed.patch:1.1 --- /dev/null Sun Dec 11 22:05:15 2011 +++ packages/fltk/fltk-1.3.0-as-needed.patch Sun Dec 11 22:05:10 2011 @@ -0,0 +1,117 @@ +--- fltk-1.3.0/configure.in.orig 2011-03-06 17:54:58.000000000 +0100 ++++ fltk-1.3.0/configure.in 2011-12-11 18:11:20.000000000 +0100 +@@ -280,10 +280,7 @@ + GLDSONAME="libfltk_gl.so.$FL_API_VERSION" + IMGDSONAME="libfltk_images.so.$FL_API_VERSION" + CAIRODSONAME="libfltk_cairo.so.$FL_API_VERSION" +- DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -Wl,-soname,\$@ \$(LDLIBS) -shared -fPIC $DEBUGFLAG -o" +- if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/usr/lib64"; then +- DSOLINK="-Wl,-rpath,$libdir" +- fi ++ DSOCOMMAND="\$(CXX) \$(DSOFLAGS) \$(LDFLAGS) -Wl,-soname,\$@ -shared -fPIC $DEBUGFLAG -o" + ;; + AIX*) + DSONAME="libfltk_s.a" + +--- fltk-1.3.0/src/Makefile.orig 2011-02-06 15:08:08.000000000 +0100 ++++ fltk-1.3.0/src/Makefile 2011-12-11 18:17:55.000000000 +0100 +@@ -240,13 +240,13 @@ + + libfltk.so.1.3: $(OBJECTS) + echo $(DSOCOMMAND) $@ ... +- $(DSOCOMMAND) $@ $(OBJECTS) ++ $(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS) + $(RM) libfltk.so + $(LN) libfltk.so.1.3 libfltk.so + + libfltk.sl.1.3: $(OBJECTS) + echo $(DSOCOMMAND) $@ ... +- $(DSOCOMMAND) $@ $(OBJECTS) ++ $(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS) + $(RM) libfltk.sl + $(LN) libfltk.sl.1.3 libfltk.sl + +@@ -262,7 +262,7 @@ + + libfltk_s.a: $(OBJECTS) + echo $(DSOCOMMAND) libfltk_s.o ... +- $(DSOCOMMAND) libfltk_s.o $(OBJECTS) $(IMAGELIBS) ++ $(DSOCOMMAND) libfltk_s.o $(OBJECTS) $(IMAGELIBS) $(LDLIBS) + echo $(LIBCOMMAND) libfltk_s.a libfltk_s.o + $(RM) $@ + $(LIBCOMMAND) libfltk_s.a libfltk_s.o +@@ -276,13 +276,13 @@ + + libfltk_forms.so.1.3: $(FLOBJECTS) libfltk.so.1.3 + echo $(DSOCOMMAND) $@ ... +- $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk ++ $(DSOCOMMAND) $@ $(FLOBJECTS) $(LDLIBS) -L. -lfltk + $(RM) libfltk_forms.so + $(LN) libfltk_forms.so.1.3 libfltk_forms.so + + libfltk_forms.sl.1.3: $(FLOBJECTS) libfltk.sl.1.3 + echo $(DSOCOMMAND) $@ ... +- $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk ++ $(DSOCOMMAND) $@ $(FLOBJECTS) $(LDLIBS) -L. -lfltk + $(RM) libfltk_forms.sl + $(LN) libfltk_forms.sl.1.3 libfltk_forms.sl + +@@ -298,7 +298,7 @@ + + libfltk_forms_s.a: $(FLOBJECTS) + echo $(DSOCOMMAND) libfltk_forms_s.o ... +- $(DSOCOMMAND) libfltk_forms_s.o $(FLOBJECTS) ++ $(DSOCOMMAND) libfltk_forms_s.o $(FLOBJECTS) $(LDLIBS) + echo $(LIBCOMMAND) libfltk_forms_s.a libfltk_forms_s.o + $(RM) $@ + $(LIBCOMMAND) libfltk_forms_s.a libfltk_forms_s.o +@@ -312,13 +312,13 @@ + + libfltk_gl.so.1.3: $(GLOBJECTS) libfltk.so.1.3 + echo $(DSOCOMMAND) $@ ... +- $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk ++ $(DSOCOMMAND) $@ $(GLOBJECTS) $(GLDLIBS) -L. -lfltk + $(RM) libfltk_gl.so + $(LN) libfltk_gl.so.1.3 libfltk_gl.so + + libfltk_gl.sl.1.3: $(GLOBJECTS) libfltk.sl.1.3 + echo $(DSOCOMMAND) $@ ... +- $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk ++ $(DSOCOMMAND) $@ $(GLOBJECTS) $(GLDLIBS) -L. -lfltk + $(RM) libfltk_gl.sl + $(LN) libfltk_gl.sl.1.3 libfltk_gl.sl + +@@ -334,7 +334,7 @@ + + libfltk_gl_s.a: $(GLOBJECTS) + echo $(DSOCOMMAND) libfltk_gl_s.o ... +- $(DSOCOMMAND) libfltk_gl_s.o $(GLOBJECTS) ++ $(DSOCOMMAND) libfltk_gl_s.o $(GLOBJECTS) $(GLDLIBS) + echo $(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o + $(RM) $@ + $(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o +@@ -348,13 +348,13 @@ + + libfltk_images.so.1.3: $(IMGOBJECTS) libfltk.so.1.3 + echo $(DSOCOMMAND) $@ ... +- $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk ++ $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) $(LDLIBS) -lfltk + $(RM) libfltk_images.so + $(LN) libfltk_images.so.1.3 libfltk_images.so + + libfltk_images.sl.1.3: $(IMGOBJECTS) libfltk.sl.1.3 + echo $(DSOCOMMAND) $@ ... +- $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk ++ $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) $(LDLIBS) -lfltk + $(RM) libfltk_images.sl + $(LN) libfltk_images.sl.1.3 libfltk_images.sl + +@@ -370,7 +370,7 @@ + + libfltk_images_s.a: $(IMGOBJECTS) + echo $(DSOCOMMAND) libfltk_images_s.o ... +- $(DSOCOMMAND) libfltk_images_s.o $(IMGOBJECTS) ++ $(DSOCOMMAND) libfltk_images_s.o $(IMGOBJECTS) $(LDLIBS) + echo $(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o + $(RM) $@ + $(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o ================================================================ _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
