summaryrefslogtreecommitdiff
path: root/package/fltk/patches
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-03-28 01:27:02 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2011-03-28 01:27:02 +0200
commit5d81720b7fb6ebfe9ee749c637feccc6c80a872f (patch)
treefeec9cc0b5924e4758e1fb55be47e77072b9f552 /package/fltk/patches
parentd1347f55e26d4e977c5ec2338bee94b2b98e986d (diff)
fix compile when SSP is active, be more verbose
Diffstat (limited to 'package/fltk/patches')
-rw-r--r--package/fltk/patches/patch-OpenGL_Makefile11
-rw-r--r--package/fltk/patches/patch-configure11
-rw-r--r--package/fltk/patches/patch-images_Makefile11
-rw-r--r--package/fltk/patches/patch-makeinclude_in11
4 files changed, 42 insertions, 2 deletions
diff --git a/package/fltk/patches/patch-OpenGL_Makefile b/package/fltk/patches/patch-OpenGL_Makefile
new file mode 100644
index 000000000..71ac77285
--- /dev/null
+++ b/package/fltk/patches/patch-OpenGL_Makefile
@@ -0,0 +1,11 @@
+--- fltk-2.0.x-r7513.orig/OpenGL/Makefile 2008-08-05 01:03:58.000000000 +0200
++++ fltk-2.0.x-r7513/OpenGL/Makefile 2011-03-25 13:56:09.304620874 +0100
+@@ -102,7 +102,7 @@ include makedepend
+
+ ../lib/$(DSONAME): $(OBJECTS)
+ echo $(DSOCOMMAND) $@ ...
+- $(DSOCOMMAND) $@ $(OBJECTS)
++ $(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS)
+ $(RM) ../lib/$(DSOLINK)
+ $(LN) $(DSONAME) ../lib/$(DSOLINK)
+
diff --git a/package/fltk/patches/patch-configure b/package/fltk/patches/patch-configure
index d8d16bd72..613c7b595 100644
--- a/package/fltk/patches/patch-configure
+++ b/package/fltk/patches/patch-configure
@@ -1,5 +1,5 @@
--- fltk-2.0.x-r7513.orig/configure 2010-04-16 10:02:53.000000000 +0200
-+++ fltk-2.0.x-r7513/configure 2010-12-05 21:10:58.000000000 +0100
++++ fltk-2.0.x-r7513/configure 2011-03-25 13:52:41.555870814 +0100
@@ -1770,7 +1770,7 @@ FL_API_VERSION=${FL_MAJOR_VERSION}.${FL_
@@ -9,3 +9,12 @@
uversion=`uname -r | sed -e '1,$s/[^0-9]//g'`
case $uname in
IRIX*)
+@@ -1922,7 +1922,7 @@ if test x$enable_shared = xyes; then
+ ;;
+ Linux* | *BSD*)
+ # DSOCOMMAND="\$(CXX) -Wl,-soname,\$@ \$(LDLIBS) -shared -fPIC $DEBUGFLAG -o"
+- DSOCOMMAND="\$(CXX) \$(LDLIBS) -shared -fPIC $DEBUGFLAG -o"
++ DSOCOMMAND="\$(CXX) -shared -fPIC $DEBUGFLAG -o"
+ if test "$libdir" != "/usr/lib"; then
+ DSOLINK="-Wl,-rpath,$libdir"
+ fi
diff --git a/package/fltk/patches/patch-images_Makefile b/package/fltk/patches/patch-images_Makefile
new file mode 100644
index 000000000..ddd993d18
--- /dev/null
+++ b/package/fltk/patches/patch-images_Makefile
@@ -0,0 +1,11 @@
+--- fltk-2.0.x-r7513.orig/images/Makefile 2008-08-05 01:03:58.000000000 +0200
++++ fltk-2.0.x-r7513/images/Makefile 2011-03-25 13:53:36.614620804 +0100
+@@ -109,7 +109,7 @@ include makedepend
+
+ ../lib/$(DSONAME): $(OBJECTS)
+ echo $(DSOCOMMAND) $@ ...
+- $(DSOCOMMAND) $@ $(OBJECTS)
++ $(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS)
+ $(RM) ../lib/$(DSOLINK)
+ $(LN) $(DSONAME) ../lib/$(DSOLINK)
+
diff --git a/package/fltk/patches/patch-makeinclude_in b/package/fltk/patches/patch-makeinclude_in
index 7c2fd2f8b..46a7d397f 100644
--- a/package/fltk/patches/patch-makeinclude_in
+++ b/package/fltk/patches/patch-makeinclude_in
@@ -1,5 +1,5 @@
--- fltk-2.0.x-r7513.orig/makeinclude.in 2006-04-11 00:06:06.000000000 +0200
-+++ fltk-2.0.x-r7513/makeinclude.in 2010-06-13 17:18:11.503473158 +0200
++++ fltk-2.0.x-r7513/makeinclude.in 2011-03-25 12:03:06.633370885 +0100
@@ -45,7 +45,7 @@ NROFF = @NROFF@
RM = rm -f
RMDIR = rm -rf
@@ -9,3 +9,12 @@
# compiler names:
CC = @CC@
+@@ -115,7 +115,7 @@ CAT1EXT = @CAT1EXT@
+ CAT3EXT = @CAT3EXT@
+
+ # Be quiet when building...
+-.SILENT:
++#.SILENT:
+
+ # Build commands and filename extensions...
+ .SUFFIXES: .0 .1 .3 .c .cxx .h .fl .man .o .z $(EXEEXT)