diff options
Diffstat (limited to 'package')
-rw-r--r-- | package/cluster-glue/Makefile | 1 | ||||
-rw-r--r-- | package/cutter/patches/patch-cutter_c | 17 | ||||
-rw-r--r-- | package/ipsec-tools/patches/patch-src_racoon_isakmp_c | 21 | ||||
-rw-r--r-- | package/libhugetlbfs/Makefile | 2 | ||||
-rw-r--r-- | package/llvm/Makefile | 1 | ||||
-rw-r--r-- | package/openjdk/Makefile | 2 | ||||
-rw-r--r-- | package/openjdk/patches/rename-libnet.patch | 127 | ||||
-rw-r--r-- | package/pacemaker/Makefile | 1 | ||||
-rw-r--r-- | package/resource-agents/Makefile | 1 | ||||
-rw-r--r-- | package/usbutils/Makefile | 4 |
10 files changed, 170 insertions, 7 deletions
diff --git a/package/cluster-glue/Makefile b/package/cluster-glue/Makefile index 0e889194f..140526ebc 100644 --- a/package/cluster-glue/Makefile +++ b/package/cluster-glue/Makefile @@ -15,6 +15,7 @@ PKG_SITES:= http://openadk.org/distfiles/ PKG_CFLINE_CLUSTER_GLUE:= depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC PKG_HOST_DEPENDS:= !darwin +PKG_ARCH_DEPENDS:= x86 x86_64 include $(TOPDIR)/mk/package.mk diff --git a/package/cutter/patches/patch-cutter_c b/package/cutter/patches/patch-cutter_c index 781c17401..03129f87e 100644 --- a/package/cutter/patches/patch-cutter_c +++ b/package/cutter/patches/patch-cutter_c @@ -1,7 +1,18 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ --- cutter-1.03.orig/cutter.c 2005-04-30 09:01:03.000000000 +0200 -+++ cutter-1.03/cutter.c 2008-10-09 11:32:40.000000000 +0200 -@@ -297,7 +297,7 @@ int send_rst( ++++ cutter-1.03/cutter.c 2011-08-24 18:49:58.830478484 +0200 +@@ -35,6 +35,10 @@ + * improvment. + */ + ++#ifndef __packed ++#define __packed __attribute__((packed)) ++#endif ++ + #include <string.h> + #include <stdio.h> + #include <unistd.h> +@@ -297,7 +301,7 @@ int send_rst( pheader.placeholder=0; pheader.protocol=IPPROTO_TCP; pheader.tcp_length=htons(TCPHDR); @@ -10,7 +21,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ tpack.tcp.check=in_cksum((unsigned short *)&pheader,TCPHDR+12); /* -@@ -419,7 +419,7 @@ int send_rst( +@@ -419,7 +423,7 @@ int send_rst( pheader.placeholder=0; pheader.protocol=IPPROTO_TCP; pheader.tcp_length=htons(TCPHDR); diff --git a/package/ipsec-tools/patches/patch-src_racoon_isakmp_c b/package/ipsec-tools/patches/patch-src_racoon_isakmp_c new file mode 100644 index 000000000..fdf5356fc --- /dev/null +++ b/package/ipsec-tools/patches/patch-src_racoon_isakmp_c @@ -0,0 +1,21 @@ +--- ipsec-tools-0.8.0.orig/src/racoon/isakmp.c 2011-03-15 14:20:14.000000000 +0100 ++++ ipsec-tools-0.8.0/src/racoon/isakmp.c 2011-08-24 18:48:47.887978959 +0200 +@@ -33,6 +33,10 @@ + + #include "config.h" + ++#ifndef __packed ++#define __packed __attribute__((packed)) ++#endif ++ + #include <sys/types.h> + #include <sys/param.h> + #include <sys/socket.h> +@@ -130,6 +134,7 @@ + # define SOL_UDP IPPROTO_UDP + # endif /* __NetBSD__ / __FreeBSD__ */ + ++ + static int nostate1 __P((struct ph1handle *, vchar_t *)); + static int nostate2 __P((struct ph2handle *, vchar_t *)); + diff --git a/package/libhugetlbfs/Makefile b/package/libhugetlbfs/Makefile index 11d8cc9a4..7541c3128 100644 --- a/package/libhugetlbfs/Makefile +++ b/package/libhugetlbfs/Makefile @@ -13,7 +13,7 @@ PKG_URL:= http://libhugetlbfs.ozlabs.org/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=libhugetlbfs/} PKG_CFLINE_LIBHUGETLBFS:= depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC -PKG_ARCH_DEPENDS:= x86 x86_64 arm +PKG_ARCH_DEPENDS:= x86 x86_64 include $(TOPDIR)/mk/package.mk diff --git a/package/llvm/Makefile b/package/llvm/Makefile index 0dfd2d3ec..1ac7c3a10 100644 --- a/package/llvm/Makefile +++ b/package/llvm/Makefile @@ -14,6 +14,7 @@ PKG_SITES:= http://llvm.org/releases/2.9/ PKG_CFLINE_LLVM:= depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC PKG_HOST_DEPENDS:= !darwin +PKG_ARCH_DEPENDS:= mips x86 x86_64 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile index ddc34cacb..2c953c0fe 100644 --- a/package/openjdk/Makefile +++ b/package/openjdk/Makefile @@ -26,7 +26,7 @@ PKG_SITES:= http://download.java.net/openjdk/jdk6/promoted/b22/ \ PKG_HOST_DEPENDS:= !darwin !cygwin !openbsd !netbsd !freebsd PKG_ARCH_DEPENDS:= arm mips x86 x86_64 -PKG_SYSTEM_DEPENDS:= !lemote-yeelong !linksys-ag241 !fon-fon2100 +PKG_SYSTEM_DEPENDS:= !lemote-yeelong !linksys-ag241 !fon-fon2100 !broadcom-bcm47xx # autotools infrastructure for OpenJDK ICEDTEA_NAME:= icedtea6 diff --git a/package/openjdk/patches/rename-libnet.patch b/package/openjdk/patches/rename-libnet.patch new file mode 100644 index 000000000..671c80dcc --- /dev/null +++ b/package/openjdk/patches/rename-libnet.patch @@ -0,0 +1,127 @@ +https://evolvis.org/scm/viewvc.php/jalimo/trunk/oe-overlay/packages/openjdk/openjdk-6-6b18-1.8/icedtea-libnet-renaming.patch?revision=864&view=markup&pathrev=867 +--- w-openjdk-6.orig/openjdk-6/jdk/make/java/net/Makefile 2011-02-28 17:06:10.000000000 +0100 ++++ w-openjdk-6/openjdk-6/jdk/make/java/net/Makefile 2011-09-02 16:20:55.597991415 +0200 +@@ -25,7 +25,7 @@ + + BUILDDIR = ../.. + PACKAGE = java.net +-LIBRARY = net ++LIBRARY = javanet + PRODUCT = sun + include $(BUILDDIR)/common/Defs.gmk + +--- w-openjdk-6.orig/openjdk-6/jdk/make/java/nio/Makefile 2011-02-28 17:06:11.000000000 +0100 ++++ w-openjdk-6/openjdk-6/jdk/make/java/nio/Makefile 2011-09-02 16:21:37.817990454 +0200 +@@ -135,11 +135,11 @@ + endif + ifeq ($(PLATFORM), linux) + COMPILER_WARNINGS_FATAL=true +-OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread -ldl ++OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -ljavanet -lpthread -ldl + endif + ifeq ($(PLATFORM), solaris) + OTHER_LDLIBS += $(JVMLIB) $(LIBSOCKET) -lposix4 -ldl \ +- -L$(LIBDIR)/$(LIBARCH) -ljava -lnet ++ -L$(LIBDIR)/$(LIBARCH) -ljava -ljavanet + endif # PLATFORM + + # +--- w-openjdk-6.orig/openjdk-6/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java 2011-02-28 17:06:22.000000000 +0100 ++++ w-openjdk-6/openjdk-6/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java 2011-09-02 16:22:26.507995127 +0200 +@@ -59,7 +59,7 @@ + */ + static { + java.security.AccessController.doPrivileged( +- new sun.security.action.LoadLibraryAction("net")); ++ new sun.security.action.LoadLibraryAction("javanet")); + } + + /** +--- w-openjdk-6.orig/openjdk-6/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java 2011-02-28 17:06:22.000000000 +0100 ++++ w-openjdk-6/openjdk-6/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java 2011-09-02 16:22:58.041740544 +0200 +@@ -79,7 +79,7 @@ + */ + static { + java.security.AccessController.doPrivileged( +- new sun.security.action.LoadLibraryAction("net")); ++ new sun.security.action.LoadLibraryAction("javanet")); + } + + /** +--- w-openjdk-6.orig/openjdk-6/jdk/src/share/classes/java/net/DatagramPacket.java 2011-02-28 17:06:22.000000000 +0100 ++++ w-openjdk-6/openjdk-6/jdk/src/share/classes/java/net/DatagramPacket.java 2011-09-02 16:23:20.197991292 +0200 +@@ -47,7 +47,7 @@ + */ + static { + java.security.AccessController.doPrivileged( +- new sun.security.action.LoadLibraryAction("net")); ++ new sun.security.action.LoadLibraryAction("javanet")); + init(); + } + +--- w-openjdk-6.orig/openjdk-6/jdk/src/share/classes/java/net/InetAddress.java 2011-02-28 17:06:22.000000000 +0100 ++++ w-openjdk-6/openjdk-6/jdk/src/share/classes/java/net/InetAddress.java 2011-09-02 16:23:57.670490341 +0200 +@@ -231,7 +231,7 @@ + static { + preferIPv6Address = java.security.AccessController.doPrivileged( + new GetBooleanAction("java.net.preferIPv6Addresses")).booleanValue(); +- AccessController.doPrivileged(new LoadLibraryAction("net")); ++ AccessController.doPrivileged(new LoadLibraryAction("javanet")); + init(); + } + +--- w-openjdk-6.orig/openjdk-6/jdk/src/share/classes/java/net/NetworkInterface.java 2011-02-28 17:06:22.000000000 +0100 ++++ w-openjdk-6/openjdk-6/jdk/src/share/classes/java/net/NetworkInterface.java 2011-09-02 16:24:13.879239438 +0200 +@@ -52,7 +52,7 @@ + private boolean virtual = false; + + static { +- AccessController.doPrivileged(new LoadLibraryAction("net")); ++ AccessController.doPrivileged(new LoadLibraryAction("javanet")); + init(); + } + +--- w-openjdk-6.orig/openjdk-6/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java 2011-02-28 17:06:34.000000000 +0100 ++++ w-openjdk-6/openjdk-6/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java 2011-09-02 16:24:50.877990409 +0200 +@@ -89,7 +89,7 @@ + }}); + if (b != null && b.booleanValue()) { + java.security.AccessController.doPrivileged( +- new sun.security.action.LoadLibraryAction("net")); ++ new sun.security.action.LoadLibraryAction("javanet")); + hasSystemProxies = init(); + } + } +--- w-openjdk-6.orig/openjdk-6/jdk/src/share/classes/sun/nio/ch/Util.java 2011-02-28 17:06:35.000000000 +0100 ++++ w-openjdk-6/openjdk-6/jdk/src/share/classes/sun/nio/ch/Util.java 2011-09-02 16:25:45.749240462 +0200 +@@ -354,7 +354,7 @@ + return; + loaded = true; + java.security.AccessController +- .doPrivileged(new sun.security.action.LoadLibraryAction("net")); ++ .doPrivileged(new sun.security.action.LoadLibraryAction("javanet")); + java.security.AccessController + .doPrivileged(new sun.security.action.LoadLibraryAction("nio")); + // IOUtil must be initialized; Its native methods are called from +--- w-openjdk-6.orig/openjdk-6/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2011-02-28 17:06:48.000000000 +0100 ++++ w-openjdk-6/openjdk-6/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2011-09-02 16:26:36.017990742 +0200 +@@ -244,7 +244,7 @@ + + static { + java.security.AccessController.doPrivileged( +- new sun.security.action.LoadLibraryAction("net")); ++ new sun.security.action.LoadLibraryAction("javanet")); + } + + } +--- w-openjdk-6.orig/openjdk-6/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2011-02-28 17:06:51.000000000 +0100 ++++ w-openjdk-6/openjdk-6/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2011-09-02 16:27:07.069240501 +0200 +@@ -160,7 +160,7 @@ + + static { + java.security.AccessController.doPrivileged( +- new sun.security.action.LoadLibraryAction("net")); ++ new sun.security.action.LoadLibraryAction("javanet")); + init0(); + + // start the address listener thread diff --git a/package/pacemaker/Makefile b/package/pacemaker/Makefile index 8f0b6bbe2..82b217f17 100644 --- a/package/pacemaker/Makefile +++ b/package/pacemaker/Makefile @@ -15,6 +15,7 @@ PKG_SITES:= http://openadk.org/distfiles/ PKG_CFLINE_PACEMAKER:= depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC PKG_HOST_DEPENDS:= !darwin +PKG_ARCH_DEPENDS:= x86 include $(TOPDIR)/mk/package.mk diff --git a/package/resource-agents/Makefile b/package/resource-agents/Makefile index 30f63b07b..6611a579c 100644 --- a/package/resource-agents/Makefile +++ b/package/resource-agents/Makefile @@ -14,6 +14,7 @@ PKG_SITES:= http://openadk.org/distfiles/ PKG_CFLINE_RESOURCE_AGENTS:= depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC PKG_HOST_DEPENDS:= !darwin +PKG_ARCH_DEPENDS:= x86 include $(TOPDIR)/mk/package.mk diff --git a/package/usbutils/Makefile b/package/usbutils/Makefile index 31c2b6980..e4c903bef 100644 --- a/package/usbutils/Makefile +++ b/package/usbutils/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 94a1738fe92062cdd6a9642eeaccefc1 PKG_DESCR:= A program to list USB devices PKG_SECTION:= utils -PKG_DEPENDS:= libusb libusb-compat libpthread -PKG_BUILDDEP:= libusb libusb-compat +PKG_DEPENDS:= libusb libusb-compat libpthread zlib +PKG_BUILDDEP:= libusb libusb-compat zlib PKG_SITES:= http://www.kernel.org/pub/linux/utils/usb/usbutils/ PKG_SUBPKGS:= LSUSB |