diff options
Diffstat (limited to 'sci-electronics/drawtiming/files')
| -rw-r--r-- | sci-electronics/drawtiming/files/drawtiming-0.7.1-gcc43.patch | 10 | ||||
| -rw-r--r-- | sci-electronics/drawtiming/files/drawtiming-0.7.1-ldflags.patch | 36 |
2 files changed, 46 insertions, 0 deletions
diff --git a/sci-electronics/drawtiming/files/drawtiming-0.7.1-gcc43.patch b/sci-electronics/drawtiming/files/drawtiming-0.7.1-gcc43.patch new file mode 100644 index 000000000000..4249c79aa6e1 --- /dev/null +++ b/sci-electronics/drawtiming/files/drawtiming-0.7.1-gcc43.patch @@ -0,0 +1,10 @@ +--- src/timing.cc.old 2011-06-01 18:27:42.000000000 +0000 ++++ src/timing.cc 2011-06-01 18:28:09.000000000 +0000 +@@ -23,6 +23,7 @@ + #include "timing.h" + #include <map> + #include <fstream> ++#include <cstring> + using namespace std; + using namespace timing; + using namespace Magick; diff --git a/sci-electronics/drawtiming/files/drawtiming-0.7.1-ldflags.patch b/sci-electronics/drawtiming/files/drawtiming-0.7.1-ldflags.patch new file mode 100644 index 000000000000..d50621f76796 --- /dev/null +++ b/sci-electronics/drawtiming/files/drawtiming-0.7.1-ldflags.patch @@ -0,0 +1,36 @@ +Description: Switch LDADD with LDFLAGS + This change is to move the objects before the libs. to fix an FTBFS when + --as-needed is passed to gcc. +Author: …Øمودي (Ahmed El-Mahmoudy) <aelmahmoudy@sabily.org> +Forwarded: yes +--- drawtiming-0.7.1.orig/src/Makefile.am ++++ drawtiming-0.7.1/src/Makefile.am +@@ -3,7 +3,7 @@ + + bin_PROGRAMS = drawtiming + drawtiming_SOURCES = main.cc globals.h parser.yy scanner.ll timing.cc timing.h +-drawtiming_LDFLAGS = @MAGICK_LIBS@ ++drawtiming_LDADD = @MAGICK_LIBS@ + + EXTRA_DIST = parser.h + BUILT_SOURCES = parser.h +--- drawtiming-0.7.1.orig/src/Makefile.in ++++ drawtiming-0.7.1/src/Makefile.in +@@ -51,7 +51,7 @@ + am_drawtiming_OBJECTS = main.$(OBJEXT) parser.$(OBJEXT) \ + scanner.$(OBJEXT) timing.$(OBJEXT) + drawtiming_OBJECTS = $(am_drawtiming_OBJECTS) +-drawtiming_LDADD = $(LDADD) ++drawtiming_LDADD = @MAGICK_LIBS@ $(LDADD) + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles +@@ -159,7 +159,7 @@ + AM_CXXFLAGS = @MAGICK_CFLAGS@ -DYYDEBUG=1 + AM_YFLAGS = -d + drawtiming_SOURCES = main.cc globals.h parser.yy scanner.ll timing.cc timing.h +-drawtiming_LDFLAGS = @MAGICK_LIBS@ ++drawtiming_LDFLAGS = @LDFLAGS@ + EXTRA_DIST = parser.h + BUILT_SOURCES = parser.h + all: $(BUILT_SOURCES) |