diff options
Diffstat (limited to 'add_arm_targets.diff')
| -rw-r--r-- | add_arm_targets.diff | 97 |
1 files changed, 53 insertions, 44 deletions
diff --git a/add_arm_targets.diff b/add_arm_targets.diff index 2f4a4386dc57..5b56c3eae0a9 100644 --- a/add_arm_targets.diff +++ b/add_arm_targets.diff @@ -1,6 +1,29 @@ -diff '--exclude=.hg' -uprN vtuner.apps/build/arm/Makefile vtuner.apps.arm/build/arm/Makefile ---- vtuner.apps/build/arm/Makefile 2014-11-03 13:01:25.904147000 +0100 -+++ vtuner.apps.arm/build/arm/Makefile 2014-11-03 12:58:28.079147000 +0100 +diff -uprN vtuner.apps-ec05cde34dd77678933c912a6b4abab5d81b9a5b.orig/build/aarch64/Makefile vtuner.apps-ec05cde34dd77678933c912a6b4abab5d81b9a5b/build/aarch64/Makefile +--- vtuner.apps-ec05cde34dd77678933c912a6b4abab5d81b9a5b.orig/build/aarch64/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ vtuner.apps-ec05cde34dd77678933c912a6b4abab5d81b9a5b/build/aarch64/Makefile 2016-05-26 15:45:27.317930930 +0200 +@@ -0,0 +1,19 @@ ++ARCH=aarch64 ++-include ../../Make.config ++ ++CC=$(CC-$(ARCH)) ++CXX=$(CXX-$(ARCH)) ++CFLAGS=-fpic -DHAVE_DVB_API_VERSION=5 ++LDFLAGS=-lpthread -lrt ++DRIVER=vtuner-dvb-3 ++STRIP=$(STRIP-$(ARCH)) ++ ++all: ../../dist/$(ARCH)/vtunerd.$(ARCH) ../../dist/$(ARCH)/vtunerc.$(ARCH) ++ $(STRIP) ../../dist/$(ARCH)/vtunerd.$(ARCH) ++ $(STRIP) ../../dist/$(ARCH)/vtunerc.$(ARCH) ++ ++-include ../../Make.rules ++ ++vtuner-dvb-3.o: ../../vtuner-dvb-3.c ../../vtuner-dvb-3.h ++ $(CC) $(CFLAGS) -c -o vtuner-dvb-3.o ../../vtuner-dvb-3.c ++ +diff -uprN vtuner.apps-ec05cde34dd77678933c912a6b4abab5d81b9a5b.orig/build/arm/Makefile vtuner.apps-ec05cde34dd77678933c912a6b4abab5d81b9a5b/build/arm/Makefile +--- vtuner.apps-ec05cde34dd77678933c912a6b4abab5d81b9a5b.orig/build/arm/Makefile 2012-02-14 21:22:36.000000000 +0100 ++++ vtuner.apps-ec05cde34dd77678933c912a6b4abab5d81b9a5b/build/arm/Makefile 2016-05-23 13:26:26.481863242 +0200 @@ -8,8 +8,9 @@ LDFLAGS=-lpthread -lrt DRIVER=vtuner-dvb-3 STRIP=$(STRIP-$(ARCH)) @@ -12,9 +35,9 @@ diff '--exclude=.hg' -uprN vtuner.apps/build/arm/Makefile vtuner.apps.arm/build/ -include ../../Make.rules -diff '--exclude=.hg' -uprN vtuner.apps/build/armv6h/Makefile vtuner.apps.arm/build/armv6h/Makefile ---- vtuner.apps/build/armv6h/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ vtuner.apps.arm/build/armv6h/Makefile 2014-11-03 21:27:25.164147000 +0100 +diff -uprN vtuner.apps-ec05cde34dd77678933c912a6b4abab5d81b9a5b.orig/build/armv6h/Makefile vtuner.apps-ec05cde34dd77678933c912a6b4abab5d81b9a5b/build/armv6h/Makefile +--- vtuner.apps-ec05cde34dd77678933c912a6b4abab5d81b9a5b.orig/build/armv6h/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ vtuner.apps-ec05cde34dd77678933c912a6b4abab5d81b9a5b/build/armv6h/Makefile 2016-05-23 13:26:26.481863242 +0200 @@ -0,0 +1,19 @@ +ARCH=armv6h +-include ../../Make.config @@ -35,9 +58,9 @@ diff '--exclude=.hg' -uprN vtuner.apps/build/armv6h/Makefile vtuner.apps.arm/bui +vtuner-dvb-3.o: ../../vtuner-dvb-3.c ../../vtuner-dvb-3.h + $(CC) $(CFLAGS) -c -o vtuner-dvb-3.o ../../vtuner-dvb-3.c + -diff '--exclude=.hg' -uprN vtuner.apps/build/armv7h/Makefile vtuner.apps.arm/build/armv7h/Makefile ---- vtuner.apps/build/armv7h/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ vtuner.apps.arm/build/armv7h/Makefile 2014-11-03 21:27:41.744147000 +0100 +diff -uprN vtuner.apps-ec05cde34dd77678933c912a6b4abab5d81b9a5b.orig/build/armv7h/Makefile vtuner.apps-ec05cde34dd77678933c912a6b4abab5d81b9a5b/build/armv7h/Makefile +--- vtuner.apps-ec05cde34dd77678933c912a6b4abab5d81b9a5b.orig/build/armv7h/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ vtuner.apps-ec05cde34dd77678933c912a6b4abab5d81b9a5b/build/armv7h/Makefile 2016-05-23 13:26:26.481863242 +0200 @@ -0,0 +1,19 @@ +ARCH=armv7h +-include ../../Make.config @@ -58,37 +81,15 @@ diff '--exclude=.hg' -uprN vtuner.apps/build/armv7h/Makefile vtuner.apps.arm/bui +vtuner-dvb-3.o: ../../vtuner-dvb-3.c ../../vtuner-dvb-3.h + $(CC) $(CFLAGS) -c -o vtuner-dvb-3.o ../../vtuner-dvb-3.c + -diff '--exclude=.hg' -uprN vtuner.apps/Make.config vtuner.apps.arm/Make.config ---- vtuner.apps/Make.config 1970-01-01 01:00:00.000000000 +0100 -+++ vtuner.apps.arm/Make.config 2014-11-09 23:49:00.096577193 +0100 -@@ -0,0 +1,20 @@ -+# define the CC for target i686 -+CC-i686=gcc -+INCLUDE-i686= -+ -+# define the CC for target x86_64 -+CC-x86_64=gcc -+INCLUDE-x86_64= -+ -+# define the CC for target arm -+CC-arm=gcc -+STRIP-arm=strip -+INCLUDE-arm= -+ -+CC-armv6h=gcc -+STRIP-armv6h=strip -+INCLUDE-armv6h= -+ -+CC-armv7h=gcc -+STRIP-armv7h=strip -+INCLUDE-armv7h= -diff '--exclude=.hg' -uprN vtuner.apps/Make.config.sample vtuner.apps.arm/Make.config.sample ---- vtuner.apps/Make.config.sample 2014-11-03 13:01:25.899147000 +0100 -+++ vtuner.apps.arm/Make.config.sample 2014-11-09 23:48:07.225347164 +0100 -@@ -28,3 +28,11 @@ CC-sh4=/opt/STM/STLinux-2.3/devkit/sh4/b +diff -uprN vtuner.apps-ec05cde34dd77678933c912a6b4abab5d81b9a5b.orig/Make.config.sample vtuner.apps-ec05cde34dd77678933c912a6b4abab5d81b9a5b/Make.config.sample +--- vtuner.apps-ec05cde34dd77678933c912a6b4abab5d81b9a5b.orig/Make.config.sample 2012-02-14 21:22:36.000000000 +0100 ++++ vtuner.apps-ec05cde34dd77678933c912a6b4abab5d81b9a5b/Make.config.sample 2016-05-26 15:44:06.091262975 +0200 +@@ -27,4 +27,16 @@ CC-sh4=/opt/STM/STLinux-2.3/devkit/sh4/b + # define the CC for target arm CC-arm=arm-none-linux-gnueabi-gcc STRIP-arm=arm-none-linux-gnueabi-strip - INCLUDE-arm=-I/home/hop/nessie/2.6.22/include +-INCLUDE-arm=-I/home/hop/nessie/2.6.22/include ++INCLUDE-arm= + +CC-armv6h=arm-none-linux-gnueabi-gcc +STRIP-armv6h=arm-none-linux-gnueabi-strip @@ -97,18 +98,22 @@ diff '--exclude=.hg' -uprN vtuner.apps/Make.config.sample vtuner.apps.arm/Make.c +CC-armv7h=arm-none-linux-gnueabi-gcc +STRIP-armv7h=arm-none-linux-gnueabi-strip +INCLUDE-armv7h= -diff '--exclude=.hg' -uprN vtuner.apps/Makefile vtuner.apps.arm/Makefile ---- vtuner.apps/Makefile 2014-11-03 13:01:25.904147000 +0100 -+++ vtuner.apps.arm/Makefile 2014-11-03 21:29:43.024147000 +0100 ++ ++CC-aarch64=arm-none-linux-gnueabi-gcc ++STRIP-aarch64=arm-none-linux-gnueabi-strip ++INCLUDE-aarch64= +diff -uprN vtuner.apps-ec05cde34dd77678933c912a6b4abab5d81b9a5b.orig/Makefile vtuner.apps-ec05cde34dd77678933c912a6b4abab5d81b9a5b/Makefile +--- vtuner.apps-ec05cde34dd77678933c912a6b4abab5d81b9a5b.orig/Makefile 2012-02-14 21:22:36.000000000 +0100 ++++ vtuner.apps-ec05cde34dd77678933c912a6b4abab5d81b9a5b/Makefile 2016-05-26 15:49:26.237934717 +0200 @@ -1,6 +1,6 @@ -include ../../Make.config -all: i686 x86_64 mipsel ppc db2 sh4 mipsel15 ipkg -+all: i686 x86_64 mipsel ppc db2 sh4 mipsel15 ipkg arm armv6h armv7h ++all: i686 x86_64 mipsel ppc db2 sh4 mipsel15 ipkg arm armv6h armv7h aarch64 i686: $(MAKE) -C build/i686 all -@@ -27,7 +27,13 @@ ipkg: mipsel +@@ -27,7 +27,16 @@ ipkg: mipsel $(MAKE) -C pkgs ipkg arm: @@ -120,12 +125,16 @@ diff '--exclude=.hg' -uprN vtuner.apps/Makefile vtuner.apps.arm/Makefile + +armv7h: + $(MAKE) -C build/armv7h all ++ ++aarch64: ++ $(MAKE) -C build/aarch64 all clean: -@@ -40,3 +46,5 @@ clean: +@@ -40,3 +49,6 @@ clean: $(MAKE) -C build/mipsel15 clean $(MAKE) -C pkgs clean $(MAKE) -C build/arm clean + $(MAKE) -C build/armv6h clean + $(MAKE) -C build/armv7h clean ++ $(MAKE) -C build/aarch64 clean |