diff options
59 files changed, 2403 insertions, 2418 deletions
@@ -1,7 +1,6 @@ - add grsec kernel patch - microblaze: add cfgfs partition to dts, add partition to spartan dts - use host-tools infrastructure for openjdk7 -- remove openjdk6 - evaluate libguestfs for image creation - check for gcc and SSP again - port w3m diff --git a/jtools/Makefile b/jtools/Makefile index 4c911b33d..23d93a6d4 100644 --- a/jtools/Makefile +++ b/jtools/Makefile @@ -4,13 +4,9 @@ include $(TOPDIR)/rules.mk TARGETS:= -ifneq ($(ADK_PACKAGE_OPENJDK),) # jikes is for ant -TARGETS+=fastjar gcj ecj jikes classpath jamvm ant openjdk qemu -endif ifneq ($(ADK_PACKAGE_OPENJDK7),) -# jikes is for ant -TARGETS+=fastjar gcj ecj jikes classpath jamvm ant openjdk7 +TARGETS:=fastjar gcj ecj jikes classpath jamvm ant openjdk7 endif TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS)) diff --git a/jtools/openjdk/Makefile b/jtools/openjdk/Makefile deleted file mode 100644 index 32e0eac0e..000000000 --- a/jtools/openjdk/Makefile +++ /dev/null @@ -1,96 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -include $(TOPDIR)/rules.mk - -PKG_NAME:= openjdk -PKG_VERSION:= 6 -PKG_EXTRAVER:= b22-28_feb_2011 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 2d2bbbb0f9b81f1fec41ec730da8a933 \ - fd3f35e8a8a2ef9a64c035ed66cea06d \ - ef7a8b3624ea904bf584bc46d79b5e75 \ - bc95c133620bd68c161cac9891592901 \ - 91adfd41e6f001add4f92ae31216b1e3 \ - d526d0848c88607ce4e3a0a4edb75d50 -PKG_DESCR:= OpenJDK Java VM -PKG_SECTION:= lang -PKG_URL:= http://openjdk.org/ -PKG_SITES:= http://download.java.net/openjdk/jdk6/promoted/b22/ \ - http://mirror.netcologne.de/apache.org/xml/xalan-j/binaries/ \ - http://icedtea.classpath.org/download/drops/ \ - http://icedtea.classpath.org/download/source/ - -# autotools infrastructure for OpenJDK -ICEDTEA_NAME:= icedtea6 -ICEDTEA_VERSION:= 1.10 - -# bootstrap JARs -XALAN_NAME= xalan-j -XALAN_VERSION= 2_7_0 - -# override generic extraction -EXTRACT_OVERRIDE:= 1 -DISTFILES:= openjdk-$(PKG_VERSION)-src-$(PKG_EXTRAVER).tar.gz \ - $(ICEDTEA_NAME)-$(ICEDTEA_VERSION).tar.gz \ - jaxp144_01.zip \ - jdk6-jaf-b20.zip \ - jdk6-jaxws-b20.zip \ - ${XALAN_NAME}_${XALAN_VERSION}-bin.tar.gz - -WRKDIST= ${WRKDIR} -WRKSRC= ${WRKDIST}/${ICEDTEA_NAME}-${ICEDTEA_VERSION} - -include ../rules.mk - -OPENJDK_NATIVE_ENV+= JAVACFLAGS="-cp ${STAGING_JAVA_HOST_DIR}/usr/share/java/libgcj-$(GCJ_VER).jar" -OPENJDK_NATIVE_ENV+= DYLD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 -OPENJDK_NATIVE_ENV+= LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 -OPENJDK_NATIVE_ENV+= ADK_ECJ=$(STAGING_JAVA_HOST_DIR)/usr/bin/ecj PATH=$$PATH:$(STAGING_JAVA_HOST_DIR)/usr/bin -OPENJDK_NATIVE_ENV+= BOOTCLASSPATH="$(STAGING_JAVA_HOST_DIR)/usr/share/jamvm/classes.zip:$(STAGING_JAVA_HOST_DIR)/usr/share/classpath/glibj.zip" - -install: ${STAGING_JAVA_HOST_DIR}/bootstrap-jdk/bin/java - -do-extract: -$(WRKDIST)/.extract: $(WRKDIST)/.extract_done - cd ${WRKDIST}; mkdir openjdk-$(PKG_VERSION); \ - tar xzf $(TOPDIR)/dl/openjdk-$(PKG_VERSION)-src-$(PKG_EXTRAVER).tar.gz -C openjdk-$(PKG_VERSION) - cd $(WRKDIST); tar xzf $(TOPDIR)/dl/$(ICEDTEA_NAME)-$(ICEDTEA_VERSION).tar.gz - cd ${WRKDIST}; tar xzf ${TOPDIR}/dl/${XALAN_NAME}_${XALAN_VERSION}-bin.tar.gz - mkdir -p ${WRKBUILD}/drops - cd ${TOPDIR}/dl; cp jaxp144_01.zip jdk6-jaf-b20.zip jdk6-jaxws-b20.zip ${WRKBUILD}/drops - cd $(WRKDIST); patch -p0 < ${TOPDIR}/jtools/openjdk/patches/openjdk.patch - cd $(WRKDIST); patch -p0 < ${TOPDIR}/jtools/openjdk/patches/iconv.patch - cd $(WRKDIST); patch -p0 < ${TOPDIR}/jtools/openjdk/patches/remove-libnsl.patch - cd $(WRKDIST); patch -p0 < ${TOPDIR}/jtools/openjdk/patches/linux3.patch - cd $(WRKDIST); patch -p0 < ${TOPDIR}/jtools/openjdk/patches/disable-backtrace.patch - touch $@ - -$(WRKDIST)/.configured: ${WRKDIST}/.extract - cd ${WRKBUILD}; rm -rf config.{cache,status}; \ - export ${OPENJDK_NATIVE_ENV}; ./configure \ - --enable-bootstrap \ - --enable-zero \ - --disable-openjdk-cross-compilation \ - --with-openjdk-src-dir=$(WRKDIST)/$(PKG_NAME)-$(PKG_VERSION) \ - --with-jdk-home=$(STAGING_JAVA_HOST_DIR)/usr/lib/jvm \ - --with-java=$(STAGING_JAVA_HOST_DIR)/usr/bin/java \ - --with-javac=$(STAGING_JAVA_HOST_DIR)/usr/bin/ecj \ - --with-gcj=$(STAGING_JAVA_HOST_DIR)/usr/bin/gcj \ - --with-ecj-jar=${STAGING_JAVA_HOST_DIR}/usr/share/java/ecj.jar \ - --with-xalan2-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/xalan.jar \ - --with-xalan2-serializer-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/serializer.jar \ - --with-xerces2-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/xercesImpl.jar \ - --without-rhino \ - --disable-docs - touch $@ - -$(WRKBUILD)/.compiled: ${WRKDIST}/.configured - export ${OPENJDK_NATIVE_ENV}; $(MAKE) -C $(WRKBUILD) - touch $@ - -${STAGING_JAVA_HOST_DIR}/bootstrap-jdk/bin/java: $(WRKBUILD)/.compiled - $(CP) $(WRKSRC)/openjdk.build/j2sdk-image $(STAGING_JAVA_HOST_DIR)/bootstrap-jdk - touch $@ - -include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/jtools/openjdk/patches/disable-backtrace.patch b/jtools/openjdk/patches/disable-backtrace.patch deleted file mode 100644 index 393ee9251..000000000 --- a/jtools/openjdk/patches/disable-backtrace.patch +++ /dev/null @@ -1,24 +0,0 @@ - - uClibc does not have backtrace support right now. Disable it for now. - ---- openjdk-6.orig/jdk/src/solaris/native/sun/xawt/XToolkit.c 2011-02-28 17:06:50.000000000 +0100 -+++ openjdk-6/jdk/src/solaris/native/sun/xawt/XToolkit.c 2011-08-08 10:45:01.445330729 +0200 -@@ -27,9 +27,6 @@ - #include <X11/Xutil.h> - #include <X11/Xos.h> - #include <X11/Xatom.h> --#ifdef __linux__ --#include <execinfo.h> --#endif - - #include <jvm.h> - #include <jni.h> -@@ -689,7 +686,7 @@ - return ret; - } - --#ifdef __linux__ -+#if 0 - void print_stack(void) - { - void *array[10]; diff --git a/jtools/openjdk/patches/iconv.patch b/jtools/openjdk/patches/iconv.patch deleted file mode 100644 index c607d2195..000000000 --- a/jtools/openjdk/patches/iconv.patch +++ /dev/null @@ -1,36 +0,0 @@ - - add required linker flags. - ---- openjdk-6.orig/jdk/make/java/instrument/Makefile 2011-02-28 17:06:10.000000000 +0100 -+++ openjdk-6/jdk/make/java/instrument/Makefile 2011-04-11 23:14:27.571411016 +0200 -@@ -123,6 +123,8 @@ - # We don't want to link against -ljava - JAVALIB= - -+LDLIBS += -liconv -+ - # - # Add to ambient vpath so we pick up the library files - # ---- openjdk-6.orig/jdk/make/java/npt/Makefile 2011-02-28 17:06:11.000000000 +0100 -+++ openjdk-6/jdk/make/java/npt/Makefile 2011-04-11 23:14:07.017670197 +0200 -@@ -65,6 +65,8 @@ - # We don't want to link against -ljava - JAVALIB= - -+LDLIBS += -liconv -+ - # Add -export options to explicitly spell exported symbols - ifeq ($(PLATFORM), windows) - OTHER_LCF += -export:nptInitialize -export:nptTerminate ---- openjdk-6.orig/jdk/make/sun/splashscreen/Makefile 2011-02-28 17:06:12.000000000 +0100 -+++ openjdk-6/jdk/make/sun/splashscreen/Makefile 2011-04-11 23:15:07.221411030 +0200 -@@ -55,6 +55,8 @@ - - JAVALIB= - -+LDLIBS += -liconv -+ - # - # C Flags - # diff --git a/jtools/openjdk/patches/linux3.patch b/jtools/openjdk/patches/linux3.patch deleted file mode 100644 index bf6ccaa28..000000000 --- a/jtools/openjdk/patches/linux3.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- openjdk-6.orig/hotspot/make/linux/Makefile 2011-02-28 17:03:13.000000000 +0100 -+++ openjdk-6/hotspot/make/linux/Makefile 2012-03-27 22:44:07.897199377 +0200 -@@ -230,7 +230,7 @@ - # Solaris 2.5.1, 2.6). - # Disable this check by setting DISABLE_HOTSPOT_OS_VERSION_CHECK=ok. - --SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 2.7% -+SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 2.7% 3.0% 3.1% 3.2% 3.3% - OS_VERSION := $(shell uname -r) - EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION)) - diff --git a/jtools/openjdk/patches/openjdk.patch b/jtools/openjdk/patches/openjdk.patch deleted file mode 100644 index 85fbb87f4..000000000 --- a/jtools/openjdk/patches/openjdk.patch +++ /dev/null @@ -1,37 +0,0 @@ - -use precompiled ecj. - ---- openjdk-6.orig/Makefile 2011-02-28 17:02:07.000000000 +0100 -+++ openjdk-6/Makefile 2011-04-06 19:47:19.261818496 +0200 -@@ -25,9 +25,7 @@ - - BUILD_PARENT_DIRECTORY=. - --ifndef TOPDIR -- TOPDIR:=. --endif -+TOPDIR:=. - - ifndef JDK_TOPDIR - JDK_TOPDIR=$(TOPDIR)/jdk ---- icedtea6-1.10.orig/Makefile.in 2011-03-02 20:48:45.161291458 +0100 -+++ icedtea6-1.10/Makefile.in 2011-04-06 20:10:40.581819545 +0200 -@@ -1643,10 +1643,14 @@ - - stamps/native-ecj.stamp: - mkdir -p stamps ; \ -- if test "x$(GCJ)" != "xno"; then \ -- $(GCJ) $(IT_CFLAGS) -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \ -- --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR} ; \ -- fi ; \ -+ if test -n "${ADK_ECJ}" && test -x "${ADK_ECJ}"; then \ -+ ln -s "${ADK_ECJ}" native-ecj; \ -+ else \ -+ if test "x$(GCJ)" != "xno"; then \ -+ $(GCJ) $(IT_CFLAGS) -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \ -+ --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR} ; \ -+ fi ; \ -+ fi; \ - touch stamps/native-ecj.stamp - - clean-native-ecj: diff --git a/jtools/openjdk/patches/remove-libnsl.patch b/jtools/openjdk/patches/remove-libnsl.patch deleted file mode 100644 index d867d436b..000000000 --- a/jtools/openjdk/patches/remove-libnsl.patch +++ /dev/null @@ -1,72 +0,0 @@ - - remove libnsl from linking. - ---- openjdk-6.orig/jdk/make/java/hpi/hpi_common.gmk 2011-02-28 17:06:10.000000000 +0100 -+++ openjdk-6/jdk/make/java/hpi/hpi_common.gmk 2011-04-10 20:05:01.417672476 +0200 -@@ -86,5 +86,5 @@ - # Things that must be linked in. - # - ifneq ($(PLATFORM), windows) --OTHER_LDLIBS += $(LIBSOCKET) -lnsl $(LIBM) -ldl -+OTHER_LDLIBS += $(LIBSOCKET) $(LIBM) -ldl - endif ---- openjdk-6.orig/jdk/make/java/java/Makefile 2011-02-28 17:06:10.000000000 +0100 -+++ openjdk-6/jdk/make/java/java/Makefile 2011-04-10 20:05:20.637673621 +0200 -@@ -205,7 +205,7 @@ - OTHER_LDLIBS += $(JVMLIB) -libpath:$(OBJDIR)/../../../fdlibm/$(OBJDIRNAME) fdlibm.lib \ - -libpath:$(OBJDIR)/../../../verify/$(OBJDIRNAME) verify.lib - else --OTHER_LDLIBS += $(JVMLIB) -lverify $(LIBSOCKET) -lnsl -ldl \ -+OTHER_LDLIBS += $(JVMLIB) -lverify $(LIBSOCKET) -ldl \ - -L$(OBJDIR)/../../../fdlibm/$(OBJDIRNAME) -lfdlibm.$(ARCH) - endif - ---- openjdk-6.orig/jdk/make/java/net/Makefile 2011-02-28 17:06:10.000000000 +0100 -+++ openjdk-6/jdk/make/java/net/Makefile 2011-04-10 20:05:39.537672169 +0200 -@@ -97,7 +97,7 @@ - # Will not compile at warning level 3 if warnings are fatal - COMPILER_WARNINGS_FATAL=false - else -- OTHER_LDLIBS = $(LIBSOCKET) -lnsl -ldl $(JVMLIB) -+ OTHER_LDLIBS = $(LIBSOCKET) -ldl $(JVMLIB) - endif - ifeq ($(PLATFORM), linux) - OTHER_LDLIBS += -lpthread ---- openjdk-6.orig/jdk/make/jpda/transport/socket/Makefile 2011-02-28 17:06:11.000000000 +0100 -+++ openjdk-6/jdk/make/jpda/transport/socket/Makefile 2011-04-10 20:06:06.037672449 +0200 -@@ -42,11 +42,11 @@ - endif - - ifeq ($(PLATFORM), linux) -- OTHER_LDLIBS += -lnsl $(LIBSOCKET) -lpthread -+ OTHER_LDLIBS += $(LIBSOCKET) -lpthread - endif - - ifeq ($(PLATFORM), solaris) -- OTHER_LDLIBS += -lnsl $(LIBSOCKET) -+ OTHER_LDLIBS += $(LIBSOCKET) - endif - - ifeq ($(PLATFORM), windows) ---- openjdk-6.orig/jdk/make/java/java_hprof_demo/Makefile 2011-02-28 17:06:10.000000000 +0100 -+++ openjdk-6/jdk/make/java/java_hprof_demo/Makefile 2011-04-10 20:28:43.287672398 +0200 -@@ -83,7 +83,7 @@ - ifeq ($(PLATFORM), windows) - OTHER_LDLIBS += wsock32.lib winmm.lib - else -- OTHER_LDLIBS += $(LIBSOCKET) -lnsl -ldl -+ OTHER_LDLIBS += $(LIBSOCKET) -ldl - endif - - # ---- openjdk-6.orig/jdk/make/mkdemo/jvmti/hprof/Makefile 2011-02-28 17:06:11.000000000 +0100 -+++ openjdk-6/jdk/make/mkdemo/jvmti/hprof/Makefile 2011-04-11 10:23:11.538911604 +0200 -@@ -42,7 +42,7 @@ - OTHER_LDLIBS += $(LIBSOCKET) -lnsl -ldl - endif - ifeq ($(PLATFORM), linux) -- OTHER_LDLIBS += $(LIBSOCKET) -lnsl -ldl -lpthread -+ OTHER_LDLIBS += $(LIBSOCKET) -ldl -lpthread - endif - - # diff --git a/mk/build.mk b/mk/build.mk index abf2d4a7c..986d66cd7 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -26,7 +26,6 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_PACKAGE_PACEMAKER=n \ ADK_PACKAGE_PACEMAKER_MGMTD=n \ ADK_PACKAGE_PACEMAKER_PYTHON_GUI=n \ - ADK_PACKAGE_OPENJDK=n \ ADK_PACKAGE_OPENJDK7=n \ ADK_PACKAGE_CLASSPATH=n \ ADK_PACKAGE_GRUB=n \ diff --git a/mk/modules.mk b/mk/modules.mk index ae38b5f90..22afead3b 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -108,20 +108,36 @@ $(eval $(call KMOD_template,P54_USB,p54-usb,\ $(eval $(call KMOD_template,RT2X00,rt2x00,\ $(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt2x00lib \ - $(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt2x00pci \ ,17)) +$(eval $(call KMOD_template,RT2X00_LIB_PCI,rt2x00pci,\ + $(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt2x00pci \ +,18)) + +$(eval $(call KMOD_template,RT2X00_LIB_USB,rt2x00usb,\ + $(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt2x00usb \ +,18)) + $(eval $(call KMOD_template,RT2400PCI,rt2400pci,\ $(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt2400pci \ -,20, kmod-leds-class kmod-rt2x00)) +,20, kmod-leds-class kmod-rt2x00 rt2x00pci)) $(eval $(call KMOD_template,RT2500PCI,rt2500pci,\ $(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt2500pci \ -,20, kmod-leds-class kmod-rt2x00)) +,20, kmod-leds-class kmod-rt2x00 kmod-rt2x00pci)) + +$(eval $(call KMOD_template,RT2800USB,rt2800usb,\ + $(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt2800lib \ + $(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt2800usb \ +,20, kmod-rt2x00 kmod-rt2x00usb)) $(eval $(call KMOD_template,RT61PCI,rt61pci,\ $(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt61pci \ -,20, kmod-leds-class kmod-rt2x00)) +,20, kmod-leds-class kmod-rt2x00 rt2x00pci)) + +$(eval $(call KMOD_template,RTL8192CU,rtl8192cu,\ + $(MODULES_DIR)/kernel/drivers/net/wireless/rtl8192cu/8192cu \ +,20)) # # Networking diff --git a/mk/vars.mk b/mk/vars.mk index 0525f5129..657d44ae5 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -136,7 +136,6 @@ FLAGS_FOR_BUILD= ${CPPFLAGS_FOR_BUILD} ${CFLAGS_FOR_BUILD} ${LDFLAGS_FOR_BUILD} PATCH= ${BASH} $(SCRIPT_DIR)/patch.sh SED:= sed -i -e LINUX_DIR:= $(BUILD_DIR)/linux -LINUX_HEADER_DIR:= $(STAGING_DIR)/linux-header KERNEL_MODULE_FLAGS:= ARCH=${ARCH} KERNELVERSION="2.6" \ KERNEL_PATH=${LINUX_DIR} KERNELDIR=${LINUX_DIR} KERNEL_DIR=${LINUX_DIR} \ PREFIX=/usr CROSS_COMPILE="${TARGET_CROSS}" \ diff --git a/package/bcm2835-firmware/Makefile b/package/bcm2835-firmware/Makefile index f88910535..18f9a3197 100644 --- a/package/bcm2835-firmware/Makefile +++ b/package/bcm2835-firmware/Makefile @@ -4,10 +4,10 @@ include ${TOPDIR}/rules.mk PKG_NAME:= bcm2835-firmware -# actually 5113ce63be622e50c1b3ec309798e5d091d219ac from 12.10.2013 -PKG_VERSION:= 0.4 +# actually f46e6d9cb9a6bf419fe2a428a8a586239e93aa2d from 07.01.2014 +PKG_VERSION:= 0.5 PKG_RELEASE:= 1 -PKG_MD5SUM:= e7f4caa11f26d5af07ae45128b2ac328 +PKG_MD5SUM:= 0de84bd4fe70b7767026aef5313dd868 PKG_DESCR:= firmware for raspberry pi (bcm2835) PKG_SECTION:= base PKG_SITES:= http://openadk.org/distfiles/ diff --git a/package/boost/Makefile b/package/boost/Makefile index 8177a49a4..f204ccebe 100644 --- a/package/boost/Makefile +++ b/package/boost/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= boost -PKG_VERSION:= 1.54.0 -PKG_RELEASE:= 4 -PKG_MD5SUM:= efbfbff5a85a9330951f243d0a46e4b9 +PKG_VERSION:= 1.55.0 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 93780777cfbf999a600f62883bd54b17 PKG_DESCR:= boost C++ library PKG_SECTION:= libs PKG_URL:= http://www.boost.org/ @@ -15,8 +15,8 @@ PKG_OPTS:= dev PKG_ARCH_DEPENDS:= !avr32 !m68k -DISTFILES:= boost_1_54_0.tar.gz -WRKDIST= ${WRKDIR}/${PKG_NAME}_1_54_0 +DISTFILES:= boost_1_55_0.tar.gz +WRKDIST= ${WRKDIR}/${PKG_NAME}_1_55_0 PKG_FLAVOURS_BOOST:= date_time graph graph_parallel iostreams math program_options python regex serialization signals system test thread wave @@ -126,7 +126,10 @@ endif ( cd ${WRKBUILD}; \ ${BJAM_PATH} \ -sBUILD=release \ + -d 2 \ target-os=linux \ + architecture=$(CPU_ARCH) \ + binary-format=elf \ toolset=gcc-${GPP_VERSION} \ --build-type=minimal \ --layout=versioned \ diff --git a/package/boost/patches/patch-boost_cstdint_hpp b/package/boost/patches/patch-boost_cstdint_hpp deleted file mode 100644 index 5b09e892b..000000000 --- a/package/boost/patches/patch-boost_cstdint_hpp +++ /dev/null @@ -1,14 +0,0 @@ ---- boost_1_54_0.orig/boost/cstdint.hpp 2013-03-09 23:55:05.000000000 +0100 -+++ boost_1_54_0/boost/cstdint.hpp 2013-09-19 16:46:42.000000000 +0200 -@@ -41,7 +41,10 @@ - // so we disable use of stdint.h when GLIBC does not define __GLIBC_HAVE_LONG_LONG. - // See https://svn.boost.org/trac/boost/ticket/3548 and http://sources.redhat.com/bugzilla/show_bug.cgi?id=10990 - // --#if defined(BOOST_HAS_STDINT_H) && (!defined(__GLIBC__) || defined(__GLIBC_HAVE_LONG_LONG)) -+#if defined(BOOST_HAS_STDINT_H) \ -+ && (!defined(__GLIBC__) \ -+ || defined(__GLIBC_HAVE_LONG_LONG) \ -+ || (defined(__GLIBC__) && ((__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 17))))) - - // The following #include is an implementation artifact; not part of interface. - # ifdef __hpux diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile index 1ee599707..5c21cac3a 100644 --- a/package/eglibc/Makefile +++ b/package/eglibc/Makefile @@ -42,7 +42,7 @@ eglibc-static-install: eglibc-dev-install: ${INSTALL_DIR} $(IDIR_EGLIBC_DEV)/$(ADK_TARGET_LIBC_PATH) $(IDIR_EGLIBC_DEV)/usr/lib # install linker script - -cp ./files/libc.so.$(CPU_ARCH) $(IDIR_EGLIBC_DEV)/usr/lib/libc.so + cp ./files/libc.so.$(CPU_ARCH) $(IDIR_EGLIBC_DEV)/usr/lib/libc.so ifeq ($(ADK_TARGET_ABI_O32),y) ifeq ($(ADK_big),y) $(SED) "s#@@ELFTARGET@@#elf32-tradbigmips#" $(IDIR_EGLIBC_DEV)/usr/lib/libc.so diff --git a/package/eglibc/files/libc.so.arm b/package/eglibc/files/libc.so.arm new file mode 100644 index 000000000..a79b29aa3 --- /dev/null +++ b/package/eglibc/files/libc.so.arm @@ -0,0 +1,5 @@ +/* GNU ld script + Use the shared library, but some functions are only in + the static library, so try that secondarily. */ +OUTPUT_FORMAT(elf32-littlearm) +GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a AS_NEEDED ( /lib/ld-linux.so.3 ) ) diff --git a/package/gmp/Makefile b/package/gmp/Makefile index 41fd1531f..88160db91 100644 --- a/package/gmp/Makefile +++ b/package/gmp/Makefile @@ -8,7 +8,7 @@ PKG_NAME:= gmp PKG_DESCR:= GNU multiprecision arithmetic library PKG_SECTION:= libs PKG_URL:= http://gmplib.org/ -PKG_BUILDDEP:= flex-host bison-host |