Browse Source

another round of compile fixes for raspberry release build

Waldemar Brodkorb 10 years ago
parent
commit
9f7250f4f4

+ 0 - 20
package/binutils/patches/musl.patch

@@ -1,20 +0,0 @@
-diff -Nur binutils-2.22.orig/config.sub binutils-2.22/config.sub
---- binutils-2.22.orig/config.sub	2011-06-06 12:36:06.000000000 +0200
-+++ binutils-2.22/config.sub	2013-08-11 14:40:22.308115171 +0200
-@@ -126,6 +126,7 @@
- case $maybe_os in
-   nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-   linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-+  linux-musl* | \
-   knetbsd*-gnu* | netbsd*-gnu* | \
-   kopensolaris*-gnu* | \
-   storm-chaos* | os2-emx* | rtmk-nova*)
-@@ -1334,7 +1335,7 @@
- 	      | -chorusos* | -chorusrdb* | -cegcc* \
- 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- 	      | -mingw32* | -linux-gnu* | -linux-android* \
--	      | -linux-newlib* | -linux-uclibc* \
-+	      | -linux-newlib* | -linux-uclibc* | -linux-musl* \
- 	      | -uxpv* | -beos* | -mpeix* | -udk* \
- 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \

+ 0 - 20
package/binutils/patches/patch-ld_Makefile_in

@@ -1,20 +0,0 @@
---- binutils-2.21.orig/ld/Makefile.in	2010-11-05 11:34:22.000000000 +0100
-+++ binutils-2.21/ld/Makefile.in	2011-01-10 21:57:49.000000000 +0100
-@@ -422,7 +422,7 @@ TEXI2DVI = texi2dvi -I $(srcdir) -I $(BF
- 		    -I $(top_srcdir)/../libiberty
- 
- AM_CPPFLAGS = -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) \
--	@INCINTL@ $(HDEFINES) $(CFLAGS) $(PLUGIN_CFLAGS) \
-+	@INCINTL@ $(HDEFINES) $(PLUGIN_CFLAGS) \
- 	-DLOCALEDIR="\"$(datadir)/locale\""
- 
- BFDLIB = ../bfd/libbfd.la
-@@ -850,7 +850,7 @@ ld_new_LDADD = $(EMULATION_OFILES) $(EMU
- #
- @ENABLE_PLUGINS_TRUE@noinst_LTLIBRARIES = libldtestplug.la
- @ENABLE_PLUGINS_TRUE@libldtestplug_la_SOURCES = testplug.c
--@ENABLE_PLUGINS_TRUE@libldtestplug_la_CFLAGS = -g -O2
-+@ENABLE_PLUGINS_TRUE@libldtestplug_la_CFLAGS =
- @ENABLE_PLUGINS_TRUE@libldtestplug_la_LDFLAGS = -no-undefined -rpath /nowhere
- MAINTAINERCLEANFILES = configdoc.texi ld.1 ld.info
- 

+ 0 - 11
package/binutils/patches/patch-ltmain_sh

@@ -1,11 +0,0 @@
---- binutils-2.21.orig/ltmain.sh	2010-01-09 22:11:32.000000000 +0100
-+++ binutils-2.21/ltmain.sh	2011-01-14 19:07:08.000000000 +0100
-@@ -4980,7 +4980,7 @@ func_mode_link ()
-       # @file GCC response files
-       # -tp=* Portland pgcc target processor selection
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
--      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*)
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|-fstack-protector*|-flto)
-         func_quote_for_eval "$arg"
- 	arg="$func_quote_for_eval_result"
-         func_append compile_command " $arg"

+ 2 - 2
package/firefox/patches/patch-media_mtransport_third_party_nICEr_src_stun_addrs_c

@@ -1,11 +1,11 @@
 --- mozilla-release.orig/media/mtransport/third_party/nICEr/src/stun/addrs.c	2013-09-11 01:15:16.000000000 +0200
-+++ mozilla-release/media/mtransport/third_party/nICEr/src/stun/addrs.c	2013-10-23 16:28:38.000000000 +0200
++++ mozilla-release/media/mtransport/third_party/nICEr/src/stun/addrs.c	2013-12-10 13:18:17.000000000 +0100
 @@ -59,7 +59,7 @@ static char *RCSSTRING __UNUSED__="$Id:
  #include <net/if_dl.h>
  #include <net/if_types.h>
  #include <sys/sockio.h>
 -#else
-+#elif 0
++#elif __GLIBC__
  #include <linux/if.h>
  #endif
  #include <net/route.h>

+ 6 - 3
package/kmod/Makefile

@@ -4,13 +4,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		kmod
-PKG_VERSION:=		5
+PKG_VERSION:=		15
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		b271c2ec54aba1c67bda63c8579d8c15
+PKG_MD5SUM:=		d03372179ed2cfa0c52b6672cf438901
 PKG_DESCR:=		kernel module loading library
 PKG_SECTION:=		libs
 PKG_URL:=		http://profusion.mobi/index.php
-PKG_SITES:=		http://packages.profusion.mobi/kmod/
+PKG_SITES:=		https://www.kernel.org/pub/linux/utils/kernel/kmod/
 PKG_OPTS:=		dev
 
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.xz
@@ -19,6 +19,9 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,KMOD,kmod,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+CONFIG_STYLE:=		minimal
+CONFIGURE_ARGS+=	--host=${REAL_GNU_TARGET_NAME}
+
 kmod-install:
 	$(INSTALL_DIR) $(IDIR_KMOD)/usr/bin
 	$(INSTALL_DIR) $(IDIR_KMOD)/usr/lib

+ 13 - 0
package/kmod/patches/patch-libkmod_libkmod_pc_in

@@ -0,0 +1,13 @@
+--- kmod-15.orig/libkmod/libkmod.pc.in	2013-04-24 22:02:37.000000000 +0200
++++ kmod-15/libkmod/libkmod.pc.in	2013-12-09 12:32:04.000000000 +0100
+@@ -1,7 +1,7 @@
+ prefix=@prefix@
+-exec_prefix=@exec_prefix@
+-libdir=@libdir@
+-includedir=@includedir@
++exec_prefix=${prefix}
++libdir=${prefix}/lib
++includedir=${prefix}/include
+ 
+ Name: libkmod
+ Description: Library to deal with kernel modules

+ 2 - 2
package/systemd/Makefile

@@ -9,8 +9,8 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		df64550d92afbffb4f67a434193ee165
 PKG_DESCR:=		System and Service Manager
 PKG_SECTION:=		utils
-PKG_DEPENDS:=		libblkid
-PKG_BUILDDEP:=		usbutils glib kmod util-linux
+PKG_DEPENDS:=		libblkid libcap
+PKG_BUILDDEP:=		usbutils glib kmod util-linux libcap
 PKG_URL:=		http://freedesktop.org/wiki/Software/systemd/
 PKG_SITES:=		http://www.freedesktop.org/software/systemd/
 PKG_LIBNAME:=		libudev

+ 1 - 0
package/vlc/Makefile

@@ -40,6 +40,7 @@ CONFIGURE_ARGS+=	--disable-lua \
 			--enable-libgcrypt \
 			--enable-mad \
 			--enable-theora \
+			--disable-static \
 			--disable-avcodec
 
 vlc-install:

+ 11 - 0
package/vlc/patches/patch-modules_text_renderer_freetype_c

@@ -0,0 +1,11 @@
+--- vlc-2.1.1.orig/modules/text_renderer/freetype.c	2013-09-12 17:18:34.000000000 +0200
++++ vlc-2.1.1/modules/text_renderer/freetype.c	2013-12-10 10:13:38.000000000 +0100
+@@ -90,7 +90,7 @@
+ #endif
+ 
+ /* Freetype */
+-#include <freetype/ftsynth.h>
++#include <ftsynth.h>
+ #include FT_FREETYPE_H
+ #include FT_GLYPH_H
+ #include FT_STROKER_H