Browse Source

fix compile issues

Waldemar Brodkorb 11 years ago
parent
commit
19677ae003

+ 1 - 1
package/gnutls/Makefile

@@ -40,7 +40,7 @@ CONFIGURE_ARGS+= 	--enable-cryptodev
 endif
 
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
-TARGET_LDFLAGS+=	-pthread
+TARGET_LDFLAGS+=	-pthread -L$(STAGING_DIR)/usr/lib64
 CONFIGURE_ARGS+=	--disable-rpath \
 			--without-libz-prefix \
 			--without-p11-kit \

+ 14 - 0
package/parted/patches/patch-lib_config_h_in

@@ -0,0 +1,14 @@
+--- parted-3.0.orig/lib/config.h.in	2011-05-30 09:07:32.000000000 +0200
++++ parted-3.0/lib/config.h.in	2013-02-11 15:50:00.000000000 +0100
+@@ -1385,6 +1385,11 @@
+ # endif
+ #endif
+ 
++/* Enable large inode numbers on Mac OS X 10.5.  */
++#ifndef _DARWIN_USE_64_BIT_INODE
++# define _DARWIN_USE_64_BIT_INODE 1
++#endif
++
+ /* Number of bits in a file offset, on hosts where this is settable. */
+ #undef _FILE_OFFSET_BITS
+ 

+ 10 - 0
package/parted/patches/patch-lib_stdio_in_h

@@ -0,0 +1,10 @@
+--- parted-3.0.orig/lib/stdio.in.h	2011-05-30 09:07:16.000000000 +0200
++++ parted-3.0/lib/stdio.in.h	2013-02-11 15:51:17.000000000 +0100
+@@ -735,7 +735,6 @@ _GL_CXXALIASWARN (gets);
+ /* It is very rare that the developer ever has full control of stdin,
+    so any use of gets warrants an unconditional warning.  Assume it is
+    always declared, since it is required by C89.  */
+-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+ #endif
+ 
+ 

+ 1 - 1
package/udev/Makefile

@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		e31c83159b017e8ab0fa2f4bca758a41
 PKG_DESCR:=		Dynamic device management subsystem
 PKG_SECTION:=		utils
-PKG_BUILDDEP:=		usbutils glib
+PKG_BUILDDEP:=		usbutils glib kmod
 PKG_URL:=		http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
 PKG_SITES:=		${MASTER_SITE_KERNEL:=utils/kernel/hotplug/}
 

+ 24 - 0
package/urlgrabber/patches/patch-setup_py

@@ -0,0 +1,24 @@
+--- urlgrabber-3.9.1.orig/setup.py	2009-02-23 22:37:16.000000000 +0100
++++ urlgrabber-3.9.1/setup.py	2013-02-11 13:46:37.000000000 +0100
+@@ -1,16 +1,16 @@
+ # urlgrabber distutils setup
+ import re as _re
+-import urlgrabber as _urlgrabber
++#import urlgrabber as _urlgrabber
+ 
+ name = "urlgrabber"
+ description = "A high-level cross-protocol url-grabber"
+-long_description = _urlgrabber.__doc__
++long_description = "A high-level cross-protocol url-grabber"
+ license = "LGPL"
+-version = _urlgrabber.__version__
+-_authors = _re.split(r',\s+', _urlgrabber.__author__)
++version = "3.9.1"
++_authors = _re.split(r',\s+', 'Michael D. Stenner, Ryan Tomayko')
+ author       = ', '.join([_re.sub(r'\s+<.*',        r'', _) for _ in _authors])
+ author_email = ', '.join([_re.sub(r'(^.*<)|(>.*$)', r'', _) for _ in _authors])
+-url = _urlgrabber.__url__
++url = "http://linux.duke.edu/projects/urlgrabber/"
+ 
+ packages = ['urlgrabber']
+ package_dir = {'urlgrabber':'urlgrabber'}

+ 24 - 0
package/urlgrabber/patches/patch-setup_py.orig

@@ -0,0 +1,24 @@
+--- urlgrabber-3.9.1.orig/setup.py	2009-02-23 22:37:16.000000000 +0100
++++ urlgrabber-3.9.1/setup.py	2013-02-11 13:46:24.000000000 +0100
+@@ -1,16 +1,16 @@
+ # urlgrabber distutils setup
+ import re as _re
+-import urlgrabber as _urlgrabber
++#import urlgrabber as _urlgrabber
+ 
+ name = "urlgrabber"
+ description = "A high-level cross-protocol url-grabber"
+-long_description = _urlgrabber.__doc__
++long_description = "A high-level cross-protocol url-grabber"
+ license = "LGPL"
+-version = _urlgrabber.__version__
+-_authors = _re.split(r',\s+', _urlgrabber.__author__)
++version = 3.9.1
++_authors = _re.split(r',\s+', 'Michael D. Stenner, Ryan Tomayko')
+ author       = ', '.join([_re.sub(r'\s+<.*',        r'', _) for _ in _authors])
+ author_email = ', '.join([_re.sub(r'(^.*<)|(>.*$)', r'', _) for _ in _authors])
+-url = _urlgrabber.__url__
++url = "http://linux.duke.edu/projects/urlgrabber/"
+ 
+ packages = ['urlgrabber']
+ package_dir = {'urlgrabber':'urlgrabber'}

+ 1 - 1
package/xorg-server/Makefile

@@ -12,7 +12,7 @@ PKG_SECTION:=		x11/server
 PKG_DEPENDS:=		libopenssl libxfont pixman libpciaccess libxkbfile
 PKG_DEPENDS+=		libfontenc xkeyboard-config xkbcomp libxau libxaw
 PKG_DEPENDS+=		libxmu libxpm libxrender libxt libxxf86dga libxext
-PKG_DEPENDS+=		libxdmcp libxv libsm libice libx11 libxcb libgcc
+PKG_DEPENDS+=		libxdmcp libxv libsm libice libx11 libxcb libgcc librt
 PKG_BUILDDEP:=		libX11 randrproto renderproto fixesproto damageproto
 PKG_BUILDDEP+=		scrnsaverproto resourceproto fontsproto videoproto
 PKG_BUILDDEP+=		compositeproto evieext libxkbfile libXfont pixman

+ 10 - 2
target/linux/config/Config.in.netdevice

@@ -158,13 +158,21 @@ config ADK_KERNEL_E1000
 	default y if ADK_TARGET_SYSTEM_VBOX_I686
 	default y if ADK_TARGET_SYSTEM_IBM_X40
 	default y if ADK_NATIVE_SYSTEM_IBM_X40
-	default y if ADK_TARGET_SYSTEM_TAROX_PC
-	default y if ADK_NATIVE_SYSTEM_TAROX_PC
 	default y if ADK_TARGET_SYSTEM_QEMU_I686
 	default y if ADK_TARGET_SYSTEM_QEMU_X86_64
 	default n
 	help
 
+config ADK_KERNEL_E1000E
+	boolean
+	select ADK_KERNEL_NETDEVICES
+	select ADK_KERNEL_NET_ETHERNET
+	select ADK_KERNEL_NETDEV_1000
+	default y if ADK_TARGET_SYSTEM_TAROX_PC
+	default y if ADK_NATIVE_SYSTEM_TAROX_PC
+	default n
+	help
+
 config ADK_KERNEL_SKY2
 	boolean
 	select ADK_KERNEL_NETDEVICES

+ 1 - 0
target/linux/config/Config.in.netfilter.core

@@ -17,6 +17,7 @@ config ADK_KPACKAGE_KMOD_NF_CONNTRACK
 
 config ADK_KPACKAGE_KMOD_NETFILTER_XT_TARGET_CHECKSUM
 	tristate '"CHECKSUM" target support'
+	select ADK_KPACKAGE_KMOD_IP_NF_IPTABLES
 	select ADK_KERNEL_NETFILTER_XTABLES
 	select ADK_KPACKAGE_KMOD_IP_NF_MANGLE
 	select ADK_KERNEL_NETFILTER_ADVANCED