From ccffb0d58e3b36b3be440b9ceadb05ebabe0d847 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Sun, 24 Jan 2010 08:02:55 +0000 Subject: vdr: Put common information in separate file and require it in the recipe. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit • Some information in a recipe apply to all versions of a program. Factor them out into an extra file and include/require this in each recipe as seen in a lot of other programs/packages/recipes in OE. • VDR’s plugins often change and therefore put patches to them in version dependent folder. This hopefully lessens the effort to add new versions. Signed-off-by: Paul Menzel Signed-off-by: Holger Hans Peter Freyther --- recipes/vdr/files/linkerflags.patch | 186 ------------------------------------ 1 file changed, 186 deletions(-) delete mode 100644 recipes/vdr/files/linkerflags.patch (limited to 'recipes/vdr/files') diff --git a/recipes/vdr/files/linkerflags.patch b/recipes/vdr/files/linkerflags.patch deleted file mode 100644 index 63c4477790..0000000000 --- a/recipes/vdr/files/linkerflags.patch +++ /dev/null @@ -1,186 +0,0 @@ -Index: vdr-1.7.10/Makefile -=================================================================== ---- vdr-1.7.10.orig/Makefile 2010-01-07 22:01:54.000000000 +0100 -+++ vdr-1.7.10/Makefile 2010-01-07 22:02:32.167165564 +0100 -@@ -20,7 +20,7 @@ - MANDIR = $(PREFIX)/share/man - BINDIR = $(PREFIX)/bin - LOCDIR = ./locale --LIBS = -ljpeg -lpthread -ldl -lcap -lrt -lfreetype -lfontconfig -+LIBS = -ljpeg -lpthread -ldl -lcap -lrt -lfreetype -lfontconfig ${LDFLAGS} - INCLUDES = ${CFLAGS} - - PLUGINDIR= ./PLUGINS -Index: vdr-1.7.10/PLUGINS/src/hello/Makefile -=================================================================== ---- vdr-1.7.10.orig/PLUGINS/src/hello/Makefile 2010-01-07 22:01:07.000000000 +0100 -+++ vdr-1.7.10/PLUGINS/src/hello/Makefile 2010-01-07 22:02:02.240496954 +0100 -@@ -19,6 +19,7 @@ - - CXX ?= g++ - CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses -+LIBS ?= ${LDFLAGS} - - ### The directory environment: - -@@ -95,7 +96,7 @@ - ### Targets: - - libvdr-$(PLUGIN).so: $(OBJS) -- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ -+ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS) - @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION) - - dist: clean -Index: vdr-1.7.10/PLUGINS/src/osddemo/Makefile -=================================================================== ---- vdr-1.7.10.orig/PLUGINS/src/osddemo/Makefile 2010-01-07 22:01:07.000000000 +0100 -+++ vdr-1.7.10/PLUGINS/src/osddemo/Makefile 2010-01-07 22:02:02.240496954 +0100 -@@ -17,6 +17,7 @@ - - CXX ?= g++ - CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses -+LIBS ?= ${LDFLAGS} - - ### The directory environment: - -@@ -68,7 +69,7 @@ - ### Targets: - - libvdr-$(PLUGIN).so: $(OBJS) -- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ -+ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS) - @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION) - - dist: clean -Index: vdr-1.7.10/PLUGINS/src/pictures/Makefile -=================================================================== ---- vdr-1.7.10.orig/PLUGINS/src/pictures/Makefile 2010-01-07 22:01:07.000000000 +0100 -+++ vdr-1.7.10/PLUGINS/src/pictures/Makefile 2010-01-07 22:02:02.240496954 +0100 -@@ -19,6 +19,7 @@ - - CXX ?= g++ - CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses -+LIBS ?= ${LDFLAGS} - - ### The directory environment: - -@@ -95,7 +96,7 @@ - ### Targets: - - libvdr-$(PLUGIN).so: $(OBJS) -- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ -+ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS) - @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION) - - dist: clean -Index: vdr-1.7.10/PLUGINS/src/servicedemo/Makefile -=================================================================== ---- vdr-1.7.10.orig/PLUGINS/src/servicedemo/Makefile 2010-01-07 22:01:07.000000000 +0100 -+++ vdr-1.7.10/PLUGINS/src/servicedemo/Makefile 2010-01-07 22:02:02.240496954 +0100 -@@ -19,6 +19,7 @@ - - CXX ?= g++ - CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses -+LIBS ?= ${LDFLAGS} - - ### The directory environment: - -@@ -70,11 +71,11 @@ - ### Targets: - - libvdr-$(PLUGIN1).so: $(PLUGIN1).o -- $(CXX) $(CXXFLAGS) -shared $(PLUGIN1).o -o $@ -+ $(CXX) $(CXXFLAGS) -shared $(PLUGIN1).o -o $@ $(LIBS) - @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION) - - libvdr-$(PLUGIN2).so: $(PLUGIN2).o -- $(CXX) $(CXXFLAGS) -shared $(PLUGIN2).o -o $@ -+ $(CXX) $(CXXFLAGS) -shared $(PLUGIN2).o -o $@ $(LIBS) - @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION) - - dist: clean -Index: vdr-1.7.10/PLUGINS/src/skincurses/Makefile -=================================================================== ---- vdr-1.7.10.orig/PLUGINS/src/skincurses/Makefile 2010-01-07 22:01:07.000000000 +0100 -+++ vdr-1.7.10/PLUGINS/src/skincurses/Makefile 2010-01-07 22:02:02.240496954 +0100 -@@ -19,6 +19,7 @@ - - CXX ?= g++ - CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses -+LIBS ?= ${LDFLAGS} - - ### The directory environment: - -@@ -95,7 +96,7 @@ - ### Targets: - - libvdr-$(PLUGIN).so: $(OBJS) -- $(CXX) $(CXXFLAGS) -shared $(OBJS) -lncursesw -o $@ -+ $(CXX) $(CXXFLAGS) -shared $(OBJS) -lncursesw -o $@ $(LIBS) - @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION) - - dist: clean -Index: vdr-1.7.10/PLUGINS/src/sky/Makefile -=================================================================== ---- vdr-1.7.10.orig/PLUGINS/src/sky/Makefile 2010-01-07 22:01:07.000000000 +0100 -+++ vdr-1.7.10/PLUGINS/src/sky/Makefile 2010-01-07 22:02:02.240496954 +0100 -@@ -17,6 +17,7 @@ - - CXX ?= g++ - CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses -+LIBS ?= ${LDFLAGS} - - ### The directory environment: - -@@ -68,7 +69,7 @@ - ### Targets: - - libvdr-$(PLUGIN).so: $(OBJS) -- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ -+ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS) - @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION) - - dist: clean -Index: vdr-1.7.10/PLUGINS/src/status/Makefile -=================================================================== ---- vdr-1.7.10.orig/PLUGINS/src/status/Makefile 2010-01-07 22:01:07.000000000 +0100 -+++ vdr-1.7.10/PLUGINS/src/status/Makefile 2010-01-07 22:02:02.240496954 +0100 -@@ -17,6 +17,7 @@ - - CXX ?= g++ - CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses -+LIBS ?= ${LDFLAGS} - - ### The directory environment: - -@@ -68,7 +69,7 @@ - ### Targets: - - libvdr-$(PLUGIN).so: $(OBJS) -- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ -+ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS) - @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION) - - dist: clean -Index: vdr-1.7.10/PLUGINS/src/svdrpdemo/Makefile -=================================================================== ---- vdr-1.7.10.orig/PLUGINS/src/svdrpdemo/Makefile 2010-01-07 22:01:07.000000000 +0100 -+++ vdr-1.7.10/PLUGINS/src/svdrpdemo/Makefile 2010-01-07 22:02:02.240496954 +0100 -@@ -17,6 +17,7 @@ - - CXX ?= g++ - CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses -+LIBS ?= ${LDFLAGS} - - ### The directory environment: - -@@ -68,7 +69,7 @@ - ### Targets: - - libvdr-$(PLUGIN).so: $(OBJS) -- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ -+ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS) - @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION) - - dist: clean -- cgit v1.2.3