diff options
Diffstat (limited to 'x11-libs/fltk/files/fltk-1.3.1-as-needed.patch')
| -rw-r--r-- | x11-libs/fltk/files/fltk-1.3.1-as-needed.patch | 154 |
1 files changed, 0 insertions, 154 deletions
diff --git a/x11-libs/fltk/files/fltk-1.3.1-as-needed.patch b/x11-libs/fltk/files/fltk-1.3.1-as-needed.patch deleted file mode 100644 index c6539fc7ec2..00000000000 --- a/x11-libs/fltk/files/fltk-1.3.1-as-needed.patch +++ /dev/null @@ -1,154 +0,0 @@ - cairo/Makefile | 4 ++-- - configure.in | 9 +++------ - src/Makefile | 24 ++++++++++++------------ - 3 files changed, 17 insertions(+), 20 deletions(-) - -diff --git a/cairo/Makefile b/cairo/Makefile -index 3cefc9f..445cd9c 100644 ---- a/cairo/Makefile -+++ b/cairo/Makefile -@@ -48,13 +48,13 @@ $(CAIROLIBNAME): $(CAIROOBJECTS) - - libfltk_cairo.so.1.3: $(CAIROOBJECTS) ../src/libfltk.so.1.3 - echo $(DSOCOMMAND) $@ ... -- $(DSOCOMMAND) $@ $(CAIROOBJECTS) -L../src -lfltk -+ $(DSOCOMMAND) $@ $(CAIROOBJECTS) -L../src -lfltk $(CAIROLIBS) - $(RM) libfltk_cairo.so - $(LN) $(CAIRODSONAME) libfltk_cairo.so - - libfltk_cairo.sl.1.3: $(CAIROOBJECTS) ../src/libfltk.sl.1.3 - echo $(DSOCOMMAND) $@ ... -- $(DSOCOMMAND) $@ $(CAIROOBJECTS) -L../src -lfltk -+ $(DSOCOMMAND) $@ $(CAIROOBJECTS) -L../src -lfltk $(CAIROLIBS) - $(RM) libfltk_cairo.sl - $(LN) libfltk_cairo.sl.1.3 libfltk_cairo.sl - -diff --git a/configure.in b/configure.in -index 762d3f9..56a5d97 100644 ---- a/configure.in -+++ b/configure.in -@@ -166,7 +166,7 @@ else - dnl we do not rely on pkg-config . - CAIRODIR="cairo" - CAIROFLAGS="`pkg-config --cflags cairo`" -- CAIROLIBS="-lcairo -lpixman-1" -+ CAIROLIBS="`pkg-config --libs cairo pixman-1`" - CXXFLAGS="$CAIROFLAGS $CXXFLAGS" - LINKFLTKCAIRO="../lib/libfltk_cairo.a" - FLTKCAIROOPTION="-L ../cairo -lfltk_cairo$SHAREDSUFFIX" -@@ -280,10 +280,7 @@ if test x$enable_shared = xyes; then - 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" -diff --git a/src/Makefile b/src/Makefile -index 7806854..a43106e 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -240,13 +240,13 @@ $(LIBNAME): $(OBJECTS) - - 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.1.3.dylib: $(OBJECTS) - - 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 @@ $(FLLIBNAME): $(FLOBJECTS) - - 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.1.3.dylib: $(FLOBJECTS) libfltk.1.3.dylib - - 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 @@ $(GLLIBNAME): $(GLOBJECTS) - - libfltk_gl.so.1.3: $(GLOBJECTS) libfltk.so.1.3 - echo $(DSOCOMMAND) $@ ... -- $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk -+ $(DSOCOMMAND) $@ $(GLOBJECTS) $(LDLIBS) -L. -lfltk $(GLDLIBS) $(GLLIB) - $(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) $(LDLIBS) -L. -lfltk - $(RM) libfltk_gl.sl - $(LN) libfltk_gl.sl.1.3 libfltk_gl.sl - -@@ -334,7 +334,7 @@ libfltk_gl.1.3.dylib: $(GLOBJECTS) libfltk.1.3.dylib - - libfltk_gl_s.a: $(GLOBJECTS) - echo $(DSOCOMMAND) libfltk_gl_s.o ... -- $(DSOCOMMAND) libfltk_gl_s.o $(GLOBJECTS) -+ $(DSOCOMMAND) libfltk_gl_s.o $(GLOBJECTS) $(LDLIBS) $(GLLIB) - echo $(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o - $(RM) $@ - $(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o -@@ -348,13 +348,13 @@ $(IMGLIBNAME): $(IMGOBJECTS) - - 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.1.3.dylib: $(IMGOBJECTS) libfltk.1.3.dylib - - 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 |