diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-29 09:06:27 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-29 09:06:27 +0100 |
| commit | 40fcb885d64153d3196f8a6ad8ca9a679b4a61b5 (patch) | |
| tree | c65da15b51c5fcf5dd5e5f2c038fa57455b03a21 | |
| parent | ede0b881160024db41b69198207a3e9905eea6c9 (diff) | |
| parent | 50dc4372e21202d2e285bd295ec18c759b66c4d9 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
140 files changed, 2537 insertions, 2293 deletions
@@ -1 +1,3 @@ - uclibc N64 ABI on mips64{,el} targets does not work, nptl fork problem +- microblaze big endian: network card emulation fails +- microblaze: qemu reboot not working diff --git a/jtools/Makefile b/jtools/Makefile deleted file mode 100644 index 23d93a6d4..000000000 --- a/jtools/Makefile +++ /dev/null @@ -1,30 +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 - -TARGETS:= -# jikes is for ant -ifneq ($(ADK_PACKAGE_OPENJDK7),) -TARGETS:=fastjar gcj ecj jikes classpath jamvm ant openjdk7 -endif - -TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS)) -TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS)) - -all: install -compile: -install: $(TARGETS_INSTALL) -clean: $(TARGETS_CLEAN) - -%-compile: $(TOOLS_BUILD_DIR) - $(TRACE) "jtools/$(patsubst %-compile,%,$@)/compile " - $(MAKE) -C $(patsubst %-compile,%,$@) compile - -%-install: - $(TRACE) "jtools/$(patsubst %-install,%,$@)/install " - $(MAKE) -C $(patsubst %-install,%,$@) install - -%-clean: - $(TRACE) "jtools/$(patsubst %-clean,%,$@)/clean " - $(MAKE) -C $(patsubst %-clean,%,$@) clean diff --git a/jtools/ant/Makefile b/jtools/ant/Makefile deleted file mode 100644 index 1741ed703..000000000 --- a/jtools/ant/Makefile +++ /dev/null @@ -1,33 +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:= ant -PKG_VERSION:= 1.8.4 -PKG_RELEASE:= 1 -PKG_MD5SUM:= c474fa9d0c35a24037c23b6e476862c1 -PKG_SITES:= http://archive.apache.org/dist/ant/source/ - -DISTFILES:= apache-$(PKG_NAME)-$(PKG_VERSION)-src.tar.bz2 -WRKDIST= $(WRKDIR)/apache-$(PKG_NAME)-$(PKG_VERSION) - -include ../rules.mk - -install: ${STAGING_JAVA_HOST_DIR}/usr/bin/ant - -$(WRKBUILD)/.compiled: ${WRKDIST}/.prepared - cd $(WRKBUILD)/lib/optional; wget http://openadk.org/distfiles/junit-4.9b2.jar - cp $(STAGING_JAVA_HOST_DIR)/usr/share/java/ecj.jar $(WRKBUILD)/lib/optional - cd ${WRKBUILD}; export BOOTJAVAC_OPTS="-bootclasspath $(STAGING_JAVA_HOST_DIR)/usr/share/classpath/glibj.zip" \ - LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 \ - JAVA_HOME=$(STAGING_JAVA_HOST_DIR)/usr/lib/jvm ; \ - $(BASH) build.sh - touch $@ - -${STAGING_JAVA_HOST_DIR}/usr/bin/ant: $(WRKBUILD)/.compiled - cd $(WRKBUILD)/dist; \ - $(CP) bin/* $(STAGING_JAVA_HOST_DIR)/usr/bin ; \ - $(CP) lib/* $(STAGING_JAVA_HOST_DIR)/usr/lib - -include $(TOPDIR)/mk/tools.mk diff --git a/jtools/ant/junit-4.9b2.jar b/jtools/ant/junit-4.9b2.jar Binary files differdeleted file mode 100644 index aec30a07f..000000000 --- a/jtools/ant/junit-4.9b2.jar +++ /dev/null diff --git a/jtools/classpath/Makefile b/jtools/classpath/Makefile deleted file mode 100644 index 06f59e1a0..000000000 --- a/jtools/classpath/Makefile +++ /dev/null @@ -1,42 +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:= classpath -PKG_VERSION:= 0.98 -PKG_RELEASE:= 1 -PKG_MD5SUM:= 90c6571b8b0309e372faa0f9f6255ea9 -PKG_SITES:= ${MASTER_SITE_GNU:=classpath/} - -include ../rules.mk - -install: ${STAGING_JAVA_HOST_DIR}/usr/share/classpath/glibj.zip - -CPENV:= LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 \ - PATH=${STAGING_JAVA_HOST_DIR}/usr/bin:$$PATH \ - CLASSPATH=${STAGING_JAVA_HOST_DIR}/usr/share/java/libgcj-$(GCJ_VER).jar - -$(WRKBUILD)/.configured: ${WRKDIST}/.prepared - (cd $(WRKBUILD); env $(CPENV) ./configure --prefix=${STAGING_JAVA_HOST_DIR}/usr \ - --disable-local-sockets \ - --disable-alsa \ - --disable-gconf-peer \ - --disable-gtk-peer \ - --disable-qt-peer \ - --disable-dssi \ - --disable-plugin \ - --disable-examples \ - --disable-gjdoc \ - --with-jar=no \ - --disable-Werror) - touch $@ - -$(WRKBUILD)/.compiled: ${WRKDIST}/.configured - env $(CPENV) ${MAKE} -C ${WRKBUILD} - touch $@ - -${STAGING_JAVA_HOST_DIR}/usr/share/classpath/glibj.zip: $(WRKBUILD)/.compiled - ${MAKE} -C ${WRKBUILD} install - -include $(TOPDIR)/mk/tools.mk diff --git a/jtools/ecj/Makefile b/jtools/ecj/Makefile deleted file mode 100644 index 2154bedce..000000000 --- a/jtools/ecj/Makefile +++ /dev/null @@ -1,36 +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:= ecj -PKG_VERSION:= 1 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 63220327925ace13756ae334c55a3baa - -include ../rules.mk - -install: ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj - -${STAGING_JAVA_HOST_DIR}/usr/bin/ecj: - env \ - DYLD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 \ - LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 \ - PATH=$(STAGING_JAVA_HOST_DIR)/usr/bin:$$PATH \ - $(STAGING_JAVA_HOST_DIR)/usr/bin/gcj -lgcj -O2 -findirect-dispatch \ - -o ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj.native \ - --main=org.eclipse.jdt.internal.compiler.batch.Main \ - $(TOPDIR)/jtools_build/gcc-$(GCJ_VER)/ecj.jar - echo "env LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj.native \$$@" > \ - ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj - chmod u+x ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj - # put a wrapper for java here - mv ${STAGING_JAVA_HOST_DIR}/usr/bin/gij ${STAGING_JAVA_HOST_DIR}/usr/bin/gij.native - echo "env LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 ${STAGING_JAVA_HOST_DIR}/usr/bin/gij.native \"\$$@\"" > \ - ${STAGING_JAVA_HOST_DIR}/usr/bin/java - chmod u+x ${STAGING_JAVA_HOST_DIR}/usr/bin/java - echo "env LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 ${STAGING_JAVA_HOST_DIR}/usr/bin/gij.native \"\$$@\"" > \ - ${STAGING_JAVA_HOST_DIR}/usr/bin/gij - chmod u+x ${STAGING_JAVA_HOST_DIR}/usr/bin/gij - -include $(TOPDIR)/mk/tools.mk diff --git a/jtools/fastjar/Makefile b/jtools/fastjar/Makefile deleted file mode 100644 index 744776eac..000000000 --- a/jtools/fastjar/Makefile +++ /dev/null @@ -1,27 +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:= fastjar -PKG_VERSION:= 0.94 -PKG_RELEASE:= 1 -PKG_MD5SUM:= 14d4bdfac236e347d806c6743dba48c6 -PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=fastjar/} - -include ../rules.mk - -install: ${STAGING_JAVA_HOST_DIR}/usr/bin/fastjar - -$(WRKBUILD)/.configured: ${WRKDIST}/.prepared - (cd $(WRKBUILD); ./configure --prefix=/usr); - touch $@ - -$(WRKBUILD)/.compiled: ${WRKDIST}/.configured - ${MAKE} -C ${WRKBUILD} $(MAKE_TRACE) - touch $@ - -${STAGING_JAVA_HOST_DIR}/usr/bin/fastjar: $(WRKBUILD)/.compiled - ${MAKE} -C ${WRKBUILD} DESTDIR=$(STAGING_JAVA_HOST_DIR) install $(MAKE_TRACE) - -include $(TOPDIR)/mk/tools.mk diff --git a/jtools/files.needed b/jtools/files.needed deleted file mode 100644 index c6a1de4ba..000000000 --- a/jtools/files.needed +++ /dev/null @@ -1,11 +0,0 @@ -cups.h;libcups -jpeglib.h;libjpeg -gif_lib.h;libgif -png.h;libpng -Xtos.h;libXt -Xinerama.h;libXinerama -Xrender.h;libXrender -XTest.h;libXtst -freetype.h;freetype -asoundlib.h;libasound -ffi.h;libffi diff --git a/jtools/jamvm/Makefile b/jtools/jamvm/Makefile deleted file mode 100644 index 1775ff5aa..000000000 --- a/jtools/jamvm/Makefile +++ /dev/null @@ -1,34 +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:= jamvm -PKG_VERSION:= 1.5.4 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 7654e9657691f5f09c4f481ed4686176 -PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=jamvm/} - -include ../rules.mk - -install: ${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm - -$(WRKBUILD)/.configured: ${WRKDIST}/.prepared - cd $(WRKBUILD); env \ - CC='${CC_FOR_BUILD}' \ - CXX='${CXX_FOR_BUILD}' \ - ./configure \ - --prefix=$(STAGING_JAVA_HOST_DIR)/usr \ - --with-classpath-install-dir=$(STAGING_JAVA_HOST_DIR)/usr - touch $@ - -$(WRKBUILD)/.compiled: ${WRKDIST}/.configured - ${MAKE} -C ${WRKBUILD} $(MAKE_TRACE) - touch $@ - -${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm: $(WRKBUILD)/.compiled - ${MAKE} -C ${WRKBUILD} install $(MAKE_TRACE) - ln -sf ${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm ${STAGING_JAVA_HOST_DIR}/usr/lib/jvm/bin/java - ln -sf ${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm ${STAGING_JAVA_HOST_DIR}/usr/lib/jvm/jre/bin/java - -include $(TOPDIR)/mk/tools.mk diff --git a/jtools/jikes/Makefile b/jtools/jikes/Makefile deleted file mode 100644 index 1d619c8eb..000000000 --- a/jtools/jikes/Makefile +++ /dev/null @@ -1,31 +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:= jikes -PKG_VERSION:= 1.22 -PKG_RELEASE:= 1 -PKG_MD5SUM:= cda958c7fef6b43b803e1d1ef9afcb85 -PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=jikes/Jikes/1.22/} - -DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 - -include ../rules.mk - -install: ${STAGING_JAVA_HOST_DIR}/usr/bin/jikes - -$(WRKBUILD)/.configured: ${WRKDIST}/.prepared - (cd $(WRKBUILD); ./configure --prefix=/usr); - touch $@ - -$(WRKBUILD)/.compiled: ${WRKDIST}/.configured - ${MAKE} -C ${WRKBUILD} $(MAKE_TRACE) - touch $@ - -${STAGING_JAVA_HOST_DIR}/usr/bin/jikes: $(WRKBUILD)/.compiled - ${MAKE} -C ${WRKBUILD} DESTDIR=$(STAGING_JAVA_HOST_DIR) install $(MAKE_TRACE) - $(CP) ${STAGING_JAVA_HOST_DIR}/usr/bin/jikes ${STAGING_JAVA_HOST_DIR}/usr/lib/jvm/bin/javac - $(CP) ${STAGING_JAVA_HOST_DIR}/usr/bin/jikes ${STAGING_JAVA_HOST_DIR}/usr/lib/jvm/jre/bin/javac - -include $(TOPDIR)/mk/tools.mk diff --git a/jtools/openjdk7/Makefile b/jtools/openjdk7/Makefile deleted file mode 100644 index 58db553fe..000000000 --- a/jtools/openjdk7/Makefile +++ /dev/null @@ -1,58 +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:= icedtea -PKG_VERSION:= 2.3.12 -PKG_RELEASE:= 1 -PKG_MD5SUM:= 9b3afa162021e3fca6161ba8f9f7dc11 -PKG_DESCR:= OpenJDK 7 Java VM -PKG_SECTION:= lang -PKG_URL:= http://openjdk.org/ -PKG_SITES:= http://icedtea.classpath.org/download/source/ - -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 - -CONFIGURE_ARGS+=\ - --enable-bootstrap \ - --enable-zero \ - --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-ecj-jar=${STAGING_JAVA_HOST_DIR}/usr/share/java/ecj.jar \ - --without-hotspot-build \ - --disable-system-kerberos \ - --disable-system-jpeg \ - --disable-system-lcms \ - --disable-system-zlib \ - --disable-system-png \ - --disable-system-gif \ - --disable-system-gtk \ - --disable-system-gio \ - --disable-system-fontconfig \ - --disable-compile-against-syscalls \ - --without-rhino \ - --disable-docs - -$(WRKDIST)/.configured: ${WRKDIST}/.prepared - (cd ${WRKBUILD}; export ${OPENJDK_NATIVE_ENV}; ./configure ${CONFIGURE_ARGS}) - touch $@ - -$(WRKBUILD)/.compiled: ${WRKDIST}/.configured - export ${OPENJDK_NATIVE_ENV}; $(MAKE) -C $(WRKBUILD) icedtea-boot - touch $@ - -${STAGING_JAVA_HOST_DIR}/bootstrap-jdk/bin/java: $(WRKBUILD)/.compiled - $(CP) $(WRKSRC)/openjdk.build-boot/j2sdk-image $(STAGING_JAVA_HOST_DIR)/bootstrap-jdk - touch $@ - -include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/jtools/openjdk7/patches/openadk.patch b/jtools/openjdk7/patches/openadk.patch deleted file mode 100644 index 11eb2aea6..000000000 --- a/jtools/openjdk7/patches/openadk.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -Nur icedtea-2.3.4.orig/Makefile.in icedtea-2.3.4/Makefile.in ---- icedtea-2.3.4.orig/Makefile.in 2013-01-15 10:44:02.000000000 +0100 -+++ icedtea-2.3.4/Makefile.in 2013-02-11 17:32:45.000000000 +0100 -@@ -640,7 +640,7 @@ - $(am__append_14) $(am__append_15) $(DISTRIBUTION_PATCHES) - - # Bootstrapping patches --ICEDTEA_BOOT_PATCHES = patches/boot/javafiles.patch \ -+ICEDTEA_BOOT_PATCHES = patches/topdir-openwrt.patch patches/boot/javafiles.patch \ - patches/boot/ant-javac.patch patches/boot/corba-idlj.patch \ - patches/boot/corba-no-gen.patch patches/boot/corba-orb.patch \ - patches/boot/demos.patch patches/boot/ecj-fphexconstants.patch \ -@@ -2033,7 +2033,7 @@ - # Optional native ecj - stamps/native-ecj.stamp: - mkdir -p stamps --@BUILD_NATIVE_ECJ_TRUE@ ${GCJ} $(IT_CFLAGS) -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \ -+@BUILD_NATIVE_ECJ_TRUE@ ${GCJ} -lgcj $(IT_CFLAGS) -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \ - @BUILD_NATIVE_ECJ_TRUE@ --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR} - touch $@ - -diff -Nur icedtea-2.3.4.orig/patches/topdir-openwrt.patch icedtea-2.3.4/patches/topdir-openwrt.patch ---- icedtea-2.3.4.orig/patches/topdir-openwrt.patch 1970-01-01 01:00:00.000000000 +0100 -+++ icedtea-2.3.4/patches/topdir-openwrt.patch 2013-02-12 09:37:29.000000000 +0100 -@@ -0,0 +1,14 @@ -+diff -Nur openjdk-boot.orig/Makefile icedtea7-forest-2-3-8bd8e70d4a03.2/Makefile -+--- openjdk-boot.orig/Makefile 2013-01-14 23:24:55.000000000 +0100 -++++ openjdk-boot/Makefile 2013-02-11 17:28:22.000000000 +0100 -+@@ -53,9 +53,7 @@ -+ REL_JDK_DEBUG_IMAGE_DIR = ../$(OUTPUTDIR_BASENAME-debug)/$(JDK_IMAGE_DIRNAME) -+ REL_JDK_FASTDEBUG_IMAGE_DIR = ../$(OUTPUTDIR_BASENAME-fastdebug)/$(JDK_IMAGE_DIRNAME) -+ -+-ifndef TOPDIR -+- TOPDIR:=. -+-endif -++TOPDIR:=. -+ -+ ifndef JDK_TOPDIR -+ JDK_TOPDIR=$(TOPDIR)/jdk diff --git a/jtools/prereq.sh b/jtools/prereq.sh deleted file mode 100644 index 2604de1ab..000000000 --- a/jtools/prereq.sh +++ /dev/null @@ -1,27 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -# test for existing /usr/include/asm -if [ ! -d "/usr/include/asm" ]; then - echo "ERROR: directory \"/usr/include/asm\" not found." - echo "on some systems this is name asm-generic." - echo "try to create a link to the asm directory with" - echo "\"ln -s /usr/include/asm-generic /usr/include/asm\"" - exit 1 -fi - -# test if all files from the files.needed file are available -for LINE in `cat files.needed`; do - - FILE=`echo ${LINE} | awk -F ";" '{print $1}'` - LIB=`echo ${LINE} | awk -F ";" '{print $2}'` - - #echo -n "looking for development files of \"${LIB}\"..." - FOUND=`find /usr/include /usr/lib -name "${FILE}" | wc -l` - if [ ${FOUND} -lt 1 ]; then - echo "not found!"; - echo "Please install the development header files for the library \"${LIB}\"." - exit 1 - fi - -done diff --git a/jtools/qemu/Makefile b/jtools/qemu/Makefile deleted file mode 100644 index b6add732e..000000000 --- a/jtools/qemu/Makefile +++ /dev/null @@ -1,32 +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:= qemu -PKG_VERSION:= 0.14.1 -PKG_RELEASE:= 1 -PKG_MD5SUM:= b6c713a8db638e173af53a62d5178640 -PKG_SITES:= http://download.savannah.gnu.org/releases/qemu/ - -include ../rules.mk - -install: ${STAGING_JAVA_HOST_DIR}/usr/bin/qemu-arm - -$(WRKBUILD)/.configured: ${WRKDIST}/.prepared - (cd $(WRKBUILD); ./configure --prefix=/usr \ - --host-cc=$(CC_FOR_BUILD) \ - --disable-system \ - --disable-sdl \ - --target-list=arm-linux-user,i386-linux-user,mipsel-linux-user,x86_64-linux-user \ - ) - touch $@ - -$(WRKBUILD)/.compiled: ${WRKDIST}/.configured - ${MAKE} -C ${WRKBUILD} $(MAKE_TRACE) - touch $@ - -${STAGING_JAVA_HOST_DIR}/usr/bin/qemu-arm: $(WRKBUILD)/.compiled - ${MAKE} -C ${WRKBUILD} DESTDIR=$(STAGING_JAVA_HOST_DIR) install $(MAKE_TRACE) - -include $(TOPDIR)/mk/tools.mk diff --git a/jtools/rules.mk b/jtools/rules.mk deleted file mode 100644 index 689d211a0..000000000 --- a/jtools/rules.mk +++ /dev/null @@ -1,8 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -WRKDIR_BASE= ${JTOOLS_BUILD_DIR} -WRKDIR= ${WRKDIR_BASE} -GCJ_VER:= 4.7.3 - -include ${TOPDIR}/mk/buildhlp.mk diff --git a/mk/build.mk b/mk/build.mk index 9242cc27a..400125694 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -22,11 +22,12 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_PACKAGE_E2FSCK_STATIC=n \ ADK_PACKAGE_KEXECINIT=n \ ADK_PACKAGE_INSTALLER=n \ + ADK_PACKAGE_HEIMDAL_SERVER=n \ + ADK_PACKAGE_LIBHEIMDAL=n \ ADK_PACKAGE_LM_SENSORS_DETECT=n \ ADK_PACKAGE_PACEMAKER=n \ ADK_PACKAGE_PACEMAKER_MGMTD=n \ ADK_PACKAGE_PACEMAKER_PYTHON_GUI=n \ - ADK_PACKAGE_OPENJDK7=n \ ADK_PACKAGE_CLASSPATH=n \ ADK_PACKAGE_GRUB=n \ ADK_PACKAGE_CRYPTINIT=n \ @@ -152,12 +153,12 @@ ifeq ($(ADK_NATIVE),y) else ifeq ($(ADK_TOOLCHAIN),y) ifeq ($(ADK_TOOLCHAIN_ONLY),y) - $(MAKE) -f mk/build.mk toolchain/fixup tools/install jtools/install package/compile + $(MAKE) -f mk/build.mk toolchain/fixup tools/install package/compile else - $(MAKE) -f mk/build.mk toolchain/fixup tools/install jtools/install package/compile root_clean package/install + $(MAKE) -f mk/build.mk toolchain/fixup tools/install package/compile root_clean package/install endif else - $(MAKE) -f mk/build.mk toolchain/fixup tools/install jtools/install target/config-prepare target/compile package/compile root_clean package/install target/install package_index + $(MAKE) -f mk/build.mk toolchain/fixup tools/install target/config-prepare target/compile package/compile root_clean package/install target/install package_index endif endif @@ -189,9 +190,6 @@ toolchain/%: ${STAGING_DIR} tools/%: $(MAKE) -C tools $(patsubst tools/%,%,$@) -jtools/%: - $(MAKE) -C jtools $(patsubst jtools/%,%,$@) - image: $(MAKE) -C target image @@ -272,7 +270,7 @@ cleandir: rm -rf $(BUILD_DIR_PFX) $(BIN_DIR_PFX) $(TARGET_DIR_PFX) \ ${TOPDIR}/package/pkglist.d ${TOPDIR}/package/pkgconfigs.d rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_HOST_DIR_PFX) $(TOOLS_BUILD_DIR) - rm -rf $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX) $(JTOOLS_BUILD_DIR) $(STAGING_JAVA_HOST_DIR) + rm -rf $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX) rm -f .menu .tmpconfig.h .rebuild* ${TOPDIR}/package/Depends.mk ${TOPDIR}/prereq.mk cleantarget: @@ -286,9 +284,9 @@ distclean: @$(TRACE) distclean @$(MAKE) -C $(CONFIG) clean $(MAKE_TRACE) @rm -rf $(BUILD_DIR_PFX) $(BIN_DIR_PFX) $(TARGET_DIR_PFX) $(DISTDIR) \ - ${TOPDIR}/package/pkglist.d ${TOPDIR}/package/pkgconfigs.d $(JTOOLS_BUILD_DIR) + ${TOPDIR}/package/pkglist.d ${TOPDIR}/package/pkgconfigs.d @rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_HOST_DIR_PFX) $(TOOLS_BUILD_DIR) - @rm -rf $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX) $(STAGING_JAVA_HOST_DIR) + @rm -rf $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX) @rm -f .adkinit .config* .defconfig .tmpconfig.h all.config ${TOPDIR}/prereq.mk \ .menu ${TOPDIR}/package/Depends.mk .ADK_HAVE_DOT_CONFIG .rebuild.* @@ -534,9 +532,9 @@ _mconfig2: ${CONFIG}/conf modconfig .menu distclean: @$(MAKE) -C $(CONFIG) clean @rm -rf $(BUILD_DIR_PFX) $(BIN_DIR_PFX) $(TARGET_DIR_PFX) $(DISTDIR) \ - ${TOPDIR}/package/pkglist.d ${TOPDIR}/package/pkgconfigs.d $(JTOOLS_BUILD_DIR) + ${TOPDIR}/package/pkglist.d ${TOPDIR}/package/pkgconfigs.d @rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_TARGET_DIR_PFX) $(TOOLS_BUILD_DIR) - @rm -rf $(STAGING_HOST_DIR_PFX) $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX) $(STAGING_JAVA_HOST_DIR) + @rm -rf $(STAGING_HOST_DIR_PFX) $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX) @rm -f .adkinit .config* .defconfig .tmpconfig.h all.config ${TOPDIR}/prereq.mk \ .menu .rebuild.* ${TOPDIR}/package/Depends.mk .ADK_HAVE_DOT_CONFIG diff --git a/mk/modules.mk b/mk/modules.mk index bb84317de..d959d7453 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -1092,6 +1092,7 @@ $(eval $(call KMOD_template,SUNRPC,sunrpc,\ ,24)) $(eval $(call KMOD_template,SUNRPC_GSS,sunrpc-gss,\ + $(MODULES_DIR)/kernel/lib/oid_registry \ $(MODULES_DIR)/kernel/net/sunrpc/auth_gss/auth_rpcgss \ ,25)) @@ -1106,7 +1107,7 @@ $(eval $(call KMOD_template,LOCKD,lockd,\ ifneq ($(ADK_KERNEL_NFS_FS),y) $(eval $(call KMOD_template,NFS_FS,nfs-fs,\ $(MODULES_DIR)/kernel/fs/nfs/nfs \ -,30)) +,30, kmod-sunrpc)) endif #$(eval $(call KMOD_template,EXPORTFS,exportfs,\ @@ -1165,7 +1166,7 @@ $(eval $(call KMOD_template,SND,snd,\ $(eval $(call KMOD_template,SND_RAWMIDI,snd-rawmidi,\ $(MODULES_DIR)/kernel/sound/core/snd-hwdep \ $(MODULES_DIR)/kernel/sound/core/snd-rawmidi \ -,41)) +,42)) $(eval $(call KMOD_template,SND_OSSEMUL,snd-ossemul,\ $(MODULES_DIR)/kernel/sound/core/oss/snd-mixer-oss \ diff --git a/mk/package.mk b/mk/package.mk index 24ef42594..da04288c1 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -49,6 +49,7 @@ INSTALL_TARGET?= install MAKE_ENV+= $(GCC_CHECK) \ PATH='${TARGET_PATH}' \ LIBTOOLIZE='${STAGING_HOST_DIR}/usr/bin/libtoolize -q' \ + M4='${STAGING_HOST_DIR}/usr/bin/m4' \ WRKDIR='${WRKDIR}' WRKDIST='${WRKDIST}' \ WRKSRC='${WRKSRC}' WRKBUILD='${WRKBUILD}' \ CFLAGS='$(strip ${TARGET_CFLAGS})' \ diff --git a/mk/vars.mk b/mk/vars.mk index c2844e954..23cc018f0 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -18,7 +18,6 @@ STAGING_PKG_DIR:= ${BASE_DIR}/pkg_${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_ STAGING_PKG_DIR_PFX:= ${BASE_DIR}/pkg_* STAGING_HOST_DIR:= ${BASE_DIR}/host_${CPU_ARCH}_${ADK_TARGET_SUFFIX}_${ADK_TARGET_LIBC} STAGING_HOST_DIR_PFX:= ${BASE_DIR}/host_* -STAGING_JAVA_HOST_DIR:= ${BASE_DIR}/jhost # use headers and foo-config from system ifeq ($(ADK_NATIVE),y) STAGING_TARGET_DIR:= @@ -35,7 +34,6 @@ STAGING_HOST2TARGET:= ../target_${CPU_ARCH}_${ADK_TARGET_SUFFIX}_${ADK_TARGET_LI TOOLCHAIN_BUILD_DIR= $(BASE_DIR)/toolchain_build_${CPU_ARCH}_${ADK_TARGET_SUFFIX}_${ADK_TARGET_LIBC} TOOLCHAIN_BUILD_DIR_PFX=$(BASE_DIR)/toolchain_build_* TOOLS_BUILD_DIR= $(BASE_DIR)/tools_build -JTOOLS_BUILD_DIR= $(BASE_DIR)/jtools_build TOOLS_DIR:= $(BASE_DIR)/bin/tools SCRIPT_DIR:= $(BASE_DIR)/scripts BIN_DIR:= $(BASE_DIR)/bin/${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC} @@ -120,7 +118,7 @@ endif # A nifty macro to make testing gcc features easier (from uClibc project) check_gcc=$(shell \ - if $(CC_FOR_BUILD) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; \ + if $(CC_FOR_BUILD) $(1) -Werror -S -o /dev/null -xc /dev/null > /dev/null 2>&1; \ then echo "$(1)"; else echo "$(2)"; fi) CF_FOR_BUILD=$(call check_gcc,-fhonour-copts,) @@ -220,7 +218,7 @@ QUIET:= else QUIET:= --quiet endif -FETCH_CMD?= wget --timeout=5 -t 3 $(QUIET) +FETCH_CMD?= wget --timeout=10 -t 3 $(QUIET) ifeq ($(ADK_HOST_CYGWIN),y) EXEEXT:= .exe diff --git a/package/alsa-lib/Makefile b/package/alsa-lib/Makefile index 10726ac09..027aa4da0 100644 --- a/package/alsa-lib/Makefile +++ b/package/alsa-lib/Makefile @@ -9,16 +9,20 @@ PKG_RELEASE:= 3 PKG_MD5SUM:= 69129a7c37697f81ac092335e9fa452b PKG_DESCR:= ALSA sound library PKG_SECTION:= libs +PKG_BUILDDEP:= alsa-lib-host PKG_URL:= http://www.alsa-project.org/ PKG_SITES:= ftp://ftp.alsa-project.org/pub/lib/ PKG_OPTS:= dev DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 +include ${TOPDIR}/mk/host.mk include ${TOPDIR}/mk/package.mk +$(eval $(call HOST_template,ALSA_LIB,alsa-lib,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,ALSA_LIB,alsa-lib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +HOST_STYLE:= auto TARGET_CPPFLAGS+= -D_POSIX_C_SOURCE=1 CONFIGURE_ARGS+= --disable-python @@ -27,4 +31,5 @@ alsa-lib-install: ${CP} ${WRKINST}/usr/lib/libasound.so* ${IDIR_ALSA_LIB}/usr/lib ${CP} ${WRKINST}/usr/share/alsa/* ${IDIR_ALSA_LIB}/usr/share/alsa +include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/alsa-utils/Makefile b/package/alsa-utils/Makefile index 721c5757d..e2311e221 100644 --- a/package/alsa-utils/Makefile +++ b/package/alsa-utils/Makefile @@ -5,9 +5,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= alsa-utils PKG_VERSION:= 1.0.27.2 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= b65e9a04181bd7c9db7667a4566f8dc3 -PKG_DESCR:= ALSA mixer utility +PKG_DESCR:= ALSA mixer/player utility PKG_SECTION:= multimedia PKG_DEPENDS:= alsa-lib libpthread libgcc librt PKG_BUILDDEP:= alsa-lib @@ -35,7 +35,7 @@ endif alsa-utils-install: ${INSTALL_DIR} ${IDIR_ALSA_UTILS}/usr/bin - ${CP} ${WRKINST}/usr/bin/amixer ${IDIR_ALSA_UTILS}/usr/bin + ${CP} ${WRKINST}/usr/bin/{aplay,amixer} ${IDIR_ALSA_UTILS}/usr/bin ifeq (${ADK_PACKAGE_ALSA_UTILS_WITH_ALSAMIXER},y) ${INSTALL_BIN} ${WRKINST}/usr/bin/alsamixer \ ${IDIR_ALSA_UTILS}/usr/bin diff --git a/package/ant/Makefile b/package/ant/Makefile new file mode 100644 index 000000000..5476596eb --- /dev/null +++ b/package/ant/Makefile @@ -0,0 +1,42 @@ +# 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:= ant +PKG_VERSION:= 1.8.4 +PKG_RELEASE:= 1 +PKG_MD5SUM:= c474fa9d0c35a24037c23b6e476862c1 +PKG_DESCR:= ant utility +PKG_SECTION:= lang +PKG_SITES:= http://archive.apache.org/dist/ant/source/ + +DISTFILES:= apache-$(PKG_NAME)-$(PKG_VERSION)-src.tar.bz2 +WRKDIST= $(WRKDIR)/apache-$(PKG_NAME)-$(PKG_VERSION) + +PKG_ARCH_DEPENDS:= native + +include $(TOPDIR)/mk/host.mk +include $(TOPDIR)/mk/package.mk + +$(eval $(call HOST_template,ANT,ant,$(PKG_VERSION)-${PKG_RELEASE})) + +HOST_STYLE:= manual + +host-build: + if [ ! -f $(WRKBUILD)/lib/optional/junit-4.9b2.jar ];then \ + cd $(WRKBUILD)/lib/optional; wget http://openadk.org/distfiles/junit-4.9b2.jar; \ + fi + cp $(STAGING_HOST_DIR)/usr/share/java/ecj.jar $(WRKBUILD)/lib/optional + cd ${WRKBUILD}; export BOOTJAVAC_OPTS="-bootclasspath $(STAGING_HOST_DIR)/usr/share/classpath/glibj.zip" \ + LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib:$(STAGING_HOST_DIR)/usr/lib64 \ + JAVA_HOME=$(STAGING_HOST_DIR)/usr/lib/jvm ; \ + $(BASH) build.sh + +ant-hostinstall: + cd $(WRKBUILD)/dist; \ + $(CP) bin/* $(STAGING_HOST_DIR)/usr/bin ; \ + $(CP) lib/* $(STAGING_HOST_DIR)/usr/lib + +include ${TOPDIR}/mk/host-bottom.mk +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 7f68bad96..f1e0d0666 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk PKG_NAME:= base-files PKG_VERSION:= 1.0 -PKG_RELEASE:= 62 +PKG_RELEASE:= 63 PKG_SECTION:= base PKG_DESCR:= basic files and scripts PKG_BUILDDEP:= pkgconf-host file-host diff --git a/package/base-files/src/etc/init.d/boot b/package/base-files/src/etc/init.d/boot index ed55ccc88..df2c493d7 100644 --- a/package/base-files/src/etc/init.d/boot +++ b/package/base-files/src/etc/init.d/boot @@ -10,12 +10,10 @@ touch /var/log/lastlog touch /var/log/wtmp ln -s /tmp /var/tmp -echo 0 > /proc/sys/kernel/printk - HOSTNAME= [[ -s /etc/hostname ]] && HOSTNAME=$(cat /etc/hostname) HOSTNAME=${HOSTNAME%%.*} -echo ${HOSTNAME:=linux} >/proc/sys/kernel/hostname +echo ${HOSTNAME:=openadk} >/proc/sys/kernel/hostname chown 0:0 /tmp; chmod 1777 /tmp diff --git a/package/base-files/src/init b/package/base-files/src/init index 003808452..ad519e96d 100755 --- a/package/base-files/src/init +++ b/package/base-files/src/init @@ -3,6 +3,7 @@ echo "System initialization ..." export PATH=/bin:/sbin:/usr/bin:/usr/sbin mount -t devtmpfs devtmpfs /dev >/dev/null 2>&1 mount -nt proc proc /proc +echo 0 > /proc/sys/kernel/printk mount -o nosuid,nodev,noexec -t sysfs sysfs /sys [ ! -f /etc/notmpfs ] && { size=$(cat /etc/tmpfs 2>/dev/null) diff --git a/package/classpath/Makefile b/package/classpath/Makefile index 2f133cdef..3d2166c60 100644 --- a/package/classpath/Makefile +++ b/package/classpath/Makefile @@ -17,10 +17,21 @@ PKG_SITES:= ${MASTER_SITE_GNU:=classpath/} PKG_HOST_DEPENDS:= linux PKG_ARCH_DEPENDS:= !arm +include $(TOPDIR)/mk/host.mk include $(TOPDIR)/mk/package.mk +$(eval $(call HOST_template,CLASSPATH,classpath,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,CLASSPATH,classpath,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +HOST_STYLE:= auto +HOST_CONFIGURE_ARGS+= --disable-plugin \ + --disable-tools \ + --disable-examples \ + --disable-gtk-peer \ + --disable-gconf-peer \ + --disable-alsa \ + --disable-Werror \ + --without-x CONFIGURE_ARGS+= --disable-plugin \ --disable-tools \ --disable-examples @@ -37,4 +48,5 @@ classpath-install: $(CP) $(WRKINST)/usr/share/classpath/glibj.zip \ $(STAGING_DIR)/usr/share/classpath +include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/jtools/classpath/patches/classpath-fix.patch b/package/classpath/patches/classpath-fix.patch index e03eb2342..e03eb2342 100644 --- a/jtools/classpath/patches/classpath-fix.patch +++ b/package/classpath/patches/classpath-fix.patch diff --git a/package/cups/Makefile b/package/cups/Makefile index adf8dcade..e3fc672e9 100644 --- a/package/cups/Makefile +++ b/package/cups/Makefile @@ -4,44 +4,64 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cups -PKG_VERSION:= 1.4.4 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 8776403ad60fea9e85eab9c04d88560d +PKG_VERSION:= 1.7.1 +PKG_RELEASE:= 3 +PKG_MD5SUM:= 55277c40fd4b7183dc3671d39c5c42b7 PKG_DESCR:= Common Unix Printing System PKG_SECTION:= net/misc PKG_DEPENDS:= zlib libpthread -PKG_BUILDDEP:= zlib +PKG_BUILDDEP:= cups-host zlib PKG_URL:= http://www.cups.org/ -PKG_SITES:= ftp://ftp.easysw.com/pub/cups/${PKG_VERSION}/ +PKG_SITES:= http://www.cups.org/software/${PKG_VERSION}/ PKG_NEED_CXX:= 1 PKG_OPTS:= dev DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-source.tar.bz2 +include ${TOPDIR}/mk/host.mk include ${TOPDIR}/mk/package.mk +$(eval $(call HOST_template,CUPS,cups,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,CUPS,cups,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +HOST_STYLE:= auto +HOST_CONFIGURE_ARGS+= --disable-tcp-wrappers \ + --disable-webif \ + --disable-gssapi \ + --disable-pam \ + --disable-dbus \ + --without-java \ + --without-perl \ + --without-python \ + --without-php \ + --disable-gnutls \ + --disable-openssl \ + --disable-cdsassl \ + --disable-dbus \ + --disable-ssl \ + --with-components=core \ + --with-rcdir=$(STAGING_HOST_DIR)/etc CONFIGURE_ENV+= ac_cv_func_sigset=no \ OPTIM='-fPIC' CONFIGURE_ARGS+= --with-cups-user=cups \ --with-cups-group=cups \ - --disable-ldap \ + --disable-webif \ + --disable-tcp-wrappers \ --disable-gssapi \ --disable-pam \ - --disable-pap \ --disable-dbus \ --without-java \ --without-perl \ --without-python \ --without-php \ - --disable-slp \ --disable-gnutls \ --disable-openssl \ --disable-cdsassl \ --disable-dbus \ - --disable-ssl + --disable-ssl \ + --with-components=core \ + --with-rcdir=$(STAGING_TARGET_DIR)/etc FAKE_FLAGS+= DSTROOT="${WRKINST}" STRIP="/bin/true" ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y) @@ -51,34 +71,8 @@ XAKE_FLAGS+= OPTIM='-fPIC' endif cups-install: - ${INSTALL_DIR} ${IDIR_CUPS}/usr/bin - ${INSTALL_DIR} ${IDIR_CUPS}/usr/sbin - ${INSTALL_DIR} ${IDIR_CUPS}/etc/cups - ${INSTALL_DIR} ${IDIR_CUPS}/usr/lib/cups/cgi-bin - ${INSTALL_DIR} ${IDIR_CUPS}/usr/lib/cups/daemon - ${INSTALL_DIR} ${IDIR_CUPS}/usr/share/cups/banners - ${INSTALL_DIR} ${IDIR_CUPS}/usr/share/doc/cups - ${INSTALL_DIR} ${IDIR_CUPS}/usr/share/cups/templates - ${CP} ${WRKINST}/etc/cups/* ${IDIR_CUPS}/etc/cups/ - rm ${IDIR_CUPS}/etc/cups/cupsd.conf.default - ${CP} ${WRKINST}/usr/bin/* ${IDIR_CUPS}/usr/bin/ - ${CP} ${WRKINST}/usr/share/doc/cups/index.html \ - ${IDIR_CUPS}/usr/share/doc/cups/ - ${CP} ${WRKINST}/usr/share/doc/cups/*.css \ - ${IDIR_CUPS}/usr/share/doc/cups/ - ${CP} ${WRKINST}/usr/share/doc/cups/images \ - ${IDIR_CUPS}/usr/share/doc/cups/ - rm -f ${IDIR_CUPS}/usr/bin/cups-config + ${INSTALL_DIR} ${IDIR_CUPS}/usr/lib ${CP} ${WRKINST}/usr/lib/libcups*.so* ${IDIR_CUPS}/usr/lib/ - ${CP} ${WRKINST}/usr/lib/cups/cgi-bin/* \ - ${IDIR_CUPS}/usr/lib/cups/cgi-bin/ - ${CP} ${WRKINST}/usr/lib/cups/daemon/* \ - ${IDIR_CUPS}/usr/lib/cups/daemon/ - ${CP} ${WRKINST}/usr/share/cups/banners/* \ - ${IDIR_CUPS}/usr/share/cups/banners/ - ${CP} ${WRKINST}/usr/share/cups/templates/*.tmpl \ - ${IDIR_CUPS}/usr/share/cups/templates/ - ${CP} ${WRKINST}/usr/sbin/* ${IDIR_CUPS}/usr/sbin/ - ${CP} ./files/etc/cups/* ${IDIR_CUPS}/etc/cups/ +include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/cups/files/cups.conffiles b/package/cups/files/cups.conffiles deleted file mode 100644 index bed6faa3f..000000000 --- a/package/cups/files/cups.conffiles +++ /dev/null @@ -1,4 +0,0 @@ -/etc/cups/classes.conf -/etc/cups/client.conf -/etc/cups/cupsd.conf -/etc/cups/printers.conf diff --git a/package/cups/patches/patch-Makedefs_in b/package/cups/patches/patch-Makedefs_in deleted file mode 100644 index d2ac2c771..000000000 --- a/package/cups/patches/patch-Makedefs_in +++ /dev/null @@ -1,10 +0,0 @@ ---- cups-1.4.4.orig/Makedefs.in 2010-04-23 20:56:34.000000000 +0200 -+++ cups-1.4.4/Makedefs.in 2010-09-30 21:33:20.000000000 +0200 -@@ -258,7 +258,6 @@ DBUSDIR = @DBUSDIR@ - # Rules... - # - --.SILENT: - .SUFFIXES: .1 .1.gz .1m .1m.gz .3 .3.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .32.o .64.o .gz - - .c.o: diff --git a/package/cups/patches/patch-Makefile b/package/cups/patches/patch-Makefile deleted file mode 100644 index d0e90589d..000000000 --- a/package/cups/patches/patch-Makefile +++ /dev/null @@ -1,16 +0,0 @@ ---- cups-1.4.4.orig/Makefile 2010-04-23 20:56:34.000000000 +0200 -+++ cups-1.4.4/Makefile 2010-09-29 22:55:01.000000000 +0200 -@@ -20,10 +20,10 @@ include Makedefs - # Directories to make... - # - --DIRS = cups filter backend berkeley cgi-bin driver locale man monitor \ -- notifier ppdc scheduler systemv test \ -+DIRS = cups filter backend berkeley cgi-bin driver locale monitor \ -+ notifier ppdc scheduler systemv \ - $(PHPDIR) \ -- conf data doc examples $(FONTS) templates -+ conf data examples doc $(FONTS) templates - - - # diff --git a/package/cups/patches/patch-conf_Makefile b/package/cups/patches/patch-conf_Makefile deleted file mode 100644 index f3ae5c8dd..000000000 --- a/package/cups/patches/patch-conf_Makefile +++ /dev/null @@ -1,18 +0,0 @@ ---- cups-1.4.2.orig/conf/Makefile 2009-09-22 23:53:31.000000000 +0200 -+++ cups-1.4.2/conf/Makefile 2009-11-19 22:02:20.000000000 +0100 -@@ -72,12 +72,12 @@ install: all install-data install-header - install-data: - for file in $(KEEP); do \ - if test -r $(SERVERROOT)/$$file ; then \ -- $(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.N ; \ -+ $(INSTALL_CONFIG) $$file $(SERVERROOT)/$$file.N ; \ - else \ -- $(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \ -+ $(INSTALL_CONFIG) $$file $(SERVERROOT) ; \ - fi ; \ - done -- $(INSTALL_CONFIG) -g $(CUPS_GROUP) cupsd.conf $(SERVERROOT)/cupsd.conf.default -+ $(INSTALL_CONFIG) cupsd.conf $(SERVERROOT)/cupsd.conf.default - $(INSTALL_DIR) -m 755 $(DATADIR)/mime - for file in $(REPLACE); do \ - if test -r $(DATADIR)/mime/$$file ; then \ diff --git a/package/cups/patches/patch-configure b/package/cups/patches/patch-configure index 97243c0c9..19c9f6092 100644 --- a/package/cups/patches/patch-configure +++ b/package/cups/patches/patch-configure @@ -1,40 +1,11 @@ ---- cups-1.4.4.orig/configure 2010-06-17 20:25:47.000000000 +0200 -+++ cups-1.4.4/configure 2011-07-29 16:46:45.000000000 +0200 -@@ -1966,7 +1966,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +--- cups-1.7.1.orig/configure 2014-01-08 17:26:27.000000000 +0100 ++++ cups-1.7.1/configure 2014-01-24 18:05:03.000000000 +0100 +@@ -5792,7 +5792,7 @@ fi + case "$COMPONENTS" in + all) +- BUILDDIRS="filter backend berkeley cgi-bin monitor notifier ppdc scheduler systemv conf data desktop locale man doc examples templates" ++ BUILDDIRS="filter backend berkeley monitor notifier ppdc conf data" + ;; - --uname=`uname` -+uname=Linux - uversion=`uname -r | sed -e '1,$s/^[^0-9]*\([0-9]*\)\.\([0-9]*\).*/\1\2/'` - uarch=`uname -m` - -@@ -10002,8 +10002,8 @@ if test "$libdir" = "\${exec_prefix}/lib - libdir="$exec_prefix/lib32" - ;; - Linux*) -- if test -d /usr/lib64; then -- libdir="$exec_prefix/lib64" -+ if test -d /usr/lib; then -+ libdir="$exec_prefix/lib" - fi - ;; - HP-UX*) -@@ -10978,7 +10978,7 @@ fi - if test x$enable_debug = xyes; then - OPTIM="-g" - else -- INSTALL_STRIP="-s" -+ INSTALL_STRIP="" - fi - - if test x$enable_debug_printfs = xyes; then -@@ -11199,7 +11199,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then -- PIEFLAGS="-pie -fPIE" -+ PIEFLAGS="" - { echo "$as_me:$LINENO: result: yes" >&5 - echo "${ECHO_T}yes" >&6; } - else + core) diff --git a/package/cups/patches/patch-ppdc_Makefile b/package/cups/patches/patch-ppdc_Makefile deleted file mode 100644 index c045b2e14..000000000 --- a/package/cups/patches/patch-ppdc_Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- cups-1.4.4.orig/ppdc/Makefile 2010-04-23 20:56:34.000000000 +0200 -+++ cups-1.4.4/ppdc/Makefile 2010-10-03 00:51:42.000000000 +0200 -@@ -244,7 +244,7 @@ genstrings: genstrings.o libcupsppdc.a - libcupsppdc.a ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) \ - $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ) - echo Generating localization strings... -- ./genstrings >sample.c -+ #./genstrings >sample.c - - - # diff --git a/package/cups/patches/patch-scheduler_auth_c b/package/cups/patches/patch-scheduler_auth_c deleted file mode 100644 index d9892c206..000000000 --- a/package/cups/patches/patch-scheduler_auth_c +++ /dev/null @@ -1,10 +0,0 @@ ---- cups-1.4.2.orig/scheduler/auth.c 2009-05-27 00:01:23.000000000 +0200 -+++ cups-1.4.2/scheduler/auth.c 2009-12-30 12:30:13.000000000 +0100 -@@ -57,6 +57,7 @@ - * Include necessary headers... - */ - -+#define _GNU_SOURCE - #include "cupsd.h" - #include <grp.h> - #ifdef HAVE_SHADOW_H diff --git a/package/dbus/Makefile b/package/dbus/Makefile index bb06e25d4..31596f56d 100644 --- a/package/dbus/Makefile +++ b/package/dbus/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 2 PKG_MD5SUM:= b02e9c95027a416987b81f9893831061 PKG_DESCR:= DBUS daemon PKG_SECTION:= misc -PKG_DEPENDS:= libdbus +PKG_DEPENDS:= libdbus libexpat PKG_BUILDDEP:= expat util-linux PKG_URL:= http://dbus.freedesktop.org/ PKG_SITES:= http://dbus.freedesktop.org/releases/dbus/ diff --git a/package/ecj/Makefile b/package/ecj/Makefile new file mode 100644 index 000000000..37a463eb1 --- /dev/null +++ b/package/ecj/Makefile @@ -0,0 +1,43 @@ +# 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:= ecj +PKG_VERSION:= 4.9 +PKG_RELEASE:= 1 +PKG_MD5SUM:= c474fa9d0c35a24037c23b6e476862c1 +PKG_DESCR:= ecj java compiler +PKG_SECTION:= lang + +NO_DISTFILES:= 1 + +PKG_ARCH_DEPENDS:= native + +include $(TOPDIR)/mk/host.mk +include $(TOPDIR)/mk/package.mk + +$(eval $(call HOST_template,ECJ,ecj,$(PKG_VERSION)-${PKG_RELEASE})) + +HOST_STYLE:= manual + +ecj-hostinstall: + env LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib:$(STAGING_HOST_DIR)/usr/lib64 \ + $(STAGING_HOST_DIR)/usr/bin/gcj -lgcj -O2 -findirect-dispatch \ + -o ${STAGING_HOST_DIR}/usr/bin/ecj.native \ + --main=org.eclipse.jdt.internal.compiler.batch.Main \ + $(DISTDIR)/ecj.jar + echo "env LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib:$(STAGING_HOST_DIR)/usr/lib64 ${STAGING_HOST_DIR}/usr/bin/ecj.native \$$@" > \ + ${STAGING_HOST_DIR}/usr/bin/ecj + chmod u+x ${STAGING_HOST_DIR}/usr/bin/ecj + # put a wrapper for java here + mv ${STAGING_HOST_DIR}/usr/bin/gij ${STAGING_HOST_DIR}/usr/bin/gij.native + echo "env LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib:$(STAGING_HOST_DIR)/usr/lib64 ${STAGING_HOST_DIR}/usr/bin/gij.native \"\$$@\"" > \ + ${STAGING_HOST_DIR}/usr/bin/java + chmod u+x ${STAGING_HOST_DIR}/usr/bin/java + echo "env LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib:$(STAGING_HOST_DIR)/usr/lib64 ${STAGING_HOST_DIR}/usr/bin/gij.native \"\$$@\"" > \ + ${STAGING_HOST_DIR}/usr/bin/gij + chmod u+x ${STAGING_HOST_DIR}/usr/bin/gij + +include ${TOPDIR}/mk/host-bottom.mk +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/eglibc/files/libc.so.ppc64 b/package/eglibc/files/libc.so.ppc64 new file mode 100644 index 000000000..35a1edcc7 --- /dev/null +++ b/package/eglibc/files/libc.so.ppc64 @@ -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(elf64-powerpc) +GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a AS_NEEDED ( /lib/ld64.so.1 ) ) diff --git a/package/eudev/Makefile b/package/eudev/Makefile index 13f8c1b20..4bce0928c 100644 --- a/package/eudev/Makefile +++ b/package/eudev/Makefile @@ -9,6 +9,8 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 164df78f6f0093578a20bdd00335845f PKG_DESCR:= udev device manager PKG_SECTION:= utils +PKG_BUILDDEP:= gperf-host glib +PKG_DEPENDS:= glib PKG_URL:= http://www.gentoo.org/proj/en/eudev/ PKG_SITES:= http://dev.gentoo.org/~blueness/eudev/ PKG_LIBNAME:= libudev diff --git a/package/fastjar/Makefile b/package/fastjar/Makefile new file mode 100644 index 000000000..e14c66076 --- /dev/null +++ b/package/fastjar/Makefile @@ -0,0 +1,24 @@ +# 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:= fastjar +PKG_VERSION:= 0.94 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 14d4bdfac236e347d806c6743dba48c6 +PKG_DESCR:= fastjar utility +PKG_SECTION:= lang +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=fastjar/} + +PKG_ARCH_DEPENDS:= native + +include $(TOPDIR)/mk/host.mk +include $(TOPDIR)/mk/package.mk + +$(eval $(call HOST_template,FASTJAR,fastjar,$(PKG_VERSION)-${PKG_RELEASE})) + +HOST_STYLE:= auto + +include ${TOPDIR}/mk/host-bottom.mk +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/freetype/Makefile b/package/freetype/Makefile index b5d239569..492adb046 100644 --- a/package/freetype/Makefile +++ b/package/freetype/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= a359993ad0dc23323c676b04fdb57110 PKG_DESCR:= A free, high-quality and portable font engine PKG_SECTION:= libs PKG_DEPENDS:= zlib -PKG_BUILDDEP:= zlib +PKG_BUILDDEP:= zlib freetype-host PKG_URL:= http://www.freetype.org/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=freetype/} PKG_LIBNAME:= libfreetype @@ -20,14 +20,18 @@ ifeq ($(ADK_STATIC),y) PKG_OPTS+= libonly endif +include ${TOPDIR}/mk/host.mk include ${TOPDIR}/mk/package.mk +$(eval $(call HOST_template,LIBFREETYPE,libfreetype,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,LIBFREETYPE,libfreetype,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +HOST_STYLE:= auto CONFIGURE_ARGS+= --without-png libfreetype-install: ${INSTALL_DIR} ${IDIR_LIBFREETYPE}/usr/lib ${CP} ${WRKINST}/usr/lib/libfreetype.so* ${IDIR_LIBFREETYPE}/usr/lib +include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/gcc/Makefile b/package/gcc/Makefile index 06a2daf3a..4b8480342 100644 --- a/package/gcc/Makefile +++ b/package/gcc/Makefile @@ -46,7 +46,7 @@ CONFIGURE_ARGS+= --enable-languages=c,c++ else CONFIGURE_ARGS+= --enable-languages=c endif -ifeq ($(ARCH),powerpc) +ifeq ($(CPU_ARCH),ppc) CONFIGURE_ARGS+= --disable-target-optspace --with-long-double-64 --enable-secureplt TARGET_CFLAGS+= '-Wl,--secure-plt' else diff --git a/jtools/gcj/Makefile b/package/gcj/Makefile index 3af5e0e5f..f7669a740 100644 --- a/jtools/gcj/Makefile +++ b/package/gcj/Makefile @@ -4,24 +4,25 @@ include $(TOPDIR)/rules.mk PKG_NAME:= gcj -PKG_RELEASE:= 1 PKG_VERSION:= 4.7.3 +PKG_RELEASE:= 1 PKG_MD5SUM:= 86f428a30379bdee0224e353ee2f999e +PKG_DESCR:= GNU java compiler +PKG_SECTION:= lang PKG_SITES:= ${MASTER_SITE_GNU:=gcc/gcc-${PKG_VERSION}/} DISTFILES:= gcc-$(PKG_VERSION).tar.bz2 +PKG_ARCH_DEPENDS:= native WRKDIST= ${WRKDIR}/gcc-${PKG_VERSION} -include ../rules.mk -GCJ_ENV+= "JAR=no LDFLAGS=-liconv" +include $(TOPDIR)/mk/host.mk +include $(TOPDIR)/mk/package.mk -install: ${STAGING_JAVA_HOST_DIR}/usr/bin/gcj +$(eval $(call HOST_template,GCJ,gcj,$(PKG_VERSION)-${PKG_RELEASE})) -$(WRKBUILD)/.configured: ${WRKDIST}/.prepared - (cd $(WRKBUILD); \ - wget -O ecj.jar ftp://sourceware.org/pub/java/ecj-4.9.jar; \ - env ${GCJ_ENV} ./configure \ - --prefix=/usr \ +HOST_STYLE:= auto +HOST_MAKE_ENV+= "JAR=no LDFLAGS=-liconv" +HOST_CONFIGURE_ARGS:= \ --enable-java-home \ --enable-languages=java \ --enable-shared \ @@ -36,17 +37,11 @@ $(WRKBUILD)/.configured: ${WRKDIST}/.prepared --disable-biarch \ --disable-decimal-float \ --disable-multilib \ - --disable-bootstrap \ - ); - touch $@ - -$(WRKBUILD)/.compiled: ${WRKDIST}/.configured - env ${GCJ_ENV} ${MAKE} -C ${WRKBUILD} $(MAKE_TRACE) - touch $@ + --disable-bootstrap -${STAGING_JAVA_HOST_DIR}/usr/bin/gcj: $(WRKBUILD)/.compiled - $(INSTALL_DIR) ${STAGING_JAVA_HOST_DIR} - env ${GCJ_ENV} ${MAKE} -C ${WRKBUILD} \ - DESTDIR=$(STAGING_JAVA_HOST_DIR) install $(MAKE_TRACE) +post-extract: + (cd $(DISTDIR); wget -O ecj.jar ftp://sourceware.org/pub/java/ecj-4.9.jar) + (cd $(WRKBUILD); $(CP) $(DISTDIR)/ecj.jar .) -include $(TOPDIR)/mk/tools.mk +include ${TOPDIR}/mk/host-bottom.mk +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/glib/Makefile b/package/glib/Makefile index 730a44336..e1ce6bca4 100644 --- a/package/glib/Makefile +++ b/package/glib/Makefile @@ -43,7 +43,8 @@ CONFIGURE_ENV+= glib_cv_long_long_format=ll \ ac_cv_func_posix_getpwuid_r=yes \ ac_cv_func_posix_getgrgid_r=yes -HOST_CONFIGURE_ARGS+= --disable-fam +HOST_CONFIGURE_ARGS+= --disable-fam \ + --disable-compile-warnings glib-install: ${INSTALL_DIR} ${IDIR_GLIB}/usr/lib diff --git a/package/gmediaserver/Makefile b/package/gmediaserver/Makefile index 240249145..af459b3f9 100644 --- a/package/gmediaserver/Makefile +++ b/package/gmediaserver/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= gmediaserver PKG_VERSION:= 0.13.0 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= c422de386331e2a1a859d45f6fa270a3 PKG_DESCR:= An UPnP music media server PKG_SECTION:= multimedia @@ -15,10 +15,13 @@ PKG_URL:= http://www.gnu.org/software/gmediaserver PKG_SITES:= http://savannah.nongnu.org/download/gmediaserver/ PKG_CXX:= GMEDIASERVER +PKG_LIBC_DEPENDS:= uclibc eglibc glibc + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,GMEDIASERVER,gmediaserver,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +TARGET_CPPFLAGS+= -D_GNU_SOURCE CONFIGURE_ENV+= LIBS=" -lixml -lthreadutil -lupnp -lz" CONFIGURE_ARGS+= --with-id3lib="${STAGING_TARGET_DIR}/usr" \ --with-libupnp="${STAGING_TARGET_DIR}/usr" diff --git a/package/gmediaserver/patches/patch-src_contentdir_c b/package/gmediaserver/patches/patch-src_contentdir_c new file mode 100644 index 000000000..0f6e3166a --- /dev/null +++ b/package/gmediaserver/patches/patch-src_contentdir_c @@ -0,0 +1,10 @@ +--- gmediaserver-0.13.0.orig/src/contentdir.c 2007-10-20 09:59:38.000000000 +0200 ++++ gmediaserver-0.13.0/src/contentdir.c 2014-01-27 13:08:37.685276614 +0100 +@@ -18,6 +18,7 @@ + * + */ + ++#include <assert.h> + #include <config.h> + #include <stdint.h> /* Gnulib/C99 */ + #include <inttypes.h> /* ? */ diff --git a/package/gmediaserver/patches/patch-src_upnp_c b/package/gmediaserver/patches/patch-src_upnp_c new file mode 100644 index 000000000..496694de2 --- /dev/null +++ b/package/gmediaserver/patches/patch-src_upnp_c @@ -0,0 +1,20 @@ +--- gmediaserver-0.13.0.orig/src/upnp.c 2007-10-28 09:20:43.000000000 +0100 ++++ gmediaserver-0.13.0/src/upnp.c 2014-01-27 13:07:07.541007109 +0100 +@@ -265,7 +265,7 @@ handle_get_var_request(struct Upnp_State + say(3, _("Event device UDN: %s\n"), quotearg(request->DevUDN)); + say(3, _("Event service ID: %s\n"), quotearg(request->ServiceID)); + say(3, _("Event variable name: %s\n"), quotearg(request->StateVarName)); +- say(3, _("Event source: %s\n"), inet_ntoa(request->CtrlPtIPAddr)); ++ say(3, _("Event source: %s\n"), inet_ntoa(*(struct in_addr *)&request->CtrlPtIPAddr)); + + if (strcmp(request->DevUDN, device_udn) != 0) { + say(1, _("Discarding event - event device UDN (%s) not recognized\n"), quotearg(request->DevUDN)); +@@ -306,7 +306,7 @@ handle_action_request(struct Upnp_Action + say(3, _("Event device UDN: %s\n"), quotearg(request->DevUDN)); + say(3, _("Event service ID: %s\n"), quotearg(request->ServiceID)); + say(3, _("Event action name: %s\n"), quotearg(request->ActionName)); +- say(3, _("Event source: %s\n"), inet_ntoa(request->CtrlPtIPAddr)); ++ say(3, _("Event source: %s\n"), inet_ntoa(*(struct in_addr *)&request->CtrlPtIPAddr)); + say_document(4, _("Event action request:\n"), request->ActionRequest); + + if (strcmp(request->DevUDN, device_udn) != 0) { diff --git a/package/inputproto/Makefile b/package/inputproto/Makefile index 42743b47d..53180cfbe 100644 --- a/package/inputproto/Makefile +++ b/package/inputproto/Makefile @@ -8,12 +8,18 @@ PKG_VERSION:= 2.2 PKG_RELEASE:= 1 PKG_DESCR:= X Input Extension headers PKG_SECTION:= devel +PKG_BUILDDEP:= inputproto-host PKG_MD5SUM:= e0047823230413e67d74e92af77fbe58 PKG_SITES:= ${MASTER_SITE_XORG} PKG_OPTS:= dev devonly +include $(TOPDIR)/mk/host.mk include $(TOPDIR)/mk/package.mk +$(eval $(call HOST_template,INPUTPROTO,inputproto,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,INPUTPROTO,inputproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +HOST_STYLE:= auto + +include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/jamvm/Makefile b/package/jamvm/Makefile index 6d21b6311..4c0798c26 100644 --- a/package/jamvm/Makefile +++ b/package/jamvm/Makefile @@ -16,10 +16,14 @@ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=jamvm/} PKG_ARCH_DEPENDS:= !m68k +include ${TOPDIR}/mk/host.mk include ${TOPDIR}/mk/package.mk +$(eval $(call HOST_template,JAMVM,jamvm,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,JAMVM,jamvm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +HOST_STYLE:= auto +HOST_CONFIGURE_ARGS+= --with-classpath-install-dir=$(STAGING_HOST_DIR)/usr BUILD_STYLE:= manual INSTALL_STYLE:= manual @@ -31,6 +35,10 @@ ifeq ($(ARCH),arm) CONFIGURE_ARGS+= --disable-tls endif +hostpost-install: + ln -sf ${STAGING_HOST_DIR}/usr/bin/jamvm ${STAGING_HOST_DIR}/usr/lib/jvm/bin/java + ln -sf ${STAGING_HOST_DIR}/usr/bin/jamvm ${STAGING_HOST_DIR}/usr/lib/jvm/jre/bin/java + do-build: ${INSTALL_DIR} ${WRKINST}/usr/bin ${INSTALL_DIR} ${WRKINST}/usr/share/jamvm @@ -47,4 +55,5 @@ do-install: ${CP} ${WRKINST}/usr/share/jamvm/classes.zip \ ${IDIR_JAMVM}/usr/share/jamvm +include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/jikes/Makefile b/package/jikes/Makefile new file mode 100644 index 000000000..6f7649a49 --- /dev/null +++ b/package/jikes/Makefile @@ -0,0 +1,33 @@ +# 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:= jikes +PKG_VERSION:= 1.22 +PKG_RELEASE:= 1 +PKG_MD5SUM:= cda958c7fef6b43b803e1d1ef9afcb85 +PKG_DESCR:= jikes java compiler +PKG_SECTION:= lang +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=jikes/Jikes/1.22/} + +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 + +PKG_ARCH_DEPENDS:= native + +include $(TOPDIR)/mk/host.mk +include $(TOPDIR)/mk/package.mk + +$(eval $(call HOST_template,JIKES,jikes,$(PKG_VERSION)-${PKG_RELEASE})) + +HOST_STYLE:= auto + +hostpost-install: + $(INSTALL_DIR) ${STAGING_HOST_DIR}/usr/lib/jvm/bin/ + $(INSTALL_DIR) ${STAGING_HOST_DIR}/usr/lib/jvm/jre/bin/ + $(CP) ${STAGING_HOST_DIR}/usr/bin/jikes ${STAGING_HOST_DIR}/usr/lib/jvm/bin/javac + $(CP) ${STAGING_HOST_DIR}/usr/bin/jikes ${STAGING_HOST_DIR}/usr/lib/jvm/jre/bin/javac + + +include ${TOPDIR}/mk/host-bottom.mk +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/json-c/Makefile b/package/json-c/Makefile new file mode 100644 index 000000000..de4f0e04e --- /dev/null +++ b/package/json-c/Makefile @@ -0,0 +1,26 @@ +# 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:= json-c +PKG_VERSION:= 0.11 +PKG_RELEASE:= 1 +PKG_MD5SUM:= aa02367d2f7a830bf1e3376f77881e98 +PKG_DESCR:= JSON library +PKG_SECTION:= libs +PKG_URL:= https://github.com/json-c/json-c/wiki +PKG_SITES:= https://s3.amazonaws.com/json-c_releases/releases/ +PKG_OPTS:= dev +PKG_NOPARALLEL:= 1 + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,JSON_C,json-c,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) + +json-c-install: + $(INSTALL_DIR) $(IDIR_JSON_C)/usr/lib + $(CP) $(WRKINST)/usr/lib/libjson*.so* \ + $(IDIR_JSON_C)/usr/lib + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/kbproto/Makefile b/package/kbproto/Makefile index 202109637..3d9708d0c 100644 --- a/package/kbproto/Makefile +++ b/package/kbproto/Makefile @@ -8,12 +8,18 @@ PKG_VERSION:= 1.0.6 PKG_RELEASE:= 1 PKG_DESCR:= X11 keyboard protocol headers PKG_SECTION:= devel +PKG_BUILDDEP:= kbproto-host PKG_MD5SUM:= 9c650b7947fe59b3f144518400e8d029 PKG_SITES:= ${MASTER_SITE_XORG} PKG_OPTS:= dev devonly +include $(TOPDIR)/mk/host.mk include $(TOPDIR)/mk/package.mk +$(eval $(call HOST_template,KBPROTO,kbproto,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,KBPROTO,kbproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +HOST_STYLE:= auto + +include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/knock/Makefile b/package/knock/Makefile index 91bd34739..04129c01b 100644 --- a/package/knock/Makefile +++ b/package/knock/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= knock -PKG_VERSION:= 0.5 +PKG_VERSION:= 0.6 PKG_RELEASE:= 1 -PKG_MD5SUM:= ca09d61458974cff90a700aba6120891 +PKG_MD5SUM:= e6e486be75b0d6433bac22a7de0e11f5 PKG_DESCR:= A port-knocking client PKG_SECTION:= firewall PKG_BUILDDEP:= libpcap @@ -22,6 +22,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,KNOCK,knock,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,KNOCKD,knockd,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_KNOCKD},${PKGSD_KNOCKD},${PKG_SECTION})) +TARGET_CPPFLAGS+= -D_GNU_SOURCE CONFIGURE_ENV+= ac_cv_lib_pcap_pcap_open_live=yes knock-install: diff --git a/package/knock/patches/patch-Makefile_in b/package/knock/patches/patch-Makefile_in deleted file mode 100644 index ec90372ec..000000000 --- a/package/knock/patches/patch-Makefile_in +++ /dev/null @@ -1,24 +0,0 @@ ---- knock-0.5.orig/Makefile.in 2005-06-27 07:11:34.000000000 +0200 -+++ knock-0.5/Makefile.in 2009-06-13 09:49:14.000000000 +0200 -@@ -68,11 +68,16 @@ dist: distclean - (cd ..; tar czvf knock-$(VERSION).tar.gz knock-$(VERSION)) - - install: all -- $(INSTALL) -D -m0755 knockd $(DESTDIR)$(SBINDIR)/knockd -- $(INSTALL) -D -m0755 knock $(DESTDIR)$(BINDIR)/knock -- $(INSTALL) -D -m0644 $(MANSRC)knockd.1 $(DESTDIR)$(MANDIR)/man1/knockd.1 -- $(INSTALL) -D -m0644 $(MANSRC)knock.1 $(DESTDIR)$(MANDIR)/man1/knock.1 -- $(INSTALL) -D -m0644 knockd.conf $(DESTDIR)/etc/knockd.conf -+ $(INSTALL) -d -m0755 $(DESTDIR)$(SBINDIR) -+ $(INSTALL) -d -m0755 $(DESTDIR)$(BINDIR) -+ $(INSTALL) -d -m0755 $(DESTDIR)$(MANDIR)/man1 -+ $(INSTALL) -d -m0755 $(DESTDIR)/etc -+ $(INSTALL) -m0755 knock $(DESTDIR)$(BINDIR)/knock -+ $(INSTALL) -m0755 knockd $(DESTDIR)$(SBINDIR)/knockd -+ $(INSTALL) -m0755 knock $(DESTDIR)$(BINDIR)/knock -+ $(INSTALL) -m0644 $(MANSRC)knockd.1 $(DESTDIR)$(MANDIR)/man1/knockd.1 -+ $(INSTALL) -m0644 $(MANSRC)knock.1 $(DESTDIR)$(MANDIR)/man1/knock.1 -+ $(INSTALL) -m0644 knockd.conf $(DESTDIR)/etc/knockd.conf - - clean: - rm -f *~ $(OBJDIR)*.o $(MANSRC)*.1 diff --git a/package/knock/patches/patch-src_knockd_c b/package/knock/patches/patch-src_knockd_c index 7d8512c96..e3a2d2955 100644 --- a/package/knock/patches/patch-src_knockd_c +++ b/package/knock/patches/patch-src_knockd_c @@ -1,20 +1,23 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- knock-0.5.orig/src/knockd.c 2005-06-27 07:11:34.000000000 +0200 -+++ knock-0.5/src/knockd.c 2009-06-01 21:43:53.000000000 +0200 -@@ -46,6 +46,7 @@ - #include <syslog.h> - #include <pcap.h> - #include <errno.h> -+#include <linux/limits.h> - #include "list.h" - - static char version[] = "0.5"; -@@ -1064,7 +1065,7 @@ char* get_ip(const char* iface, char *bu - return(NULL); - } - -- bzero((void*)(&ifr.ifr_name), sizeof(ifr.ifr_name)); -+ memset((void*)(&ifr.ifr_name), 0, sizeof(ifr.ifr_name)); - strncpy(ifr.ifr_name, iface, sizeof(ifr.ifr_name)-1); - ifr.ifr_name[sizeof(ifr.ifr_name)-1] = '\0'; - if(ioctl(s, SIOCGIFADDR, &ifr)) { +--- knock-0.6.orig/src/knockd.c 2013-04-08 20:11:56.000000000 +0200 ++++ knock-0.6/src/knockd.c 2014-01-16 16:59:04.000000000 +0100 +@@ -28,8 +28,8 @@ + #include <ctype.h> + #include <string.h> + #include <fcntl.h> +-#if defined(__FreeBSD__) || defined(__APPLE__) + #include <limits.h> ++#if defined(__FreeBSD__) || defined(__APPLE__) + #include <sys/socket.h> + #include <netinet/in_systm.h> + #endif +@@ -40,10 +40,6 @@ + #include <netinet/udp.h> + #include <netinet/ip_icmp.h> + #include <net/if.h> +-#if !defined(__FreeBSD__) && !defined(__APPLE__) +-#include <bits/time.h> +-#include <linux/limits.h> +-#endif + #include <sys/types.h> + #include <sys/wait.h> + #include <sys/ioctl.h> diff --git a/package/libICE/Makefile b/package/libICE/Makefile index aab03316f..3eb19785e 100644 --- a/package/libICE/Makefile +++ b/package/libICE/Makefile @@ -9,19 +9,23 @@ PKG_RELEASE:= 2 PKG_MD5SUM:= 4b8dae73fce37e994c3a6fa05d6db7ca PKG_DESCR:= Inter-Client Exchange library PKG_SECTION:= x11/libs -PKG_BUILDDEP:= xtrans xproto +PKG_BUILDDEP:= xtrans-host xtrans xproto-host xproto libICE-host PKG_SITES:= ${MASTER_SITE_XORG} PKG_LIBNAME:= libice PKG_OPTS:= dev +include $(TOPDIR)/mk/host.mk include $(TOPDIR)/mk/package.mk +$(eval $(call HOST_template,LIBICE,libice,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,LIBICE,libice,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +HOST_STYLE:= auto TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) libice-install: ${INSTALL_DIR} ${IDIR_LIBICE}/usr/lib ${CP} ${WRKINST}/usr/lib/libICE.so* ${IDIR_LIBICE}/usr/lib +include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libSM/Makefile b/package/libSM/Makefile index 4b9a9eae4..56ea8e604 100644 --- a/package/libSM/Makefile +++ b/package/libSM/Makefile @@ -10,17 +10,22 @@ PKG_MD5SUM:= 1d507651e9fa50aab7ef11be9e0e2f20 PKG_DESCR:= X11 Session Management library PKG_SECTION:= x11/libs PKG_DEPENDS:= libuuid -PKG_BUILDDEP:= libICE util-linux +PKG_BUILDDEP:= libSM-host libICE util-linux PKG_SITES:= ${MASTER_SITE_XORG} PKG_LIBNAME:= libsm PKG_OPTS:= dev +include $(TOPDIR)/mk/host.mk include $(TOPDIR)/mk/package.mk +$(eval $(call HOST_template,LIBSM,libsm,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,LIBSM,libsm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +HOST_STYLE:= auto + libsm-install: ${INSTALL_DIR} ${IDIR_LIBSM}/usr/lib ${CP} ${WRKINST}/usr/lib/libSM.so* ${IDIR_LIBSM}/usr/lib +include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libX11/Makefile b/package/libX11/Makefile index 78078cf83..8ab881ec2 100644 --- a/package/libX11/Makefile +++ b/package/libX11/Makefile @@ -9,7 +9,9 @@ PKG_RELEASE:= 3 PKG_MD5SUM:= 395455e4d3a51459374fe5ca8420aae8 PKG_DESCR:= X11 client-side library PKG_SECTION:= x11/libs -PKG_BUILDDEP:= xproto-host +PKG_BUILDDEP:= xproto-host xextproto-host libXau-host libpthread-stubs-host +PKG_BUILDDEP+= xcb-proto-host libxcb-host kbproto-host +PKG_BUILDDEP+= inputproto-host xtrans-host libX11-host PKG_BUILDDEP+= xproto xextproto xtrans libXdmcp libXau xcb-proto PKG_BUILDDEP+= xcmiscproto bigreqsproto kbproto inputproto libxcb PKG_DEPENDS:= libxdmcp libxcb libxau @@ -21,14 +23,18 @@ ifeq ($(ADK_STATIC),y) PKG_OPTS+= libonly endif +include $(TOPDIR)/mk/host.mk include $(TOPDIR)/mk/package.mk +$(eval $(call HOST_template,LIBX11,libx11,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,LIBX11,libx11,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +HOST_STYLE:= auto CONFIGURE_ARGS+= --enable-xlocale \ --disable-specs \ --disable-xf86bigfont \ --disable-malloc0returnsnull +HOST_CONFIGURE_ARGS+= $(CONFIGURE_ARGS) libx11-install: ${INSTALL_DIR} ${IDIR_LIBX11}/usr/lib ${IDIR_LIBX11}/usr/share/X11 @@ -37,4 +43,5 @@ libx11-install: ${CP} ${WRKINST}/usr/share/X11/XErrorDB ${IDIR_LIBX11}/usr/share/X11 ${CP} ${WRKINST}/usr/share/X11/locale ${IDIR_LIBX11}/usr/share/X11 +include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libXau/Makefile b/package/libXau/Makefile index ad7ff606e..363a0b2a3 100644 --- a/package/libXau/Makefile +++ b/package/libXau/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 2 PKG_MD5SUM:= 3ab7a4d1aac1b7f8ccc6b9755a19f252 PKG_DESCR:= X11 authorisation library PKG_SECTION:= x11/libs -PKG_BUILDDEP:= xproto +PKG_BUILDDEP:= xproto libXau-host PKG_SITES:= ${MASTER_SITE_XORG} PKG_LIBNAME:= libxau PKG_OPTS:= dev @@ -18,12 +18,17 @@ ifeq ($(ADK_STATIC),y) PKG_OPTS+= libonly endif +include $(TOPDIR)/mk/host.mk include $(TOPDIR)/mk/package.mk +$(eval $(call HOST_template,LIBXAU,libxau,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,LIBXAU,libxau,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +HOST_STYLE:= auto + libxau-install: ${INSTALL_DIR} ${IDIR_LIBXAU}/usr/lib ${CP} ${WRKINST}/usr/lib/libXau.so* ${IDIR_LIBXAU}/usr/lib/ +include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libXext/Makefile b/package/libXext/Makefile index 1d60babd8..c01665b93 100644 --- a/package/libXext/Makefile +++ b/package/libXext/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 2 PKG_MD5SUM:= 249478eae5c4fab7722894cb99565405 PKG_DESCR:= X client interface to extensions of the X protocol PKG_SECTION:= x11/libs -PKG_BUILDDEP:= libX11 xextproto +PKG_BUILDDEP:= libX11 xextproto libXext-host PKG_SITES:= ${MASTER_SITE_XORG} PKG_LIBNAME:= libxext PKG_OPTS:= dev @@ -18,14 +18,18 @@ ifeq ($(ADK_STATIC),y) PKG_OPTS+= libonly endif +include $(TOPDIR)/mk/host.mk include $(TOPDIR)/mk/package.mk +$(eval $(call HOST_template,LIBXEXT,libxext,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,LIBXEXT,libxext,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +HOST_STYLE:= auto CONFIGURE_ARGS+= --disable-malloc0returnsnull libxext-install: ${INSTALL_DIR} ${IDIR_LIBXEXT}/usr/lib ${CP} ${WRKINST}/usr/lib/libXext.so* ${IDIR_LIBXEXT}/usr/lib/ +include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libXi/Makefile b/package/libXi/Makefile index 0e204f07c..08e801043 100644 --- a/package/libXi/Makefile +++ b/package/libXi/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 2 PKG_MD5SUM:= d024a9de73191628f9772893f02054d8 PKG_DESCR:= X Window System client interface to the XINPUT extension to the X protocol. PKG_SECTION:= x11/libs -PKG_BUILDDEP:= xproto xextproto libXext +PKG_BUILDDEP:= xproto xextproto libXext libXi-host PKG_URL:= http://xorg.freedesktop.org/ PKG_SITES:= ${MASTER_SITE_XORG} PKG_LIBNAME:= libxi @@ -19,10 +19,13 @@ ifeq ($(ADK_STATIC),y) PKG_OPTS+= libonly endif +include $(TOPDIR)/mk/host.mk include $(TOPDIR)/mk/package.mk +$(eval $(call HOST_template,LIBXI,libxi,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,LIBXI,libxi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},$(PKG_OPTS))) +HOST_STYLE:= auto CONFIGURE_ARGS+= --disable-malloc0returnsnull libxi-install: @@ -30,4 +33,5 @@ libxi-install: $(CP) $(WRKINST)/usr/lib/libXi*.so* \ $(IDIR_LIBXI)/usr/lib +include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libXinerama/Makefile b/package/libXinerama/Makefile index ffef8c88d..2887aaf71 100644 --- a/package/libXinerama/Makefile +++ b/package/libXinerama/Makefile @@ -9,19 +9,23 @@ PKG_RELEASE:= 2 PKG_MD5SUM:= 29a813b3850d499a3524a8d5d5ecb099 PKG_DESCR:= Xinerama library PKG_SECTION:= x11/libs -PKG_BUILDDEP:= xineramaproto +PKG_BUILDDEP:= xineramaproto-host xineramaproto libXext-host libXinerama-host PKG_SITES:= ${MASTER_SITE_XORG} PKG_LIBNAME:= libxinerama PKG_OPTS:= dev +include $(TOPDIR)/mk/host.mk include $(TOPDIR)/mk/package.mk +$(eval $(call HOST_template,LIBXINERAMA,libxinerama,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,LIBXINERAMA,libxinerama,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +HOST_STYLE:= auto CONFIGURE_ARGS+= --disable-malloc0returnsnull libxinerama-install: ${INSTALL_DIR} ${IDIR_LIBXINERAMA}/usr/lib ${CP} ${WRKINST}/usr/lib/libXinerama.so* ${IDIR_LIBXINERAMA}/usr/lib +include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libXt/Makefile b/package/libXt/Makefile index 69cd67d2f..61db0b88f 100644 --- a/package/libXt/Makefile +++ b/package/libXt/Makefile @@ -5,26 +5,33 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libXt PKG_VERSION:= 1.1.3 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 7a80ed7aba06668b12ebd0910318a1f1 PKG_DESCR:= X Toolkit Intrinsics libraries PKG_SECTION:= x11/libs PKG_DEPENDS:= libsm libice libuuid libx11 libxau libxdmcp libxcb -PKG_BUILDDEP:= autotool libSM libX11 kbproto util-macros +PKG_BUILDDEP:= autotool util-macros-host libICE-host libSM-host +PKG_BUILDDEP+= libXt-host +PKG_BUILDDEP+= libSM libX11 kbproto util-macros PKG_SITES:= ${MASTER_SITE_XORG} PKG_LIBNAME:= libxt PKG_OPTS:= dev +include $(TOPDIR)/mk/host.mk include $(TOPDIR)/mk/package.mk +$(eval $(call HOST_template,LIBXT,libxt,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,LIBXT,libxt,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +HOST_STYLE:= auto AUTOTOOL_STYLE:= autoreconf TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) +CONFIGURE_ENV+= CFLAGS_FOR_BUILD="$(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD)" CONFIGURE_ARGS+= --disable-malloc0returnsnull libxt-install: ${INSTALL_DIR} ${IDIR_LIBXT}/usr/lib ${CP} ${WRKINST}/usr/lib/libXt.so* ${IDIR_LIBXT}/usr/lib +include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libXtst/Makefile b/package/libXtst/Makefile index 5a9c07704..913fbdee6 100644 --- a/package/libXtst/Makefile +++ b/package/libXtst/Makefile @@ -9,19 +9,26 @@ PKG_RELEASE:= 2 PKG_MD5SUM:= 8918809e47c29b44d25eb16b1586a15b PKG_DESCR:= Xtst library PKG_SECTION:= x11/libs -PKG_BUILDDEP:= recordproto libXi +PKG_BUILDDEP:= recordproto-host xproto-host xextproto-host inputproto-host kbproto-host +PKG_BUILDDEP+= xtrans-host xcb-proto-host libXau-host libpthread-stubs-host libxcb-host +PKG_BUILDDEP+= libX11-host libXext-host libXi-host libXtst-host +PKG_BUILDDEP+= recordproto libXi PKG_SITES:= ${MASTER_SITE_XORG} PKG_LIBNAME:= libxtst PKG_OPTS:= dev +include $(TOPDIR)/mk/host.mk include $(TOPDIR)/mk/package.mk +$(eval $(call HOST_template,LIBXTST,libxtst,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,LIBXTST,libxtst,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +HOST_STYLE:= auto CONFIGURE_ARGS+= --disable-malloc0returnsnull libxtst-install: ${INSTALL_DIR} ${IDIR_LIBXTST}/usr/lib ${CP} ${WRKINST}/usr/lib/libXtst.so* ${IDIR_LIBXTST}/usr/lib +include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libcec/Makefile b/package/libcec/Makefile index dcf6e2580..7cfd8f369 100644 --- a/package/libcec/Makefile +++ b/package/libcec/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libcec PKG_VERSION:= 2.1.4 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= d65e52ab3295e9e4b73bf4580f3bd4f7 PKG_DESCR:= control your device with your TV remote control PKG_SECTION:= libs @@ -34,5 +34,8 @@ libcec-install: $(INSTALL_DIR) $(IDIR_LIBCEC)/usr/lib $(CP) $(WRKINST)/usr/lib/libcec*.so* \ $(IDIR_LIBCEC)/usr/lib + $(INSTALL_DIR) $(IDIR_LIBCEC)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/cec-client \ + $(IDIR_LIBCEC)/usr/bin include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libffi/Makefile b/package/libffi/Makefile index 1a3194960..0b316720d 100644 --- a/package/libffi/Makefile +++ b/package/libffi/Makefile @@ -22,8 +22,8 @@ $(eval $(call PKG_template,LIBFFI,libffi,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEP AUTOTOOL_STYLE:= autoreconf HOST_STYLE:= auto -HOST_CONFIGURE_ARGS+= --disable-builddir -CONFIGURE_ARGS+= --disable-builddir +HOST_CONFIGURE_ARGS+= --disable-builddir --with-pic +CONFIGURE_ARGS+= --disable-builddir --with-pic libffi-install: ${INSTALL_DIR} ${IDIR_LIBFFI}/usr/lib diff --git a/package/libjson/Makefile b/package/libjson/Makefile new file mode 100644 index 000000000..6520bd419 --- /dev/null +++ b/package/libjson/Makefile @@ -0,0 +1,34 @@ +# 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:= libjson +PKG_VERSION:= 7.6.1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 82f3fcbf9f8cf3c4e25e1bdd77d65164 +PKG_DESCR:= JSON library +PKG_SECTION:= libs +PKG_URL:= http://sourceforge.net/projects/libjson/ +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=libjson/} +PKG_OPTS:= dev + +PKG_NOPARALLEL:= 1 + +DISTFILES:= ${PKG_NAME}_${PKG_VERSION}.zip +WRKDIST= ${WRKDIR}/${PKG_NAME} + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBJSON,libjson,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) + +MAKE_FILE:= makefile +FAKE_FLAGS+= prefix=${WRKINST}/usr +CONFIG_STYLE:= manual + +libjson-install: + $(INSTALL_DIR) $(IDIR_LIBJSON)/usr/lib + $(CP) $(WRKINST)/usr/lib/libjson*.so* \ + $(IDIR_LIBJSON)/usr/lib + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libjson/patches/patch-makefile b/package/libjson/patches/patch-makefile new file mode 100644 index 000000000..919c6308c --- /dev/null +++ b/package/libjson/patches/patch-makefile @@ -0,0 +1,50 @@ +--- libjson.orig/makefile 2014-01-17 20:38:29.584543459 +0100 ++++ libjson/makefile 2014-01-17 20:38:14.372460375 +0100 +@@ -128,7 +128,7 @@ objects = internalJSONNode.o JSON + JSONDebug.o JSONIterators.o JSONMemory.o JSONNode.o \ + JSONNode_Mutex.o JSONPreparse.o JSONStream.o JSONValidator.o \ + JSONWorker.o JSONWriter.o libjson.o +-OS=$(shell uname) ++OS=Linux + + # Defaults + ifeq ($(OS), Darwin) +@@ -158,8 +158,7 @@ srcdir ?= _internal/Source + CXX ?= c++ + AR ?= ar + PIC ?= PIC +-BUILD_TYPE ?= "default" +-SHARED ?= "1" ++SHARED ?= 1 + + + # Internal Variables +@@ -237,18 +236,16 @@ endif + + # Compile object files + $(objdir)/%.o: $(srcdir)/%.cpp +- $(CXX) $< -o $@ -c $(CXXFLAGS) ++ $(CXX) $< -o $@ -c $(CPPFLAGS) $(CXXFLAGS) + + ifeq ($(SHARED),1) + install: banner install_headers $(lib_target) + @echo "Install shared library" ++ mkdir -p $(inst_path) + cp -f ./$(lib_target) $(inst_path) + cd $(inst_path) ; \ + ln -sf $(lib_target) $(libname_shared_major_version) ; \ + ln -sf $(libname_shared_major_version) $(libname_shared) +-ifneq ($(OS),Darwin) +- ldconfig +-endif + @echo "Install shared library: Done." + else + install: banner install_headers $(lib_target) +@@ -266,7 +263,6 @@ install_headers: banner + cp -r ./$(srcdir)/JSONDefs $(include_path)/$(libname_hdr)/$(srcdir) + chmod -R a+r $(include_path)/$(libname_hdr) + find $(include_path)/$(libname_hdr) -type d -exec chmod a+x {} \; +- cp -rv $(srcdir)/Dependencies/ $(include_path)/$(libname_hdr)/$(srcdir) + @echo "Install header files: Done." + + clean: banner diff --git a/package/libpthread-stubs/Makefile b/package/libpthread-stubs/Makefile index 6278f9a3a..9f12523ef 100644 --- a/package/libpthread-stubs/Makefile +++ b/package/libpthread-stubs/Makefile @@ -9,12 +9,18 @@ PKG_RELEASE:= 2 PKG_MD5SUM:= a09d928c4af54fe5436002345ef71138 PKG_DESCR:= Pthread-stubs PKG_SECTION:= devel +PKG_BUILDDEP:= libpthread-stubs-host PKG_URL:= http://xcb.freedesktop.org/ PKG_SITES:= ${MASTER_SITE_XORG} PKG_OPTS:= dev devonly +include $(TOPDIR)/mk/host.mk include $(TOPDIR)/mk/package.mk +$(eval $(call HOST_template,LIBPTHREAD_STUBS,libpthread-stubs,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,LIBPTHREAD_STUBS,libpthread-stubs,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +HOST_STYLE:= auto + +include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libsamplerate/Makefile b/package/libsamplerate/Makefile index a8f8d04ce..5c73458d1 100644 --- a/package/libsamplerate/Makefile +++ b/package/libsamplerate/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libsamplerate PKG_VERSION:= 0.1.8 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 1c7fb25191b4e6e3628d198a66a84f47 PKG_DESCR:= sample rate converter for audio PKG_SECTION:= libs @@ -17,6 +17,8 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBSAMPLERATE,libsamplerate,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +CONFIGURE_ARGS+= --disable-sndfile + libsamplerate-install: $(INSTALL_DIR) $(IDIR_LIBSAMPLERATE)/usr/lib $(CP) $(WRKINST)/usr/lib/libsamplerate*.so* \ diff --git a/package/libsndfile/Makefile b/package/libsndfile/Makefile new file mode 100644 index 000000000..b1663a23c --- /dev/null +++ b/package/libsndfile/Makefile @@ -0,0 +1,25 @@ +# 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:= libsndfile +PKG_VERSION:= 1.0.25 +PKG_RELEASE:= 1 +PKG_MD5SUM:= e2b7bb637e01022c7d20f95f9c3990a2 +PKG_DESCR:= reading and writing files containing sampled sound +PKG_SECTION:= libs +PKG_URL:= http://www.mega-nerd.com/libsndfile/ +PKG_SITES:= http://www.mega-nerd.com/libsndfile/files/ +PKG_OPTS:= dev + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBSNDFILE,libsndfile,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) + +libsndfile-install: + $(INSTALL_DIR) $(IDIR_LIBSNDFILE)/usr/lib + $(CP) $(WRKINST)/usr/lib/libsndfile*.so* \ + $(IDIR_LIBSNDFILE)/usr/lib + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libtool/Makefile b/package/libtool/Makefile index adfd6f4cc..4d4c8c4c8 100644 --- a/package/libtool/Makefile +++ b/package/libtool/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 3 PKG_MD5SUM:= d2f3b7d4627e69e13514a40e72a24d50 PKG_DESCR:= a generic dynamic object loading library PKG_SECTION:= lang -PKG_BUILDDEP:= libtool-host +PKG_BUILDDEP:= m4-host libtool-host PKG_URL:= http://www.gnu.org/software/libtool/ PKG_SITES:= ${MASTER_SITE_GNU:=libtool/} PKG_LIBNAME:= libltdl diff --git a/package/libupnp/Makefile b/package/libupnp/Makefile index 4b01731bc..18eda96b6 100644 --- a/package/libupnp/Makefile +++ b/package/libupnp/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libupnp -PKG_VERSION:= 1.6.6 -PKG_RELEASE:= 3 -PKG_MD5SUM:= 8918dcf7428cd119d0c8275765ff2833 +PKG_VERSION:= 1.6.19 +PKG_RELEASE:= 1 +PKG_MD5SUM:= ee16e5d33a3ea7506f38d71facc057dd PKG_DESCR:= The Universal Plug and Play (UPnP) SDK library PKG_SECTION:= libs PKG_BUILDDEP:= autotool diff --git a/package/libx264/Makefile b/package/libx264/Makefile index 1936ad533..55bd18868 100644 --- a/package/libx264/Makefile +++ b/package/libx264/Makefile @@ -4,16 +4,18 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libx264 -# actually is snapshot x264-snapshot-20131010-2245 -PKG_VERSION:= 1.0 -PKG_RELEASE:= 3 -PKG_MD5SUM:= e6718029b4bc955f1dbb9bdafeed3ac0 +# actually is git checkout from 22.01.2014 +PKG_VERSION:= 1.0.1 +PKG_RELEASE:= 2 +PKG_MD5SUM:= 6be3e8adeaf6b007bbc04026b6ebd304 PKG_DESCR:= H264 encoding library PKG_SECTION:= libs PKG_URL:= http://www.videolan.org/developers/x264.html PKG_SITES:= http://openadk.org/distfiles/ PKG_OPTS:= dev +PKG_BUILDDEP_IBM_X40:= yasm-host + include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBX264,libx264,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) @@ -21,7 +23,8 @@ $(eval $(call PKG_template,LIBX264,libx264,$(PKG_VERSION)-${PKG_RELEASE},${PKG_D ifeq ($(ADK_TARGET_SYSTEM_SHARP_ZAURUS),y) CONFIGURE_ARGS+= --disable-asm endif -CONFIGURE_ARGS+= --disable-cli +CONFIGURE_ARGS+= --disable-cli \ + --cross-prefix=$(TARGET_CROSS) libx264-install: $(INSTALL_DIR) $(IDIR_LIBX264)/usr/lib diff --git a/package/libx264/patches/patch-Makefile b/package/libx264/patches/patch-Makefile index e82e9bf2d..cd8a9f198 100644 --- a/package/libx264/patches/patch-Makefile +++ b/package/libx264/patches/patch-Makefile @@ -1,6 +1,6 @@ ---- libx264-1.0.orig/Makefile 2013-10-10 22:45:04.000000000 +0200 -+++ libx264-1.0/Makefile 2013-10-12 17:50:05.000000000 +0200 -@@ -118,7 +118,7 @@ endif +--- libx264-1.0.1.orig/Makefile 2014-01-22 11:20:21.000000000 +0100 ++++ libx264-1.0.1/Makefile 2014-01-22 11:26:46.000000000 +0100 +@@ -117,7 +117,7 @@ endif # NEON optims ifeq ($(ARCH),ARM) diff --git a/package/libx264/patches/patch-configure b/package/libx264/patches/patch-configure index dd0097aeb..ed9d2ed94 100644 --- a/package/libx264/patches/patch-configure +++ b/package/libx264/patches/patch-configure @@ -1,6 +1,15 @@ ---- libx264-1.0.orig/configure 2013-10-10 22:45:04.000000000 +0200 -+++ libx264-1.0/configure 2013-10-12 17:49:39.000000000 +0200 -@@ -985,9 +985,9 @@ if [ "$debug" = "yes" ]; then +--- libx264-1.0.1.orig/configure 2014-01-22 11:20:21.000000000 +0100 ++++ libx264-1.0.1/configure 2014-01-22 19:42:21.000000000 +0100 +@@ -662,7 +662,7 @@ case $host_cpu in + LDFLAGS="$LDFLAGS -arch armv7" + fi + else +- AS="${AS-${cross_prefix}gcc}" ++ AS="${cross_prefix}gcc" + fi + ;; + s390|s390x) +@@ -1007,9 +1007,9 @@ if [ "$debug" = "yes" ]; then elif [ $ARCH = ARM ]; then # arm-gcc-4.2 produces incorrect output with -ffast-math # and it doesn't save any speed anyway on 4.4, so disable it @@ -12,7 +21,7 @@ fi if cc_check '' -fno-tree-vectorize ; then -@@ -1125,6 +1125,7 @@ bindir=$bindir +@@ -1147,6 +1147,7 @@ bindir=$bindir libdir=$libdir includedir=$includedir ARCH=$ARCH @@ -20,12 +29,3 @@ SYS=$SYS CC=$CC CFLAGS=$CFLAGS -@@ -1136,7 +1137,7 @@ LIBX264=$LIBX264 - AR=$AR - RANLIB=$RANLIB - STRIP=$STRIP --AS=$AS -+AS=$CC - ASFLAGS=$ASFLAGS - RC=$RC - RCFLAGS=$RCFLAGS diff --git a/package/libxcb/Makefile b/package/libxcb/Makefile index f394cc10f..713a6c3a3 100644 --- a/package/libxcb/Makefile +++ b/package/libxcb/Makefile @@ -9,16 +9,21 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 324c76024a73dba8a902638696ba87de PKG_DESCR:= X11 keyboard library PKG_SECTION:= x11/libs -PKG_BUILDDEP:= python2 libpthread-stubs libxslt libXau xcb-proto +PKG_BUILDDEP:= libXau-host libpthread-stubs-host xcb-proto-host +PKG_BUILDDEP+= libxcb-host +PKG_BUILDDEP+= python2 libpthread-stubs libxslt libXau xcb-proto PKG_SITES:= http://xcb.freedesktop.org/dist/ PKG_OPTS:= dev +include $(TOPDIR)/mk/host.mk include $(TOPDIR)/mk/package.mk +$(eval $(call HOST_template,LIBXCB,libxcb,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,LIBXCB,libxcb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) include $(TOPDIR)/mk/python.mk +HOST_STYLE:= auto TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) CONFIGURE_ENV+= PYTHON=$(PYTHON) @@ -26,4 +31,5 @@ libxcb-install: ${INSTALL_DIR} ${IDIR_LIBXCB}/usr/lib ${CP} ${WRKINST}/usr/lib/libxcb*.so* ${IDIR_LIBXCB}/usr/lib +include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/mpd/Makefile b/package/mpd/Makefile index 684c08f27..589aa14b4 100644 --- a/package/mpd/Makefile +++ b/package/mpd/Makefile @@ -5,13 +5,13 @@ include ${TOPDIR}/rules.mk PKG_NAME:= mpd PKG_VERSION:= 0.18.5 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 63bcf6ce338caa2ae2cd6dc8e9710d5c PKG_DESCR:= A music player daemon PKG_SECTION:= multimedia -PKG_DEPENDS:= glib libstdcxx libgcc libiconv -PKG_FDEPENDS:= glib libstdcxx libgcc libiconv -PKG_BUILDDEP:= glib +PKG_DEPENDS:= glib libstdcxx libgcc libiconv-tiny libmpdclient +PKG_FDEPENDS:= glib libstdcxx libgcc libiconv-tiny libmpdclient +PKG_BUILDDEP:= glib libmpdclient PKG_URL:= http://www.musicpd.org/ PKG_SITES:= http://www.musicpd.org/download/mpd/0.18/ PKG_NEED_CXX:= 1 @@ -23,7 +23,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz PKG_FLAVOURS_MPD:= WITH_ALSA WITH_AO WITH_MP3 WITH_MP4 WITH_TREMOR PKG_FLAVOURS_MPD+= WITH_OGG WITH_FLAC WITH_WAV WITH_MMS WITH_FFMPEG PKG_FLAVOURS_MPD+= WITH_SHOUT WITH_CURL WITH_SAMPLERATE WITH_HTTPD -PKG_FLAVOURS_MPD+= WITH_OPUS +PKG_FLAVOURS_MPD+= WITH_OPUS WITH_PULSE PKGFD_WITH_ALSA:= enable ALSA output PKGFS_WITH_ALSA:= alsa-lib @@ -112,6 +112,13 @@ ifeq ($(ADK_PACKAGE_MPD_WITH_OPUS),y) PKG_FDEPENDS+= libopus endif +PKGFD_WITH_PULSE:= enable PULSE support +PKGFS_WITH_PULSE:= pulseaudio +PKGFB_WITH_PULSE:= pulseaudio +ifeq ($(ADK_PACKAGE_MPD_WITH_PULSE),y) +PKG_FDEPENDS+= pulseaudio +endif + PKGFD_WITH_HTTPD:= enable HTTP output include ${TOPDIR}/mk/package.mk @@ -123,7 +130,6 @@ TARGET_CFLAGS+= -std=gnu99 CONFIGURE_ENV+= ac_cv_lib_nsl_gethostbyname=no CONFIGURE_ARGS+= --disable-jack \ --disable-fifo \ - --disable-pulse \ --disable-oss \ --disable-bzip2 \ --disable-libwrap \ @@ -142,6 +148,12 @@ else CONFIGURE_ARGS+= --disable-httpd-output endif +ifneq (${ADK_PACKAGE_MPD_WITH_PULSE},) +CONFIGURE_ARGS+= --enable-pulse +else +CONFIGURE_ARGS+= --disable-pulse +endif + ifneq (${ADK_PACKAGE_MPD_WITH_ALSA},) CONFIGURE_ARGS+= --enable-alsa else diff --git a/package/mpdbox/Makefile b/package/mpdbox/Makefile new file mode 100644 index 000000000..fd164e8ad --- /dev/null +++ b/package/mpdbox/Makefile @@ -0,0 +1,30 @@ +# 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:= mpdbox +PKG_VERSION:= 1.0 +PKG_RELEASE:= 2 +PKG_MD5SUM:= ac0dc1cc7141c1eca66d8ddd98574e0b +PKG_DESCR:= MPD web interface +PKG_SECTION:= multimedia +PKG_URL:= http://www.openadk.org/cgi-bin/gitweb.cgi?p=mpdbox.git;a=summary +PKG_SITES:= http://www.openadk.org/distfiles/ + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,MPDBOX,mpdbox,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIG_STYLE:= manual +BUILD_STYLE:= manual +INSTALL_STYLE:= manual + +mpdbox-install: + $(INSTALL_DIR) $(IDIR_MPDBOX)/srv/www/htdocs + $(CP) $(WRKBUILD)/* \ + $(IDIR_MPDBOX)/srv/www/htdocs + $(CP) $(IDIR_MPDBOX)/srv/www/htdocs/inc/config.inc.example \ + $(IDIR_MPDBOX)/srv/www/htdocs/inc/config.inc + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/mt-daapd/Makefile b/package/mt-daapd/Makefile index 7303c86e7..d1baa41e4 100644 --- a/package/mt-daapd/Makefile +++ b/package/mt-daapd/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= mt-daapd PKG_VERSION:= 0.2.4.2 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 67bef9fb14d487693b0dfb792c3f1b05 PKG_DESCR:= a multi-threaded DAAP daemon PKG_SECTION:= multimedia diff --git a/package/mt-daapd/patches/patch-src_mp3-scanner_c b/package/mt-daapd/patches/patch-src_mp3-scanner_c new file mode 100644 index 000000000..e5defb78f --- /dev/null +++ b/package/mt-daapd/patches/patch-src_mp3-scanner_c @@ -0,0 +1,10 @@ +--- mt-daapd-0.2.4.2.orig/src/mp3-scanner.c 2008-04-19 21:17:23.000000000 +0200 ++++ mt-daapd-0.2.4.2/src/mp3-scanner.c 2014-01-20 12:19:42.000000000 +0100 +@@ -40,6 +40,7 @@ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> ++#include <sys/param.h> + + #include <netinet/in.h> /* htons and friends */ + #include <sys/stat.h> diff --git a/package/mxml/Makefile b/package/mxml/Makefile index afba8d1c1..e79299700 100755 --- a/package/mxml/Makefile +++ b/package/mxml/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 68977789ae64985dddbd1a1a1652642e PKG_DESCR:= lightweight XML library PKG_SECTION:= libs -PKG_URL:= http://www.minixml.org/ -PKG_SITES:= http://ftp.easysw.com/pub/mxml/2.6/ +PKG_URL:= http://www.msweet.org/projects.php?Z3 +PKG_SITES:= http://www.msweet.org/files/project3/ PKG_LIBNAME:= libmxml PKG_OPTS:= dev diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile index 18845a0a5..31cf3fc29 100644 --- a/package/nfs-utils/Makefile +++ b/package/nfs-utils/Makefile @@ -5,11 +5,11 @@ include ${TOPDIR}/rules.mk PKG_NAME:= nfs-utils PKG_VERSION:= 1.2.8 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= fb48630b7c145fb9d6602a79c6eaab11 PKG_DESCR:= Utilities for NFS kernel server implementation PKG_SECTION:= net/fs -PKG_DEPENDS:= kmod-nfsd keyutils libtirpc rpcbind libdevmapper libpthread +PKG_DEPENDS:= keyutils libtirpc rpcbind libdevmapper libpthread PKG_FDEPENDS:= $(PKG_DEPENDS) PKG_BUILDDEP:= keyutils libtirpc lvm PKG_URL:= http://sourceforge.net/projects/nfs @@ -20,6 +20,12 @@ PKG_SITES:= http://openadk.org/distfiles/ PKG_LIBC_DEPENDS:= uclibc eglibc glibc +PKG_SUBPKGS:= NFS_UTILS NFS_UTILS_CLIENT NFS_UTILS_SERVER +PKGSS_NFS_UTILS_CLIENT:=kmod-nfs-fs kmod-sunrpc +PKGSD_NFS_UTILS_CLIENT:=NFS client utilities (mount) +PKGSS_NFS_UTILS_SERVER:=kmod-nfsd kmod-sunrpc +PKGSD_NFS_UTILS_SERVER:=NFS server daemons and utilities + PKG_FLAVOURS_NFS_UTILS:=WITH_KERBEROS PKGFD_WITH_KERBEROS:= enable Kerberos support (MIT) PKGFS_WITH_KERBEROS:= libkrb5 libevent libnfsidmap librpcsecgss libcom-err libgssglue kmod-rpcsec-gss-krb5 kmod-sunrpc-gss @@ -34,6 +40,8 @@ endif include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,NFS_UTILS,nfs-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_FDEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,NFS_UTILS_CLIENT,nfs-utils-client,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_NFS_UTILS_CLIENT},${PKGSD_NFS_UTILS_CLIENT},${PKG_SECTION})) +$(eval $(call PKG_template,NFS_UTILS_SERVER,nfs-utils-server,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_NFS_UTILS_SERVER},${PKGSD_NFS_UTILS_SERVER},${PKG_SECTION})) ifeq ($(ADK_NATIVE),) KRB5INC:= ${STAGING_TARGET_DIR}/usr @@ -63,26 +71,31 @@ CONFIGURE_ARGS+= --without-tcp-wrappers \ --with-tirpcinclude=${TIRPCINC} \ --disable-uuid -nfs-utils-install: - ${INSTALL_DIR} ${IDIR_NFS_UTILS}/usr/sbin ${IDIR_NFS_UTILS}/etc - ${INSTALL_DIR} ${IDIR_NFS_UTILS}/sbin - ${CP} ${WRKINST}/sbin/{u,}mount.nfs* ${IDIR_NFS_UTILS}/sbin - ${INSTALL_DATA} ./files/rpc ${IDIR_NFS_UTILS}/etc +nfs-utils-client-install: + ${INSTALL_DIR} ${IDIR_NFS_UTILS_CLIENT}/sbin + ${CP} ${WRKINST}/sbin/{u,}mount.nfs* ${IDIR_NFS_UTILS_CLIENT}/sbin + +nfs-utils-server-install: + ${INSTALL_DIR} ${IDIR_NFS_UTILS_SERVER}/usr/sbin ${IDIR_NFS_UTILS_SERVER}/etc ${INSTALL_BIN} ${WRKBUILD}/utils/exportfs/exportfs \ - ${IDIR_NFS_UTILS}/usr/sbin/ - ${INSTALL_DATA} ./files/nfsd.exports ${IDIR_NFS_UTILS}/etc/exports + ${IDIR_NFS_UTILS_SERVER}/usr/sbin/ + ${INSTALL_DATA} ./files/nfsd.exports ${IDIR_NFS_UTILS_SERVER}/etc/exports ${INSTALL_BIN} ${WRKBUILD}/utils/nfsd/nfsd \ - ${IDIR_NFS_UTILS}/usr/sbin/ + ${IDIR_NFS_UTILS_SERVER}/usr/sbin/ ${INSTALL_BIN} ${WRKBUILD}/utils/mountd/mountd \ - ${IDIR_NFS_UTILS}/usr/sbin/ + ${IDIR_NFS_UTILS_SERVER}/usr/sbin/ ifeq ($(ADK_PACKAGE_NFS_UTILS_WITH_KERBEROS),y) - ${INSTALL_DATA} ./files/idmapd.conf ${IDIR_NFS_UTILS}/etc + ${INSTALL_DATA} ./files/idmapd.conf ${IDIR_NFS_UTILS_SERVER}/etc ${INSTALL_BIN} ${WRKBUILD}/utils/gssd/gssd \ - ${IDIR_NFS_UTILS}/usr/sbin/ + ${IDIR_NFS_UTILS_SERVER}/usr/sbin/ ${INSTALL_BIN} ${WRKBUILD}/utils/gssd/svcgssd \ - ${IDIR_NFS_UTILS}/usr/sbin/ + ${IDIR_NFS_UTILS_SERVER}/usr/sbin/ ${INSTALL_BIN} ${WRKBUILD}/utils/idmapd/idmapd \ - ${IDIR_NFS_UTILS}/usr/sbin/ + ${IDIR_NFS_UTILS_SERVER}/usr/sbin/ endif +nfs-utils-install: + ${INSTALL_DIR} ${IDIR_NFS_UTILS}/etc + ${INSTALL_DATA} ./files/rpc ${IDIR_NFS_UTILS}/etc + include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile index ed4fc21b4..b4851014b 100644 --- a/package/openjdk7/Makefile +++ b/package/openjdk7/Makefile @@ -10,6 +10,10 @@ PKG_MD5SUM:= 9b3afa162021e3fca6161ba8f9f7dc11 PKG_DESCR:= OpenJDK 7 Java VM PKG_SECTION:= lang PKG_BUILDDEP:= gettext-tiny-host glib-host flex-host bison-host qemu-host +PKG_BUILDDEP+= fastjar-host libICE-host libSM-host libX11-host util-macros-host libXt-host +PKG_BUILDDEP+= xineramaproto-host libXinerama-host recordproto-host libXi-host libXtst-host freetype-host +PKG_BUILDDEP+= alsa-lib-host libffi-host gcj-host ecj-host jikes-host +PKG_BUILDDEP+= classpath-host jamvm-host ant-host cups-host openjdk7-host PKG_BUILDDEP+= alsa-lib xproto libjpeg-turbo zlib giflib libpng freetype cups PKG_BUILDDEP+= libX11 libXt libXp libXinerama libXrender libXtst libiconv-tiny PKG_DEPENDS:= zlib libstdcxx libffi libpthread libxtst libxi libgcc @@ -19,20 +23,18 @@ PKG_SITES:= http://icedtea.classpath.org/download/source/ DISTFILES:= icedtea-$(PKG_VERSION).tar.gz WRKDIST= ${WRKDIR}/icedtea-${PKG_VERSION} +GCJ_VER:= 4.7.3 + PKG_HOST_DEPENDS:= linux PKG_ARCH_DEPENDS:= arm mips ppc sparc x86 x86_64 +PKG_LIBC_DEPENDS:= uclicb eglibc glibc PKG_SYSTEM_DEPENDS:= !linksys-ag241 !fon-fon2100 !broadcom-bcm47xx !lemote-yeelong -PKG_SUBPKGS:= OPENJDK7 -PKG_CHOICES_OPENJDK7:= ZERO SHARK CACAO -PKGCD_ZERO:= zero-assembly backend -PKGCD_SHARK:= Shark JIT backend (needs eglibc/glibc) -PKGCB_SHARK:= llvm -PKGCD_CACAO:= Cacao JIT backend - +include $(TOPDIR)/mk/host.mk include $(TOPDIR)/mk/package.mk include $(TOPDIR)/mk/qemu.mk +$(eval $(call HOST_template,OPENJDK7,openjdk7,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,OPENJDK7,openjdk7,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) # for UINTPTR_MAX in stdint.h @@ -41,7 +43,7 @@ TARGET_CFLAGS+= -D__STDC_LIMIT_MACROS TARGET_CFLAGS:= $(subst march=pentium-m,march=i686,$(TARGET_CFLAGS)) TARGET_CFLAGS:= $(subst march=atom,march=i686,$(TARGET_CFLAGS)) TARGET_CFLAGS:= $(filter-out -fhonour-copts,$(TARGET_CFLAGS)) -BOOTSTRAPJDK:= ${STAGING_JAVA_HOST_DIR}/bootstrap-jdk +BOOTSTRAPJDK:= ${STAGING_HOST_DIR}/bootstrap-jdk JDKARCH:= $(CPU_ARCH) ifeq ($(ARCH),x86) @@ -51,17 +53,7 @@ ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y) JDKARCH:= mipsel endif -ifeq ($(ADK_PACKAGE_OPENJDK7_ZERO),y) CONFIGURE_BACKEND:= --enable-zero -endif -ifeq ($(ADK_PACKAGE_OPENJDK7_SHARK),y) -CONFIGURE_BACKEND:= --enable-shark \ - --with-llvm-config=$(STAGING_TARGET_DIR)/usr/bin/llvm-config -endif -ifeq ($(ADK_PACKAGE_OPENJDK7_CACAO),y) -CONFIGURE_BACKEND:= --enable-cacao -endif - CONFIGURE_COMMON:= --disable-docs \ --with-jdk-home=$(BOOTSTRAPJDK) \ --with-java=$(BOOTSTRAPJDK)/bin/java \ @@ -70,12 +62,11 @@ CONFIGURE_COMMON:= --disable-docs \ --with-jar=$(BOOTSTRAPJDK)/bin/jar \ --with-rmic=$(BOOTSTRAPJDK)/bin/rmic \ --with-native2ascii=$(BOOTSTRAPJDK)/bin/native2ascii \ - --with-gcj=$(STAGING_JAVA_HOST_DIR)/usr/bin/gcj \ + --with-gcj=$(STAGING_HOST_DIR)/usr/bin/gcj \ --without-hotspot-build \ --disable-system-jpeg \ --disable-system-lcms \ --disable-system-zlib \ - --disable-system-kerberos \ --disable-system-png \ --disable-system-gif \ --disable-system-gtk \ @@ -88,17 +79,56 @@ CONFIGURE_ARGS+= $(CONFIGURE_BACKEND) CONFIGURE_ARGS+= $(CONFIGURE_COMMON) CONFIGURE_ARGS+= --disable-bootstrap -CONFIGURE_ENV+= PATH="$(STAGING_JAVA_HOST_DIR)/usr/bin:$${PATH}" +CONFIGURE_ENV+= LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib MAKE_ENV+= ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME) \ ALT_OPENWIN_HOME=$(STAGING_DIR)/usr/ \ ALT_CUPS_HEADERS_PATH=$(STAGING_DIR)/usr/include/ \ ALT_FREETYPE_HEADERS_PATH=$(STAGING_DIR)/usr/include/ \ OTHER_CFLAGS='$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)' \ OTHER_CXXFLAGS='$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)' \ - GCC_HONOUR_COPTS=s CROSS_COMPILE_ARCH=$(JDKARCH) QEMU=$(QEMU) + OTHER_LDFLAGS='$(TARGET_LDFLAGS)' \ + GCC_HONOUR_COPTS=s CROSS_COMPILE_ARCH=$(JDKARCH) QEMU=$(QEMU) \ + LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib ALL_TARGET:= icedtea +# host stuff +OPENJDK_NATIVE_ENV+= JAVACFLAGS="-cp ${STAGING_HOST_DIR}/usr/share/java/libgcj-$(GCJ_VER).jar" +OPENJDK_NATIVE_ENV+= LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib:$(STAGING_HOST_DIR)/usr/lib64 +OPENJDK_NATIVE_ENV+= ADK_ECJ=$(STAGING_HOST_DIR)/usr/bin/ecj +OPENJDK_NATIVE_ENV+= BOOTCLASSPATH="$(STAGING_HOST_DIR)/usr/share/jamvm/classes.zip:$(STAGING_HOST_DIR)/usr/share/classpath/glibj.zip" +OPENJDK_NATIVE_ENV+= FFI_LDFLAGS="$(LDFLAGS_FOR_BUILD)" \ + ALT_CUPS_HEADERS_PATH="$(STAGING_HOST_DIR)/usr/include" + +HOST_STYLE:= auto +HOST_CONFIGURE_ENV+= $(OPENJDK_NATIVE_ENV) +HOST_MAKE_ENV+= $(OPENJDK_NATIVE_ENV) +HOST_ALL_TARGET:= icedtea-boot + +HOST_CONFIGURE_ARGS+=\ + --enable-bootstrap \ + --enable-zero \ + --with-jdk-home=$(STAGING_HOST_DIR)/usr/lib/jvm \ + --with-java=$(STAGING_HOST_DIR)/usr/bin/java \ + --with-javac=$(STAGING_HOST_DIR)/usr/bin/ecj \ + --with-ecj-jar=${STAGING_HOST_DIR}/usr/share/java/ecj.jar \ + --without-hotspot-build \ + --disable-system-jpeg \ + --disable-system-lcms \ + --disable-system-zlib \ + --disable-system-png \ + --disable-system-gif \ + --disable-system-gtk \ + --disable-system-gio \ + --disable-system-fontconfig \ + --disable-compile-against-syscalls \ + --without-rhino \ + --disable-docs + +hostpost-install: + -rm -rf $(STAGING_HOST_DIR)/bootstrap-jdk + $(CP) $(WRKBUILD)/openjdk.build-boot/j2sdk-image $(STAGING_HOST_DIR)/bootstrap-jdk + openjdk7-install: $(INSTALL_DIR) $(IDIR_OPENJDK7)/usr/lib/jvm/jre $(INSTALL_DIR) $(IDIR_OPENJDK7)/usr/bin @@ -107,4 +137,5 @@ openjdk7-install: (cd $(IDIR_OPENJDK7)/usr/bin && ln -sf ../lib/jvm/jre/bin/java .) (cd $(IDIR_OPENJDK7)/usr/lib/jvm/jre/lib/$(JDKARCH) && ln -sf server/libjvm.so .) +include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/openjdk7/patches/openadk.patch b/package/openjdk7/patches/openadk.patch index effd32a92..75e291e47 100644 --- a/package/openjdk7/patches/openadk.patch +++ b/package/openjdk7/patches/openadk.patch @@ -1,6 +1,6 @@ -diff -Nur icedtea-2.3.11.orig/Makefile.in icedtea-2.3.11/Makefile.in ---- icedtea-2.3.11.orig/Makefile.in 2013-07-25 02:39:55.000000000 +0200 -+++ icedtea-2.3.11/Makefile.in 2013-12-08 15:43:27.000000000 +0100 +diff -Nur icedtea-2.3.12.orig/Makefile.in icedtea-2.3.12/Makefile.in +--- icedtea-2.3.12.orig/Makefile.in 2013-07-26 20:18:01.000000000 +0200 ++++ icedtea-2.3.12/Makefile.in 2014-01-16 08:54:53.000000000 +0100 @@ -695,7 +695,7 @@ $(DISTRIBUTION_PATCHES) @@ -19,10 +19,10 @@ diff -Nur icedtea-2.3.11.orig/Makefile.in icedtea-2.3.11/Makefile.in @BUILD_NATIVE_ECJ_TRUE@ --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR} touch $@ -diff -Nur icedtea-2.3.11.orig/patches/openadk.patch icedtea-2.3.11/patches/openadk.patch ---- icedtea-2.3.11.orig/patches/openadk.patch 1970-01-01 01:00:00.000000000 +0100 -+++ icedtea-2.3.11/patches/openadk.patch 2013-12-08 16:22:41.000000000 +0100 -@@ -0,0 +1,493 @@ +diff -Nur icedtea-2.3.12.orig/patches/openadk.patch icedtea-2.3.12/patches/openadk.patch +--- icedtea-2.3.12.orig/patches/openadk.patch 1970-01-01 01:00:00.000000000 +0100 ++++ icedtea-2.3.12/patches/openadk.patch 2014-01-16 08:55:05.000000000 +0100 +@@ -0,0 +1,546 @@ +diff -Nur openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp +--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp 2013-07-17 20:14:46.000000000 +0200 ++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2013-12-08 15:44:03.000000000 +0100 @@ -516,3 +516,56 @@ diff -Nur icedtea-2.3.11.orig/patches/openadk.patch icedtea-2.3.11/patches/opena + + ifndef JDK_TOPDIR + JDK_TOPDIR=$(TOPDIR)/jdk ++diff -Nur openjdk-boot.orig/hotspot/make/linux/makefiles/vm.make openjdk-boot/hotspot/make/linux/makefiles/vm.make ++--- openjdk-boot.orig/hotspot/make/linux/makefiles/vm.make 2013-07-26 12:31:42.000000000 +0200 +++++ openjdk-boot/hotspot/make/linux/makefiles/vm.make 2014-01-14 21:28:27.000000000 +0100 ++@@ -285,7 +285,7 @@ ++ LIBS_VM += $(LIBS) ++ endif ++ ifeq ($(ZERO_BUILD), true) ++- LIBS_VM += $(LIBFFI_LIBS) +++ LIBS_VM += $(FFI_LDFLAGS) -Wl,-Bstatic $(LIBFFI_LIBS) -Wl,-Bdynamic ++ endif ++ ifeq ($(SHARK_BUILD), true) ++ LFLAGS_VM += $(LLVM_LDFLAGS) ++diff -Nur openjdk-boot.orig/Makefile openjdk-boot/Makefile ++--- openjdk-boot.orig/Makefile 2013-07-24 23:26:43.000000000 +0200 +++++ openjdk-boot/Makefile 2014-01-13 22:15:04.000000000 +0100 ++@@ -53,9 +53,7 @@ ++ REL_JDK_DEBUG_IMAGE_DIR = ../$(OUTPUTDIR_BASENAME-debug)/$(JDK_IMAGE_DIRNAME) ++ REL_JDK_FASTDEBUG_IMAGE_DIR = ../$(OUTPUTDIR_BASENAME-fastdebug)/$(JDK_IMAGE_DIRNAME) ++ ++-ifndef TOPDIR ++- TOPDIR:=. ++-endif +++TOPDIR:=. ++ ++ ifndef JDK_TOPDIR ++ JDK_TOPDIR=$(TOPDIR)/jdk ++diff -Nur openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make openjdk/hotspot/make/linux/makefiles/zeroshark.make ++--- openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make 2013-07-26 12:31:42.000000000 +0200 +++++ openjdk/hotspot/make/linux/makefiles/zeroshark.make 2014-01-16 08:45:53.000000000 +0100 ++@@ -38,7 +38,7 @@ ++ ++ offsets_arm.s: mkoffsets ++ @echo Generating assembler offsets ++- ./mkoffsets > $@ +++ $(QEMU) ./mkoffsets > $@ ++ ++ bytecodes_arm.s: bytecodes_arm.def mkbc ++ @echo Generating ARM assembler bytecode sequences ++@@ -46,12 +46,12 @@ ++ ++ mkbc: $(GAMMADIR)/tools/mkbc.c ++ @echo Compiling mkbc tool ++- $(CC_COMPILE) -o $@ $< $(COMPILE_DONE) +++ $(CC_FOR_BUILD) -o $@ $< $(COMPILE_DONE) ++ ++ mkoffsets: asm_helper.cpp ++ @echo Compiling offset generator ++ $(QUIETLY) $(REMOVE_TARGET) ++- $(CC_COMPILE) $(CFLAGS) -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE) +++ $(CC_COMPILE) $(CFLAGS) -static -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE) ++ ++ endif ++ diff --git a/package/pcsc-lite/Makefile b/package/pcsc-lite/Makefile index bc54b608b..1dc2bc527 100644 --- a/package/pcsc-lite/Makefile +++ b/package/pcsc-lite/Makefile @@ -12,7 +12,7 @@ PKG_SECTION:= crypto PKG_DEPENDS:= libusb libusb-compat libpthread PKG_BUILDDEP:= libusb libusb-compat PKG_URL:= http://pcsclite.alioth.debian.org/ -PKG_SITES:= http://alioth.debian.org/frs/download.php/file/3598/ +PKG_SITES:= http://openadk.org/distfiles/ PKG_OPTS:= dev DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 diff --git a/package/perl/files/config.sh.arm.eglibc b/package/perl/files/config.sh.arm.eglibc index 0aacd4d3d..d96ced6ea 100644 --- a/package/perl/files/config.sh.arm.eglibc +++ b/package/perl/files/config.sh.arm.eglibc @@ -788,12 +788,12 @@ lib_ext='.a' libc='' libperl='libperl.a' libpth='%%LIBDIRS%%' -libs='-lnsl -ldl -lm -lcrypt -lutil -lc' +libs='-ldl -lm -lcrypt -lutil -lc' libsdirs='%%LIBDIRS%%' -libsfiles=' libnsl.so libdl.so libm.so libcrypt.so libutil.so libc.so' +libsfiles=' libdl.so libm.so libcrypt.so libutil.so libc.so' #libsfound=' /lib/libnsl.so /lib/libdl.so /lib/libm.so /lib/libcrypt.so /lib/libutil.so /usr/lib/libc.so' libspath='%%LIBDIRS%%' -libswanted='sfio socket inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun m crypt sec util c cposix posix ucb BSD gdbm_compat' +libswanted='sfio socket inet nm ndbm gdbm dbm db malloc dl dld ld sun m crypt sec util c cposix posix ucb BSD gdbm_compat' libswanted_uselargefiles='' line='' lint='' @@ -879,7 +879,7 @@ perl='perl' perl_patchlevel='' perl_static_inline='static __inline__' perladmin='root@openadk.nonet' -perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc' +perllibs='-ldl -lm -lcrypt -lutil -lc' perlpath='/usr/bin/perl' pg='pg' phostname='hostname' diff --git a/package/perl/files/config.sh.ppc64.eglibc b/package/perl/files/config.sh.ppc64.eglibc new file mode 100644 index 000000000..6c9c74fe8 --- /dev/null +++ b/package/perl/files/config.sh.ppc64.eglibc @@ -0,0 +1,1118 @@ +#!/bin/sh +# +# This file was produced by running the Configure script. It holds all the +# definitions figured out by Configure. Should you modify one of these values, +# do not forget to propagate your changes by running "Configure -der". You may +# instead choose to run each of the .SH files by yourself, or "Configure -S". +# + +# Package name : perl5 +# Source directory : . +# Configuration time: Sun Jan 19 14:00:23 CET 2014 +# Configured by : root +# Target system : linux openadk 3.12.6 #1 sat jan 18 22:32:32 cet 2014 ppc64 gnulinux + +: Configure command line arguments. +config_arg0='./Configure' +config_args='-des' +config_argc=1 +config_arg1='-des' + +Author='' +Date='$Date' +Header='' +Id='$Id' +Locker='' +Log='$Log' +RCSfile='$RCSfile' +Revision='$Revision' +Source='' +State='' +_a='.a' +_exe='' +_o='.o' +afs='false' +afsroot='/afs' +alignbytes='8' +ansi2knr='' +aphostname='/bin/hostname' +api_revision='5' +api_subversion='0' +api_version='18' +api_versionstring='5.18.0' +ar='ar' +archlib='/usr/lib/perl5/5.18.1/ppc64-linux' +archlibexp='/usr/lib/perl5/5.18.1/ppc64-linux' +archname64='' +archname='ppc64-linux' +archobjs='' +asctime_r_proto='0' +awk='awk' +baserev='5.0' +bash='' +bin='/usr/bin' +bin_ELF='define' +binexp='/usr/bin' +bison='bison' +bootstrap_charset='undef' +byacc='byacc' +byteorder='87654321' +c='' +castflags='0' +cat='cat' +cc='%%CC%%' +cccdlflags='-fPIC' +ccdlflags='-Wl,-E' +ccflags='%%CFLAGS%%' +ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64' +ccname='gcc' +ccsymbols='system=linux system=posix system=unix' +ccversion='' +cf_by='root' +cf_email='root@openadk.nonet' +cf_time='Sun Jan 19 14:00:23 CET 2014' +charbits='8' +charsize='1' +chgrp='' +chmod='chmod' +chown='' +clocktype='clock_t' +comm='comm' +compress='' +contains='grep' +cp='cp' +cpio='' +cpp='cpp' +cpp_stuff='42' +cppccsymbols='__gnu_linux__=1 __linux=1 __linux__=1 __unix=1 __unix__=1 linux=1 unix=1' +cppflags='%%CPPFLAGS%%' +cpplast='-' +cppminus='-' +cpprun='%%CPP%%' +cppstdin='%%CPP%%' +cppsymbols='_ARCH_PPC64=1 _ARCH_PPC=1 _ARCH_PPCGR=1 _BIG_ENDIAN=1 _CALL_AIX=1 _CALL_AIXDESC=1 _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE=1 _LP64=1 _POSIX_C_SOURCE=200809L _POSIX_SOURCE=1 __ATOMIC_ACQUIRE=2 __ATOMIC_ACQ_REL=4 __ATOMIC_CONSUME=1 __ATOMIC_RELAXED=0 __ATOMIC_RELEASE=3 __ATOMIC_SEQ_CST=5 __BIGGEST_ALIGNMENT__=16 __BIG_ENDIAN__=1 __BYTE_ORDER__=4321 __CHAR16_TYPE__=short\ unsigned\ int __CHAR32_TYPE__=unsigned\ int __CHAR_BIT__=8 __CHAR_UNSIGNED__=1 __CMODEL_MEDIUM__=1 __DBL_DECIMAL_DIG__=17 __DBL_DENORM_MIN__=((double)4.9406564584124654e-324L) __DBL_DIG__=15 __DBL_EPSILON__=((double)2.2204460492503131e-16L) __DBL_HAS_DENORM__=1 __DBL_HAS_INFINITY__=1 __DBL_HAS_QUIET_NAN__=1 __DBL_MANT_DIG__=53 __DBL_MAX_10_EXP__=308 __DBL_MAX_EXP__=1024 __DBL_MAX__=((double)1.7976931348623157e+308L) __DBL_MIN_10_EXP__=(-307) __DBL_MIN_EXP__=(-1021) __DBL_MIN__=((double)2.2250738585072014e-308L) __DEC128_EPSILON__=1E-33DL __DEC128_MANT_DIG__=34 __DEC128_MAX_EXP__=6145 __DEC128_MAX__=9.999999999999999999999999999999999E6144DL __DEC128_MIN_EXP__=(-6142) __DEC128_MIN__=1E-6143DL __DEC128_SUBNORMAL_MIN__=0.000000000000000000000000000000001E-6143DL __DEC32_EPSILON__=1E-6DF __DEC32_MANT_DIG__=7 __DEC32_MAX_EXP__=97 __DEC32_MAX__=9.999999E96DF __DEC32_MIN_EXP__=(-94) __DEC32_MIN__=1E-95DF __DEC32_SUBNORMAL_MIN__=0.000001E-95DF __DEC64_EPSILON__=1E-15DD __DEC64_MANT_DIG__=16 __DEC64_MAX_EXP__=385 __DEC64_MAX__=9.999999999999999E384DD __DEC64_MIN_EXP__=(-382) __DEC64_MIN__=1E-383DD __DEC64_SUBNORMAL_MIN__=0.000000000000001E-383DD __DECIMAL_DIG__=17 __DEC_EVAL_METHOD__=2 __ELF__=1 __FINITE_MATH_ONLY__=0 __FLOAT_WORD_ORDER__=4321 __FLT_DECIMAL_DIG__=9 __FLT_DENORM_MIN__=1.4012984643248171e-45F __FLT_DIG__=6 __FLT_EPSILON__=1.1920928955078125e-7F __FLT_EVAL_METHOD__=0 __FLT_HAS_DENORM__=1 __FLT_HAS_INFINITY__=1 __FLT_HAS_QUIET_NAN__=1 __FLT_MANT_DIG__=24 __FLT_MAX_10_EXP__=38 __FLT_MAX_EXP__=128 __FLT_MAX__=3.4028234663852886e+38F __FLT_MIN_10_EXP__=(-37) __FLT_MIN_EXP__=(-125) __FLT_MIN__=1.1754943508222875e-38F __FLT_RADIX__=2 __FP_FAST_FMA=1 __FP_FAST_FMAF=1 __FP_FAST_FMAL=1 __GCC_ATOMIC_BOOL_LOCK_FREE=2 __GCC_ATOMIC_CHAR16_T_LOCK_FREE=2 __GCC_ATOMIC_CHAR32_T_LOCK_FREE=2 __GCC_ATOMIC_CHAR_LOCK_FREE=2 __GCC_ATOMIC_INT_LOCK_FREE=2 __GCC_ATOMIC_LLONG_LOCK_FREE=2 __GCC_ATOMIC_LONG_LOCK_FREE=2 __GCC_ATOMIC_POINTER_LOCK_FREE=2 __GCC_ATOMIC_SHORT_LOCK_FREE=2 __GCC_ATOMIC_TEST_AND_SET_TRUEVAL=1 __GCC_ATOMIC_WCHAR_T_LOCK_FREE=2 __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1=1 __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2=1 __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4=1 __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8=1 __GLIBC_MINOR__=18 __GLIBC__=2 __GNUC_GNU_INLINE__=1 __GNUC_MINOR__=7 __GNUC_PATCHLEVEL__=3 __GNUC__=4 __GNU_LIBRARY__=6 __GXX_ABI_VERSION=1002 __HAVE_BSWAP__=1 __INT16_C=__INT16_C __INT16_MAX__=32767 __INT16_TYPE__=short\ int __INT32_C=__INT32_C __INT32_MAX__=2147483647 __INT32_TYPE__=int __INT64_C=__INT64_C __INT64_MAX__=9223372036854775807L __INT64_TYPE__=long\ int __INT8_C=__INT8_C __INT8_MAX__=127 __INT8_TYPE__=signed\ char __INTMAX_C=__INTMAX_C __INTMAX_MAX__=9223372036854775807L __INTMAX_TYPE__=long\ int __INTPTR_MAX__=9223372036854775807L __INTPTR_TYPE__=long\ int __INT_FAST16_MAX__=9223372036854775807L __INT_FAST16_TYPE__=long\ int __INT_FAST32_MAX__=9223372036854775807L __INT_FAST32_TYPE__=long\ int __INT_FAST64_MAX__=9223372036854775807L __INT_FAST64_TYPE__=long\ int __INT_FAST8_MAX__=127 __INT_FAST8_TYPE__=signed\ char __INT_LEAST16_MAX__=32767 __INT_LEAST16_TYPE__=short\ int __INT_LEAST32_MAX__=2147483647 __INT_LEAST32_TYPE__=int __INT_LEAST64_MAX__=9223372036854775807L __INT_LEAST64_TYPE__=long\ int __INT_LEAST8_MAX__=127 __INT_LEAST8_TYPE__=signed\ char __INT_MAX__=2147483647 __LDBL_DENORM_MIN__=4.9406564584124654e-324L __LDBL_DIG__=15 __LDBL_EPSILON__=2.2204460492503131e-16L __LDBL_HAS_DENORM__=1 __LDBL_HAS_INFINITY__=1 __LDBL_HAS_QUIET_NAN__=1 __LDBL_MANT_DIG__=53 __LDBL_MAX_10_EXP__=308 __LDBL_MAX_EXP__=1024 __LDBL_MAX__=1.7976931348623157e+308L __LDBL_MIN_10_EXP__=(-307) __LDBL_MIN_EXP__=(-1021) __LDBL_MIN__=2.2250738585072014e-308L __LONG_LONG_MAX__=9223372036854775807LL __LONG_MAX__=9223372036854775807L __LP64__=1 __ORDER_BIG_ENDIAN__=4321 __ORDER_LITTLE_ENDIAN__=1234 __ORDER_PDP_ENDIAN__=3412 __PPC64__=1 __PPC__=1 __PRAGMA_REDEFINE_EXTNAME=1 __PTRDIFF_MAX__=9223372036854775807L __PTRDIFF_TYPE__=long\ int __RECIPF__=1 __REGISTER_PREFIX__= __RSQRTE__=1 __SCHAR_MAX__=127 __SHRT_MAX__=32767 __SIG_ATOMIC_MAX__=2147483647 __SIG_ATOMIC_MIN__=(-2147483647\ -\ 1) __SIG_ATOMIC_TYPE__=int __SIZEOF_DOUBLE__=8 __SIZEOF_FLOAT__=4 __SIZEOF_INT128__=16 __SIZEOF_INT__=4 __SIZEOF_LONG_DOUBLE__=8 __SIZEOF_LONG_LONG__=8 __SIZEOF_LONG__=8 __SIZEOF_POINTER__=8 __SIZEOF_PTRDIFF_T__=8 __SIZEOF_SHORT__=2 __SIZEOF_SIZE_T__=8 __SIZEOF_WCHAR_T__=4 __SIZEOF_WINT_T__=4 __SIZE_MAX__=18446744073709551615UL __SIZE_TYPE__=long\ unsigned\ int __STDC_HOSTED__=1 __STDC__=1 __UINT16_C=__UINT16_C __UINT16_MAX__=65535 __UINT16_TYPE__=short\ unsigned\ int __UINT32_C=__UINT32_C __UINT32_MAX__=4294967295U __UINT32_TYPE__=unsigned\ int __UINT64_C=__UINT64_C __UINT64_MAX__=18446744073709551615UL __UINT64_TYPE__=long\ unsigned\ int __UINT8_C=__UINT8_C __UINT8_MAX__=255 __UINT8_TYPE__=unsigned\ char __UINTMAX_C=__UINTMAX_C __UINTMAX_MAX__=18446744073709551615UL __UINTMAX_TYPE__=long\ unsigned\ int __UINTPTR_MAX__=18446744073709551615UL __UINTPTR_TYPE__=long\ unsigned\ int __UINT_FAST16_MAX__=18446744073709551615UL __UINT_FAST16_TYPE__=long\ unsigned\ int __UINT_FAST32_MAX__=18446744073709551615UL __UINT_FAST32_TYPE__=long\ unsigned\ int __UINT_FAST64_MAX__=18446744073709551615UL __UINT_FAST64_TYPE__=long\ unsigned\ int __UINT_FAST8_MAX__=255 __UINT_FAST8_TYPE__=unsigned\ char __UINT_LEAST16_MAX__=65535 __UINT_LEAST16_TYPE__=short\ unsigned\ int __UINT_LEAST32_MAX__=4294967295U __UINT_LEAST32_TYPE__=unsigned\ int __UINT_LEAST64_MAX__=18446744073709551615UL __UINT_LEAST64_TYPE__=long\ unsigned\ int __UINT_LEAST8_MAX__=255 __UINT_LEAST8_TYPE__=unsigned\ char __USER_LABEL_PREFIX__= __USE_BSD=1 __USE_FILE_OFFSET64=1 __USE_LARGEFILE=1 __USE_MISC=1 __USE_POSIX199309=1 __USE_POSIX199506=1 __USE_POSIX2=1 __USE_POSIX=1 __USE_SVID=1 __VERSION__="4.7.3" __WCHAR_MAX__=2147483647 __WCHAR_MIN__=(-2147483647\ -\ 1) __WCHAR_TYPE__=int __WINT_MAX__=4294967295U __WINT_MIN__=0U __WINT_TYPE__=unsigned\ int __builtin_vsx_vperm=__builtin_vec_perm __builtin_vsx_xvmaddadp=__builtin_vsx_xvmadddp __builtin_vsx_xvmaddasp=__builtin_vsx_xvmaddsp __builtin_vsx_xvmaddmdp=__builtin_vsx_xvmadddp __builtin_vsx_xvmaddmsp=__builtin_vsx_xvmaddsp __builtin_vsx_xvmsubadp=__builtin_vsx_xvmsubdp __builtin_vsx_xvmsubasp=__builtin_vsx_xvmsubsp __builtin_vsx_xvmsubmdp=__builtin_vsx_xvmsubdp __builtin_vsx_xvmsubmsp=__builtin_vsx_xvmsubsp __builtin_vsx_xvnmaddadp=__builtin_vsx_xvnmadddp __builtin_vsx_xvnmaddasp=__builtin_vsx_xvnmaddsp __builtin_vsx_xvnmaddmdp=__builtin_vsx_xvnmadddp __builtin_vsx_xvnmaddmsp=__builtin_vsx_xvnmaddsp __builtin_vsx_xvnmsubadp=__builtin_vsx_xvnmsubdp __builtin_vsx_xvnmsubasp=__builtin_vsx_xvnmsubsp __builtin_vsx_xvnmsubmdp=__builtin_vsx_xvnmsubdp __builtin_vsx_xvnmsubmsp=__builtin_vsx_xvnmsubsp __builtin_vsx_xxland=__builtin_vec_and __builtin_vsx_xxlandc=__builtin_vec_andc __builtin_vsx_xxlnor=__builtin_vec_nor __builtin_vsx_xxlor=__builtin_vec_or __builtin_vsx_xxlxor=__builtin_vec_xor __builtin_vsx_xxsel=__builtin_vec_sel __powerpc64__=1 __powerpc__=1' +crypt_r_proto='0' +cryptlib='' +csh='csh' +ctermid_r_proto='0' +ctime_r_proto='0' +d_Gconvert='gcvt((x),(n),(b))' +d_PRIEUldbl='define' +d_PRIFUldbl='define' +d_PRIGUldbl='define' +d_PRIXU64='define' +d_PRId64='define' +d_PRIeldbl='define' +d_PRIfldbl='define' +d_PRIgldbl='define' +d_PRIi64='define' +d_PRIo64='define' +d_PRIu64='define' +d_PRIx64='define' +d_SCNfldbl='define' +d__fwalk='undef' +d_access='define' +d_accessx='undef' +d_aintl='undef' +d_alarm='define' +d_archlib='define' +d_asctime64='undef' +d_asctime_r='undef' +d_atolf='undef' +d_atoll='define' +d_attribute_deprecated='define' +d_attribute_format='define' +d_attribute_malloc='define' +d_attribute_nonnull='define' +d_attribute_noreturn='define' +d_attribute_pure='define' +d_attribute_unused='define' +d_attribute_warn_unused_result='define' +d_bcmp='define' +d_bcopy='define' +d_bsd='undef' +d_bsdgetpgrp='undef' +d_bsdsetpgrp='undef' +d_builtin_choose_expr='define' +d_builtin_expect='define' +d_bzero='define' +d_c99_variadic_macros='define' +d_casti32='define' +d_castneg='define' +d_charvspr='undef' +d_chown='define' +d_chroot='define' +d_chsize='undef' +d_class='undef' +d_clearenv='define' +d_closedir='define' +d_cmsghdr_s='define' +d_const='define' +d_copysignl='define' +d_cplusplus='undef' +d_crypt='define' +d_crypt_r='undef' +d_csh='undef' +d_ctermid='define' +d_ctermid_r='undef' +d_ctime64='undef' +d_ctime_r='undef' +d_cuserid='define' +d_dbl_dig='define' +d_dbminitproto='undef' +d_difftime64='undef' +d_difftime='define' +d_dir_dd_fd='undef' +d_dirfd='define' +d_dirnamlen='undef' +d_dlerror='define' +d_dlopen='define' +d_dlsymun='undef' +d_dosuid='undef' +d_drand48_r='undef' +d_drand48proto='define' +d_dup2='define' +d_eaccess='define' +d_endgrent='define' +d_endgrent_r='undef' +d_endhent='define' +d_endhostent_r='undef' +d_endnent='define' +d_endnetent_r='undef' +d_endpent='define' +d_endprotoent_r='undef' +d_endpwent='define' +d_endpwent_r='undef' +d_endsent='define' +d_endservent_r='undef' +d_eofnblk='define' +d_eunice='undef' +d_faststdio='define' +d_fchdir='define' +d_fchmod='define' +d_fchown='define' +d_fcntl='define' +d_fcntl_can_lock='undef' +d_fd_macros='define' +d_fd_set='define' +d_fds_bits='undef' +d_fgetpos='define' +d_finite='define' +d_finitel='define' +d_flexfnam='define' +d_flock='define' +d_flockproto='define' +d_fork='define' +d_fp_class='undef' +d_fpathconf='define' +d_fpclass='undef' +d_fpclassify='undef' +d_fpclassl='undef' +d_fpos64_t='undef' +d_frexpl='define' +d_fs_data_s='undef' +d_fseeko='define' +d_fsetpos='define' +d_fstatfs='define' +d_fstatvfs='define' +d_fsync='define' +d_ftello='define' +d_ftime='undef' +d_futimes='define' +d_gdbm_ndbm_h_uses_prototypes='undef' +d_gdbmndbm_h_uses_prototypes='undef' +d_getaddrinfo='define' +d_getcwd='define' +d_getespwnam='undef' +d_getfsstat='undef' +d_getgrent='define' +d_getgrent_r='undef' +d_getgrgid_r='undef' +d_getgrnam_r='undef' +d_getgrps='define' +d_gethbyaddr='define' +d_gethbyname='define' +d_gethent='define' +d_gethname='define' +d_gethostbyaddr_r='undef' +d_gethostbyname_r='undef' +d_gethostent_r='undef' +d_gethostprotos='define' +d_getitimer='define' +d_getlogin='define' +d_getlogin_r='undef' +d_getmnt='undef' +d_getmntent='define' +d_getnameinfo='define' +d_getnbyaddr='define' +d_getnbyname='define' +d_getnent='define' +d_getnetbyaddr_r='undef' +d_getnetbyname_r='undef' +d_getnetent_r='undef' +d_getnetprotos='define' +d_getpagsz='define' +d_getpbyname='define' +d_getpbynumber='define' +d_getpent='define' +d_getpgid='define' +d_getpgrp2='undef' +d_getpgrp='define' +d_getppid='define' +d_getprior='define' +d_getprotobyname_r='undef' +d_getprotobynumber_r='undef' +d_getprotoent_r='undef' +d_getprotoprotos='define' +d_getprpwnam='undef' +d_getpwent='define' +d_getpwent_r='undef' +d_getpwnam_r='undef' +d_getpwuid_r='undef' +d_getsbyname='define' +d_getsbyport='define' +d_getsent='define' +d_getservbyname_r='undef' +d_getservbyport_r='undef' +d_getservent_r='undef' +d_getservprotos='define' +d_getspnam='define' +d_getspnam_r='undef' +d_gettimeod='define' +d_gmtime64='undef' +d_gmtime_r='undef' +d_gnulibc='define' +d_grpasswd='define' +d_hasmntopt='define' +d_htonl='define' +d_ilogbl='define' +d_inc_version_list='undef' +d_index='undef' +d_inetaton='define' +d_inetntop='define' +d_inetpton='define' +d_int64_t='define' +d_ip_mreq='define' +d_ip_mreq_source='define' +d_ipv6_mreq='define' +d_ipv6_mreq_source='undef' +d_isascii='define' +d_isblank='define' +d_isfinite='undef' +d_isinf='define' +d_isnan='define' +d_isnanl='define' +d_killpg='define' +d_lchown='define' +d_ldbl_dig='define' +d_libm_lib_version='define' +d_link='define' +d_localtime64='undef' +d_localtime_r='undef' +d_localtime_r_needs_tzset='undef' +d_locconv='define' +d_lockf='define' +d_longdbl='define' +d_longlong='define' +d_lseekproto='define' +d_lstat='define' +d_madvise='define' +d_malloc_good_size='undef' +d_malloc_size='undef' +d_mblen='define' +d_mbstowcs='define' +d_mbtowc='define' +d_memchr='define' +d_memcmp='define' +d_memcpy='define' +d_memmove='define' +d_memset='define' +d_mkdir='define' +d_mkdtemp='define' +d_mkfifo='define' +d_mkstemp='define' +d_mkstemps='define' +d_mktime64='undef' +d_mktime='define' +d_mmap='define' +d_modfl='define' +d_modfl_pow32_bug='undef' +d_modflproto='define' +d_mprotect='define' +d_msg='define' +d_msg_ctrunc='define' +d_msg_dontroute='define' +d_msg_oob='define' +d_msg_peek='define' +d_msg_proxy='define' +d_msgctl='define' +d_msgget='define' +d_msghdr_s='define' +d_msgrcv='define' +d_msgsnd='define' +d_msync='define' +d_munmap='define' +d_mymalloc='undef' +d_ndbm='undef' +d_ndbm_h_uses_prototypes='undef' +d_nice='define' +d_nl_langinfo='define' +d_nv_preserves_uv='undef' +d_nv_zero_is_allbits_zero='define' +d_off64_t='undef' +d_old_pthread_create_joinable='undef' +d_oldpthreads='undef' +d_oldsock='undef' +d_open3='define' +d_pathconf='define' +d_pause='define' +d_perl_otherlibdirs='undef' +d_phostname='undef' +d_pipe='define' +d_poll='define' +d_portable='define' +d_prctl='define' +d_prctl_set_name='define' +d_printf_format_null='undef' +d_procselfexe='undef' +d_pseudofork='undef' +d_pthread_atfork='undef' +d_pthread_attr_setscope='define' +d_pthread_yield='undef' +d_pwage='undef' +d_pwchange='undef' +d_pwclass='undef' +d_pwcomment='undef' +d_pwexpire='undef' +d_pwgecos='define' +d_pwpasswd='define' +d_pwquota='undef' +d_qgcvt='define' +d_quad='define' +d_random_r='undef' +d_readdir64_r='undef' +d_readdir='define' +d_readdir_r='undef' +d_readlink='define' +d_readv='define' +d_recvmsg='define' +d_rename='define' +d_rewinddir='define' +d_rmdir='define' +d_safebcpy='undef' +d_safemcpy='undef' +d_sanemcmp='define' +d_sbrkproto='define' +d_scalbnl='define' +d_sched_yield='define' +d_scm_rights='define' +d_seekdir='define' +d_select='define' +d_sem='define' +d_semctl='define' +d_semctl_semid_ds='define' +d_semctl_semun='define' +d_semget='define' +d_semop='define' +d_sendmsg='define' +d_setegid='define' +d_seteuid='define' +d_setgrent='define' +d_setgrent_r='undef' +d_setgrps='define' +d_sethent='define' +d_sethostent_r='undef' +d_setitimer='define' +d_setlinebuf='define' +d_setlocale='define' +d_setlocale_r='undef' +d_setnent='define' +d_setnetent_r='undef' +d_setpent='define' +d_setpgid='define' +d_setpgrp2='undef' +d_setpgrp='define' +d_setprior='define' +d_setproctitle='undef' +d_setprotoent_r='undef' +d_setpwent='define' +d_setpwent_r='undef' +d_setregid='define' +d_setresgid='define' +d_setresuid='define' +d_setreuid='define' +d_setrgid='undef' +d_setruid='undef' +d_setsent='define' +d_setservent_r='undef' +d_setsid='define' +d_setvbuf='define' +d_sfio='undef' +d_shm='define' +d_shmat='define' +d_shmatprototype='define' +d_shmctl='define' +d_shmdt='define' +d_shmget='define' +d_sigaction='define' +d_signbit='define' +d_sigprocmask='define' +d_sigsetjmp='define' +d_sin6_scope_id='define' +d_sitearch='define' +d_snprintf='define' +d_sockaddr_in6='define' +d_sockaddr_sa_len='undef' +d_sockatmark='define' +d_sockatmarkproto='define' +d_socket='define' +d_socklen_t='define' +d_sockpair='define' +d_socks5_init='undef' +d_sprintf_returns_strlen='define' +d_sqrtl='define' +d_srand48_r='undef' +d_srandom_r='undef' +d_sresgproto='undef' +d_sresuproto='undef' +d_statblks='define' +d_statfs_f_flags='define' +d_statfs_s='define' +d_static_inline='define' +d_statvfs='define' +d_stdio_cnt_lval='undef' +d_stdio_ptr_lval='define' +d_stdio_ptr_lval_nochange_cnt='undef' +d_stdio_ptr_lval_sets_cnt='define' +d_stdio_stream_array='undef' +d_stdiobase='define' +d_stdstdio='define' +d_strchr='define' +d_strcoll='define' +d_strctcpy='define' +d_strerrm='strerror(e)' +d_strerror='define' +d_strerror_r='undef' +d_strftime='define' +d_strlcat='undef' +d_strlcpy='undef' +d_strtod='define' +d_strtol='define' +d_strtold='define' +d_strtoll='define' +d_strtoq='define' +d_strtoul='define' +d_strtoull='define' +d_strtouq='define' +d_strxfrm='define' +d_suidsafe='undef' +d_symlink='define' +d_syscall='define' +d_syscallproto='define' +d_sysconf='define' +d_sysernlst='' +d_syserrlst='define' +d_system='define' +d_tcgetpgrp='define' +d_tcsetpgrp='define' +d_telldir='define' +d_telldirproto='define' +d_time='define' +d_timegm='define' +d_times='define' +d_tm_tm_gmtoff='define' +d_tm_tm_zone='define' +d_tmpnam_r='undef' +d_truncate='define' +d_ttyname_r='undef' +d_tzname='define' +d_u32align='define' +d_ualarm='define' +d_umask='define' +d_uname='define' +d_union_semun='undef' +d_unordered='undef' +d_unsetenv='define' +d_usleep='define' +d_usleepproto='define' +d_ustat='define' +d_vendorarch='undef' +d_vendorbin='undef' +d_vendorlib='undef' +d_vendorscript='undef' +d_vfork='undef' +d_void_closedir='undef' +d_voidsig='define' +d_voidtty='' +d_volatile='define' +d_vprintf='define' +d_vsnprintf='define' +d_wait4='define' +d_waitpid='define' +d_wcstombs='define' +d_wctomb='define' +d_writev='define' +d_xenix='undef' +date='date' +db_hashtype='u_int32_t' +db_prefixtype='size_t' +db_version_major='' +db_version_minor='' +db_version_patch='' +defvoidused='15' +direntrytype='struct dirent' +dlext='so' +dlsrc='dl_dlopen.xs' +doublesize='8' +drand01='drand48()' +drand48_r_proto='0' +dtrace='' +dynamic_ext='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call Hash/Util Hash/Util/FieldHash I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate Unicode/Normalize XS/APItest XS/Typemap arybase attributes mro re threads threads/shared' +eagain='EAGAIN' +ebcdic='undef' +echo='echo' +egrep='egrep' +emacs='' +endgrent_r_proto='0' +endhostent_r_proto='0' +endnetent_r_proto='0' +endprotoent_r_proto='0' +endpwent_r_proto='0' +endservent_r_proto='0' +eunicefix=':' +exe_ext='' +expr='expr' +extensions='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call Hash/Util Hash/Util/FieldHash I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate Unicode/Normalize XS/APItest XS/Typemap arybase attributes mro re threads threads/shared Archive/Extract Archive/Tar Attribute/Handlers AutoLoader B/Debug B/Deparse B/Lint CGI CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML CPANPLUS CPANPLUS/Dist/Build Carp Config/Perl/V Devel/SelfStubber Digest Dumpvalue Env Errno ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/ParseXS File/CheckTree File/Fetch File/Path File/Temp FileCache Filter/Simple Getopt/Long HTTP/Tiny I18N/Collate I18N/LangTags IO/Compress IO/Zlib IPC/Cmd IPC/Open3 JSON/PP Locale/Codes Locale/Maketext Locale/Maketext/Simple Log/Message Log/Message/Simple Math/BigInt Math/BigRat Math/Complex Memoize Module/Build Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata Module/Pluggable NEXT Net/Ping Object/Accessor Package/Constants Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/LaTeX Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage Safe Search/Dict SelfLoader Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Term/UI Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Memoize Tie/RefHash Time/Local XSLoader autodie autouse base bignum constant encoding/warnings if lib libnet parent perlfaq podlators' +extern_C='extern' +extras='' +fflushNULL='define' +fflushall='undef' +find='' +firstmakefile='makefile' +flex='' +fpossize='16' +fpostype='fpos_t' +freetype='void' +from=':' +full_ar='%%AR%%' +full_csh='csh' +full_sed='/bin/sed' +gccansipedantic='' +gccosandvers='' +gccversion='4.7.3' +getgrent_r_proto='0' +getgrgid_r_proto='0' +getgrnam_r_proto='0' +gethostbyaddr_r_proto='0' +gethostbyname_r_proto='0' +gethostent_r_proto='0' +getlogin_r_proto='0' +getnetbyaddr_r_proto='0' +getnetbyname_r_proto='0' +getnetent_r_proto='0' +getprotobyname_r_proto='0' +getprotobynumber_r_proto='0' +getprotoent_r_proto='0' +getpwent_r_proto='0' +getpwnam_r_proto='0' +getpwuid_r_proto='0' +getservbyname_r_proto='0' +getservbyport_r_proto='0' +getservent_r_proto='0' +getspnam_r_proto='0' +gidformat='"u"' +gidsign='1' +gidsize='4' +gidtype='gid_t' +glibpth='/usr/shlib /lib /usr/lib /usr/lib/386 /lib/386 /usr/ccs/lib /usr/ucblib /usr/local/lib /lib64 /usr/lib64 /usr/local/lib64 ' +gmake='gmake' +gmtime_r_proto='0' +gnulibc_version='2.18' +grep='grep' +groupcat='cat /etc/group' +groupstype='gid_t' +gzip='gzip' +h_fcntl='false' +h_sysfile='true' +hint='recommended' +hostcat='cat /etc/hosts' +html1dir=' ' +html1direxp='' +html3dir=' ' +html3direxp='' +i16size='2' +i16type='short' +i32size='4' +i32type='int' +i64size='8' +i64type='long' +i8size='1' +i8type='signed char' +i_arpainet='define' +i_assert='define' +i_bsdioctl='' +i_crypt='define' +i_db='undef' +i_dbm='undef' +i_dirent='define' +i_dld='undef' +i_dlfcn='define' +i_fcntl='undef' +i_float='define' +i_fp='undef' +i_fp_class='undef' +i_gdbm='undef' +i_gdbm_ndbm='undef' +i_gdbmndbm='undef' +i_grp='define' +i_ieeefp='undef' +i_inttypes='define' +i_langinfo='define' +i_libutil='undef' +i_limits='define' +i_locale='define' +i_machcthr='undef' +i_malloc='define' +i_mallocmalloc='undef' +i_math='define' +i_memory='undef' +i_mntent='define' +i_ndbm='undef' +i_netdb='define' +i_neterrno='undef' +i_netinettcp='define' +i_niin='define' +i_poll='define' +i_prot='undef' +i_pthread='define' +i_pwd='define' +i_rpcsvcdbm='undef' +i_sfio='undef' +i_sgtty='undef' +i_shadow='define' +i_socks='undef' +i_stdarg='define' +i_stdbool='define' +i_stddef='define' +i_stdlib='define' +i_string='define' +i_sunmath='undef' +i_sysaccess='undef' +i_sysdir='define' +i_sysfile='define' +i_sysfilio='undef' +i_sysin='undef' +i_sysioctl='define' +i_syslog='define' +i_sysmman='define' +i_sysmode='undef' +i_sysmount='define' +i_sysndir='undef' +i_sysparam='define' +i_syspoll='define' +i_sysresrc='define' +i_syssecrt='undef' +i_sysselct='define' +i_syssockio='undef' +i_sysstat='define' +i_sysstatfs='define' +i_sysstatvfs='define' +i_systime='define' +i_systimek='undef' +i_systimes='define' +i_systypes='define' +i_sysuio='define' +i_sysun='define' +i_sysutsname='define' +i_sysvfs='define' +i_syswait='define' +i_termio='undef' +i_termios='define' +i_time='define' +i_unistd='define' +i_ustat='define' +i_utime='define' +i_values='define' +i_varargs='undef' +i_varhdr='stdarg.h' +i_vfork='undef' +ignore_versioned_solibs='y' +inc_version_list=' ' +inc_version_list_init='0' +incpath='' +inews='' +initialinstalllocation='/usr/bin' +installarchlib='/usr/lib/perl5/5.18.1/ppc64-linux' +installbin='/usr/bin' +installhtml1dir='' +installhtml3dir='' +installman1dir='' +installman3dir='' +installprefix='/usr' +installprefixexp='/usr' +installprivlib='/usr/lib/perl5/5.18.1' +installscript='/usr/bin' +installsitearch='/usr/lib/perl5/site_perl/5.18.1/ppc64-linux' +installsitebin='/usr/bin' +installsitehtml1dir='' +installsitehtml3dir='' +installsitelib='/usr/lib/perl5/site_perl/5.18.1' +installsiteman1dir='' +installsiteman3dir='' +installsitescript='/usr/bin' +installstyle='lib/perl5' +installusrbinperl='undef' +installvendorarch='' +installvendorbin='' +installvendorhtml1dir='' +installvendorhtml3dir='' +installvendorlib='' +installvendorman1dir='' +installvendorman3dir='' +installvendorscript='' +intsize='4' +issymlink='test -h' +ivdformat='"ld"' +ivsize='8' +ivtype='long' +known_extensions='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call GDBM_File Hash/Util Hash/Util/FieldHash I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc NDBM_File ODBM_File Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate Unicode/Normalize VMS/DCLsym VMS/Stdio Win32 Win32API/File Win32CORE XS/APItest XS/Typemap arybase attributes mro re threads threads/shared ' +ksh='' +ld='%%LD%%' +ld_can_script='define' +lddlflags='-shared %%LDFLAGS%%' +ldflags=' %%LDFLAGS%%' +ldflags_uselargefiles='' +ldlibpthname='LD_LIBRARY_PATH' +less='less' +lib_ext='.a' +libc='' +libperl='libperl.a' +libpth='%%LIBDIRS%%' +libs='-lnsl -ldl -lm -lcrypt -lutil -lc' +libsdirs='%%LIBDIRS%%' +libsfiles=' libnsl.so libdl.so libm.so libcrypt.so libutil.so libc.so' +#libsfound=' /lib/../lib64/libnsl.so /lib/../lib64/libdl.so /lib/../lib64/libm.so /lib/../lib64/libcrypt.so /lib/../lib64/libutil.so /usr/lib/../lib64/libc.so' +libspath='%%LIBDIRS%%' +libswanted='sfio socket inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun m crypt sec util c cposix posix ucb BSD gdbm_compat' +libswanted_uselargefiles='' +line='' +lint='' +lkflags='' +ln='ln' +lns='/bin/ln -s' +localtime_r_proto='0' +locincpth='/usr/local/include /opt/local/include /usr/gnu/include /opt/gnu/include /usr/GNU/include /opt/GNU/include' +loclibpth='/usr/local/lib /opt/local/lib /usr/gnu/lib /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib' +longdblsize='8' +longlongsize='8' +longsize='8' +lp='' +lpr='' +ls='ls' +lseeksize='8' +lseektype='off_t' +mad='undef' +madlyh='' +madlyobj='' +madlysrc='' +mail='' +mailx='' +make='make' +make_set_make='#' +mallocobj='' +mallocsrc='' +malloctype='void *' +man1dir=' ' +man1direxp='' +man1ext='0' +man3dir=' ' +man3direxp='' +man3ext='0' +mips_type='' +mistrustnm='' +mkdir='mkdir' +mmaptype='void *' +modetype='mode_t' +more='more' +multiarch='undef' +mv='' +myarchname='ppc64-linux' +mydomain='.nonet' +myhostname='openadk' +myuname='linux openadk 3.12.6 #1 sat jan 18 22:32:32 cet 2014 ppc64 gnulinux ' +n='-n' +need_va_copy='undef' +netdb_hlen_type='size_t' +netdb_host_type='char *' +netdb_name_type='const char *' +netdb_net_type='in_addr_t' +nm='nm' +nm_opt='' +nm_so_opt='--dynamic' +nonxs_ext='Archive/Extract Archive/Tar Attribute/Handlers AutoLoader B/Debug B/Deparse B/Lint CGI CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML CPANPLUS CPANPLUS/Dist/Build Carp Config/Perl/V Devel/SelfStubber Digest Dumpvalue Env Errno ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/ParseXS File/CheckTree File/Fetch File/Path File/Temp FileCache Filter/Simple Getopt/Long HTTP/Tiny I18N/Collate I18N/LangTags IO/Compress IO/Zlib IPC/Cmd IPC/Open3 JSON/PP Locale/Codes Locale/Maketext Locale/Maketext/Simple Log/Message Log/Message/Simple Math/BigInt Math/BigRat Math/Complex Memoize Module/Build Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata Module/Pluggable NEXT Net/Ping Object/Accessor Package/Constants Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/LaTeX Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage Safe Search/Dict SelfLoader Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Term/UI Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Memoize Tie/RefHash Time/Local XSLoader autodie autouse base bignum constant encoding/warnings if lib libnet parent perlfaq podlators' +nroff='nroff' +nvEUformat='"E"' +nvFUformat='"F"' +nvGUformat='"G"' +nv_overflows_integers_at='256.0*256.0*256.0*256.0*256.0*256.0*2.0*2.0*2.0*2.0*2.0' +nv_preserves_uv_bits='53' +nveformat='"e"' +nvfformat='"f"' +nvgformat='"g"' +nvsize='8' +nvtype='double' +o_nonblock='O_NONBLOCK' +obj_ext='.o' +old_pthread_create_joinable='' +optimize='-O1' +orderlib='false' +osname='linux' +osvers='3.12.6' +otherlibdirs=' ' +package='perl5' +pager='/usr/bin/less -R' +passcat='cat /etc/passwd' +patchlevel='18' +path_sep=':' +perl5='' +perl='perl' +perl_patchlevel='' +perl_static_inline='static __inline__' +perladmin='root@openadk.nonet' +perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc' +perlpath='/usr/bin/perl' +pg='pg' +phostname='hostname' +pidtype='pid_t' +plibpth='/lib/ppc64-openadk-linux-gnu/4.7.3 /lib/powerpc64-linux-gnu /lib/../lib64 /usr/lib/ppc64-openadk-linux-gnu/4.7.3 /usr/lib/powerpc64-linux-gnu /usr/lib/../lib64 /lib /usr/lib' +pmake='' +pr='' +prefix='/usr' +prefixexp='/usr' +privlib='/usr/lib/perl5/5.18.1' +privlibexp='/usr/lib/perl5/5.18.1' +procselfexe='' +prototype='define' +ptrsize='8' +quadkind='2' +quadtype='long' +randbits='48' +randfunc='drand48' +random_r_proto='0' +randseedtype='long' +ranlib=':' +rd_nodata='-1' +readdir64_r_proto='0' +readdir_r_proto='0' +revision='5' +rm='rm' +rm_try='/bin/rm -f try try a.out .out try.[cho] try..o core core.try* try.core*' +rmail='' +run='' +runnm='false' +sGMTIME_max='67768036191676799' +sGMTIME_min='-62167219200' +sLOCALTIME_max='67768036191673199' +sLOCALTIME_min='-62167222408' +sPRIEUldbl='"E"' +sPRIFUldbl='"F"' +sPRIGUldbl='"G"' +sPRIXU64='"lX"' +sPRId64='"ld"' +sPRIeldbl='"e"' +sPRIfldbl='"f"' +sPRIgldbl='"g"' +sPRIi64='"li"' +sPRIo64='"lo"' +sPRIu64='"lu"' +sPRIx64='"lx"' +sSCNfldbl='"f"' +sched_yield='sched_yield()' +scriptdir='/usr/bin' +scriptdirexp='/usr/bin' +sed='sed' +seedfunc='srand48' +selectminbits='64' +selecttype='fd_set *' +sendmail='' +setgrent_r_proto='0' +sethostent_r_proto='0' +setlocale_r_proto='0' +setnetent_r_proto='0' +setprotoent_r_proto='0' +setpwent_r_proto='0' +setservent_r_proto='0' +sh='/bin/sh' +shar='' +sharpbang='#!' +shmattype='void *' +shortsize='2' +shrpenv='' +shsharp='true' +sig_count='65' +sig_name='ZERO HUP INT QUIT ILL TRAP ABRT BUS FPE KILL USR1 SEGV USR2 PIPE ALRM TERM STKFLT CHLD CONT STOP TSTP TTIN TTOU URG XCPU XFSZ VTALRM PROF WINCH IO PWR SYS NUM32 NUM33 RTMIN NUM35 NUM36 NUM37 NUM38 NUM39 NUM40 NUM41 NUM42 NUM43 NUM44 NUM45 NUM46 NUM47 NUM48 NUM49 NUM50 NUM51 NUM52 NUM53 NUM54 NUM55 NUM56 NUM57 NUM58 NUM59 NUM60 NUM61 NUM62 NUM63 RTMAX IOT CLD POLL UNUSED ' +sig_name_init='"ZERO", "HUP", "INT", "QUIT", "ILL", "TRAP", "ABRT", "BUS", "FPE", "KILL", "USR1", "SEGV", "USR2", "PIPE", "ALRM", "TERM", "STKFLT", "CHLD", "CONT", "STOP", "TSTP", "TTIN", "TTOU", "URG", "XCPU", "XFSZ", "VTALRM", "PROF", "WINCH", "IO", "PWR", "SYS", "NUM32", "NUM33", "RTMIN", "NUM35", "NUM36", "NUM37", "NUM38", "NUM39", "NUM40", "NUM41", "NUM42", "NUM43", "NUM44", "NUM45", "NUM46", "NUM47", "NUM48", "NUM49", "NUM50", "NUM51", "NUM52", "NUM53", "NUM54", "NUM55", "NUM56", "NUM57", "NUM58", "NUM59", "NUM60", "NUM61", "NUM62", "NUM63", "RTMAX", "IOT", "CLD", "POLL", "UNUSED", 0' +sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 6 17 29 31 ' +sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 6, 17, 29, 31, 0' +sig_size='69' +signal_t='void' +sitearch='/usr/lib/perl5/site_perl/5.18.1/ppc64-linux' +sitearchexp='/usr/lib/perl5/site_perl/5.18.1/ppc64-linux' +sitebin='/usr/bin' +sitebinexp='/usr/bin' +sitehtml1dir='' +sitehtml1direxp='' +sitehtml3dir='' +sitehtml3direxp='' +sitelib='/usr/lib/perl5/site_perl/5.18.1' +sitelib_stem='/usr/lib/perl5/site_perl' +sitelibexp='/usr/lib/perl5/site_perl/5.18.1' +siteman1dir='' +siteman1direxp='' +siteman3dir='' +siteman3direxp='' +siteprefix='/usr' +siteprefixexp='/usr' +sitescript='/usr/bin' +sitescriptexp='/usr/bin' +sizesize='8' +sizetype='size_t' +sleep='' +smail='' +so='so' +sockethdr='' +socketlib='' +socksizetype='socklen_t' +sort='sort' +spackage='Perl5' +spitshell='cat' +srand48_r_proto='0' +srandom_r_proto='0' +src='.' +ssizetype='ssize_t' +st_ino_sign='1' +st_ino_size='8' +startperl='#!/usr/bin/perl' +startsh='#!/bin/sh' +static_ext=' ' +stdchar='char' +stdio_base='((fp)->_IO_read_base)' +stdio_bufsiz='((fp)->_IO_read_end - (fp)->_IO_read_base)' +stdio_cnt='((fp)->_IO_read_end - (fp)->_IO_read_ptr)' +stdio_filbuf='' +stdio_ptr='((fp)->_IO_read_ptr)' +stdio_stream_array='' +strerror_r_proto='0' +strings='/usr/include/string.h' +submit='' +subversion='1' +sysman='/usr/man/man1' +tail='' +tar='' +targetarch='' +tbl='' +tee='' +test='test' +timeincl='/usr/include/sys/time.h /usr/include/time.h ' +timetype='time_t' +tmpnam_r_proto='0' +to=':' +touch='touch' +tr='tr' +trnl='\n' +troff='' +ttyname_r_proto='0' +u16size='2' +u16type='unsigned short' +u32size='4' +u32type='unsigned int' +u64size='8' +u64type='unsigned long' +u8size='1' +u8type='unsigned char' +uidformat='"u"' +uidsign='1' +uidsize='4' +uidtype='uid_t' +uname='uname' +uniq='uniq' +uquadtype='unsigned long' +use5005threads='undef' +use64bitall='define' +use64bitint='define' +usecrosscompile='undef' +usedevel='undef' +usedl='define' +usedtrace='undef' +usefaststdio='undef' +useithreads='undef' +usekernprocpathname='undef' +uselargefiles='define' +uselongdouble='undef' +usemallocwrap='define' +usemorebits='undef' +usemultiplicity='undef' +usemymalloc='n' +usenm='false' +usensgetexecutablepath='undef' +useopcode='true' +useperlio='define' +useposix='true' +usereentrant='undef' +userelocatableinc='undef' +usesfio='false' +useshrplib='false' +usesitecustomize='undef' +usesocks='undef' +usethreads='undef' +usevendorprefix='undef' +useversionedarchname='undef' +usevfork='false' +usrinc='%%INCDIRS%%' +uuname='' +uvXUformat='"lX"' +uvoformat='"lo"' +uvsize='8' +uvtype='unsigned long' +uvuformat='"lu"' +uvxformat='"lx"' +vaproto='define' +vendorarch='' +vendorarchexp='' +vendorbin='' +vendorbinexp='' +vendorhtml1dir=' ' +vendorhtml1direxp='' +vendorhtml3dir=' ' +vendorhtml3direxp='' +vendorlib='' +vendorlib_stem='' +vendorlibexp='' +vendorman1dir=' ' +vendorman1direxp='' +vendorman3dir=' ' +vendorman3direxp='' +vendorprefix='' +vendorprefixexp='' +vendorscript='' +vendorscriptexp='' +version='5.18.1' +version_patchlevel_string='version 18 subversion 1' +versiononly='undef' +vi='' +voidflags='15' +xlibpth='/usr/lib/386 /lib/386' +yacc='yacc' +yaccflags='' +zcat='' +zip='zip' +PERL_REVISION=5 +PERL_VERSION=18 +PERL_SUBVERSION=1 +PERL_API_REVISION=5 +PERL_API_VERSION=18 +PERL_API_SUBVERSION=0 +PERL_PATCHLEVEL='' +PERL_CONFIG_SH=true +: Variables propagated from previous config.sh file. +libdb_needs_pthread='N' diff --git a/package/pulseaudio/Makefile b/package/pulseaudio/Makefile new file mode 100644 index 000000000..f1cf961e1 --- /dev/null +++ b/package/pulseaudio/Makefile @@ -0,0 +1,74 @@ +# 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:= pulseaudio +PKG_VERSION:= 4.0 +PKG_RELEASE:= 5 +PKG_MD5SUM:= 591f211db2790a7e4d222f2dc6858db3 +PKG_DESCR:= a sound system for POSIX OSes +PKG_SECTION:= multimedia +PKG_DEPENDS:= libltdl json-c libsndfile libspeex libncurses +PKG_DEPENDS+= libflac libvorbis libogg libuuid libsndfile +PKG_DEPENDS+= libgcc libpthread librt alsa-lib libsamplerate +PKG_BUILDDEP:= libtool json-c libsndfile speex libsamplerate +PKG_BUILDDEP+= flac libvorbis libogg util-linux ncurses alsa-lib +PKG_URL:= http://www.freedesktop.org/wiki/Software/PulseAudio/ +PKG_SITES:= http://freedesktop.org/software/pulseaudio/releases/ +PKG_OPTS:= dev + +PKG_LIBC_DEPENDS:= uclibc eglibc glibc + +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,PULSEAUDIO,pulseaudio,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) + +TARGET_CPPFLAGS+= -D_GNU_SOURCE -D_POSIX_SOURCE +CONFIGURE_ARGS+= --disable-systemd \ + --disable-manpages \ + --disable-neon-opt \ + --disable-x11 \ + --disable-avahi \ + --disable-lirc \ + --disable-openssl \ + --disable-orc \ + --disable-tcpwrap \ + --disable-oss-output \ + --disable-oss-wrapper \ + --disable-esound \ + --disable-jack \ + --disable-gconf \ + --disable-udev \ + --disable-dbus \ + --disable-hal-compat \ + --enable-samplerate \ + --enable-alsa \ + --with-speex \ + --with-access-group=audio + +pulseaudio-install: + $(INSTALL_DIR) $(IDIR_PULSEAUDIO)/etc/pulse + $(CP) ./files/*.{conf,pa} \ + $(IDIR_PULSEAUDIO)/etc/pulse + $(INSTALL_DIR) $(IDIR_PULSEAUDIO)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/* \ + $(IDIR_PULSEAUDIO)/usr/bin + $(INSTALL_DIR) $(IDIR_PULSEAUDIO)/usr/lib + $(CP) $(WRKINST)/usr/lib/libpulse*.so* \ + $(IDIR_PULSEAUDIO)/usr/lib + $(INSTALL_DIR) $(IDIR_PULSEAUDIO)/usr/lib/pulseaudio + $(CP) $(WRKINST)/usr/lib/pulseaudio/libpulse*.so* \ + $(IDIR_PULSEAUDIO)/usr/lib/pulseaudio + $(INSTALL_DIR) $(IDIR_PULSEAUDIO)/usr/lib/pulse-$(PKG_VERSION)/modules + $(CP) $(WRKINST)/usr/lib/pulse-$(PKG_VERSION)/modules/*.so \ + $(IDIR_PULSEAUDIO)/usr/lib/pulse-$(PKG_VERSION)/modules + # pa uses $HOME from root user otherwise + mv $(IDIR_PULSEAUDIO)/usr/bin/pacmd $(IDIR_PULSEAUDIO)/usr/bin/pacmd.bin + echo "#!/bin/sh" > $(IDIR_PULSEAUDIO)/usr/bin/pacmd + echo 'PULSE_RUNTIME_PATH=/var/run/pulse pacmd.bin "$$@"' >> $(IDIR_PULSEAUDIO)/usr/bin/pacmd + chmod 755 $(IDIR_PULSEAUDIO)/usr/bin/pacmd + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/pulseaudio/files/client.conf b/package/pulseaudio/files/client.conf new file mode 100644 index 000000000..8e4fa9f29 --- /dev/null +++ b/package/pulseaudio/files/client.conf @@ -0,0 +1,2 @@ +autospawn = no +cookie-file = /var/run/pulse/cookie diff --git a/package/pulseaudio/files/daemon.conf b/package/pulseaudio/files/daemon.conf new file mode 100644 index 000000000..760e5299f --- /dev/null +++ b/package/pulseaudio/files/daemon.conf @@ -0,0 +1,22 @@ +daemonize = no +allow-module-loading = no +allow-exit = no +use-pid-file = yes +high-priority = yes +nice-level = -11 +fail = yes +system-instance = yes +enable-shm = no +realtime-scheduling = yes +realtime-priority = 9 +resample-method = src-sinc-fastest +exit-idle-time = -1 +load-default-script-file = yes +default-script-file = /etc/pulse/system.pa +log-target = stderr +log-level = 1 +log-time = yes +default-sample-rate = 44100 +resample-method = src-sinc-fastest +default-fragments = 10 +default-fragment-size-msec = 10 diff --git a/package/pulseaudio/files/pulseaudio.init b/package/pulseaudio/files/pulseaudio.init new file mode 100644 index 000000000..584a42350 --- /dev/null +++ b/package/pulseaudio/files/pulseaudio.init @@ -0,0 +1,36 @@ +#!/bin/sh +#PKG pulseaudio +#INIT 60 +. /etc/rc.conf + +case $1 in +autostop) ;; +autostart) + test x"${pulseaudio:-NO}" = x"NO" && exit 0 + exec sh $0 start + ;; +start) + # check group membership + id pulse | grep audio >/dev/null 2>&1 + if [ $? -ne 0 ];then + echo "pulse user must be in group audio." + exit 1 + fi + if [ ! -d /var/run/pulse ]; then + mkdir -p /var/run/pulse/ && chown -R pulse.pulse /var/run/pulse && chmod 750 /var/run/pulse + fi + chown pulse /etc/pulse + env PULSE_STATE_PATH=/etc/pulse/state /usr/bin/pulseaudio $pulseaudio_flags + ;; +stop) + kill $(pgrep -f /usr/bin/pulseaudio) + ;; +restart) + sh $0 stop + sh $0 start + ;; +*) + echo "usage: $0 {start | stop | restart}" + exit 1 +esac +exit $? diff --git a/package/pulseaudio/files/pulseaudio.postinst b/package/pulseaudio/files/pulseaudio.postinst new file mode 100644 index 000000000..e1ef8dfd1 --- /dev/null +++ b/package/pulseaudio/files/pulseaudio.postinst @@ -0,0 +1,7 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf pulseaudio pulseaudio NO +gid=$(get_next_gid) +add_user pulse $(get_next_uid) $gid /var/run/pulse +add_group pulse $gid +add_rcconf pulseaudio_flags pulseaudio_flags "-D --log-target=syslog" diff --git a/package/pulseaudio/files/system.pa b/package/pulseaudio/files/system.pa new file mode 100644 index 000000000..693db412b --- /dev/null +++ b/package/pulseaudio/files/system.pa @@ -0,0 +1,45 @@ +#!/usr/bin/pulseaudio -nF + +load-module module-native-protocol-unix + +### Automatically restore the volume of streams and devices +load-module module-stream-restore +load-module module-device-restore + +### Automatically restore the default sink/source when changed by the user +### during runtime +### NOTE: This should be loaded as early as possible so that subsequent modules +### that look up the default sink/source get the right value +load-module module-default-device-restore + +### Automatically move streams to the default sink if the sink they are +### connected to dies, similar for sources +load-module module-rescue-streams + +### Make sure we always have a sink around, even if it is a null sink. +load-module module-always-sink + +### Enable positioned event sounds +load-module module-position-event-sounds + +# pacmd communication +load-module module-cli-protocol-unix socket=/var/run/pulse/cli + +# configure as a rtp sender +#load-module module-null-sink sink_name=rtp format=s16be channels=2 +#load-module module-rtp-send source=rtp.monitor destination=224.0.0.56 + +# configure as a rtp receiver and sender +#load-module module-null-sink sink_name=rtp format=s16be channels=2 +#load-module module-rtp-send source=rtp.monitor destination=224.0.0.56 loop=1 +#load-module module-alsa-sink device=hw:0,0 sink_name=alsa +#load-module module-rtp-recv sap_address=224.0.0.56 sink=alsa + +# configure combine-sink (echo in the same room) +#load-module module-alsa-sink device=hw:0,0 sink_name=alsa +#load-module module-combine-sink slaves=rtp,alsa + +# configure as a rtp receiver +load-module module-rtp-recv sap_address=224.0.0.56 +load-module module-alsa-sink device=hw:0,0 + diff --git a/package/pulseaudio/patches/patch-src_pulsecore_native-common_h b/package/pulseaudio/patches/patch-src_pulsecore_native-common_h new file mode 100644 index 000000000..9502a370e --- /dev/null +++ b/package/pulseaudio/patches/patch-src_pulsecore_native-common_h @@ -0,0 +1,11 @@ +--- pulseaudio-4.0.orig/src/pulsecore/native-common.h 2012-09-26 13:27:01.000000000 +0200 ++++ pulseaudio-4.0/src/pulsecore/native-common.h 2014-01-21 12:19:09.178012326 +0100 +@@ -180,7 +180,7 @@ enum { + }; + + #define PA_NATIVE_COOKIE_LENGTH 256 +-#define PA_NATIVE_COOKIE_FILE ".config/pulse/cookie" ++#define PA_NATIVE_COOKIE_FILE "cookie" + #define PA_NATIVE_COOKIE_FILE_FALLBACK ".pulse-cookie" + + #define PA_NATIVE_DEFAULT_PORT 4713 diff --git a/package/qingy/Makefile b/package/qingy/Makefile index 381d252d8..4e095f2b2 100644 --- a/package/qingy/Makefile +++ b/package/qingy/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= qingy PKG_VERSION:= 1.0.0 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 1e0912655e240adfd0ce5ced30bbc685 PKG_DESCR:= a DirectFB getty replacement PKG_SECTION:= misc diff --git a/package/qingy/patches/patch-src_libraries_misc_h b/package/qingy/patches/patch-src_libraries_misc_h new file mode 100644 index 000000000..22ee9c890 --- /dev/null +++ b/package/qingy/patches/patch-src_libraries_misc_h @@ -0,0 +1,10 @@ +--- qingy-1.0.0.orig/src/libraries/misc.h 2008-11-27 10:29:01.000000000 +0100 ++++ qingy-1.0.0/src/libraries/misc.h 2014-01-20 07:38:44.000000000 +0100 +@@ -29,6 +29,7 @@ + #include <config.h> + #endif + ++#include <time.h> + #include "qingy_constants.h" + + /* Computes the integer part of the base 10 log */ diff --git a/package/qingy/patches/patch-src_libraries_vt_c b/package/qingy/patches/patch-src_libraries_vt_c new file mode 100644 index 000000000..84a9842a8 --- /dev/null +++ b/package/qingy/patches/patch-src_libraries_vt_c @@ -0,0 +1,39 @@ +--- qingy-1.0.0.orig/src/libraries/vt.c 2008-11-25 12:21:28.000000000 +0100 ++++ qingy-1.0.0/src/libraries/vt.c 2014-01-20 07:53:43.000000000 +0100 +@@ -98,14 +98,15 @@ static int getfd() + int switch_to_tty(int tty) + { + char *ttyname = create_tty_name(tty); ++ FILE *_stdin, *_stdout, *_stderr; + + if (!ttyname) return 0; + /* we set stdin, stdout and stderr to the new tty */ +- stdin = freopen(ttyname, "r", stdin); +- stdout = freopen(ttyname, "w", stdout); +- stderr = freopen(ttyname, "w", stderr); ++ _stdin = freopen(ttyname, "r", stdin); ++ _stdout = freopen(ttyname, "w", stdout); ++ _stderr = freopen(ttyname, "w", stderr); + free(ttyname); +- if (!stdin || !stdout || !stderr) return 0; ++ if (!_stdin || !_stdout || !_stderr) return 0; + + return 1; + } +@@ -197,6 +198,7 @@ void stderr_disable(void) + void stderr_enable(int *vt) + { + char *ttyname; ++ FILE *_stderr; + + if (!vt) + ttyname = create_tty_name(get_active_tty()); +@@ -205,7 +207,7 @@ void stderr_enable(int *vt) + + if (!ttyname) return; + +- stderr = fopen(ttyname, "w"); ++ _stderr = freopen(ttyname, "w", stderr); + free(ttyname); + } + diff --git a/package/recordproto/Makefile b/package/recordproto/Makefile index e9d7f6894..52f517715 100644 --- a/package/recordproto/Makefile +++ b/package/recordproto/Makefile @@ -8,12 +8,18 @@ PKG_VERSION:= 1.14.2 PKG_RELEASE:= 1 PKG_DESCR:= RECORD extension headers PKG_SECTION:= devel +PKG_BUILDDEP:= recordproto-host PKG_MD5SUM:= 868235e1e150e68916d5a316ebc4ccc4 PKG_SITES:= ${MASTER_SITE_XORG} PKG_OPTS:= dev devonly +include $(TOPDIR)/mk/host.mk include $(TOPDIR)/mk/package.mk +$(eval $(call HOST_template,RECORDPROTO,recordproto,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,RECORDPROTO,recordproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +HOST_STYLE:= auto + +include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/sdl-image/Makefile b/package/sdl-image/Makefile index 14fa39434..b2546aac9 100644 --- a/package/sdl-image/Makefile +++ b/package/sdl-image/Makefile @@ -26,6 +26,10 @@ include $(TOPDIR)/mk/package.mk $(eval $(call HOST_template,LIBSDL_IMAGE,libsdl-image,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,LIBSDL_IMAGE,libsdl-image,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +ifeq ($(ADK_HOST_DARWIN),y) +LDFLAGS_FOR_BUILD+= -framework Cocoa +endif + HOST_STYLE:= auto CONFIGURE_ARGS+= --enable-png \ --enable-jpg \ diff --git a/package/sdl/Makefile b/package/sdl/Makefile index ec5e394d0..bf6f4d06d 100644 --- a/package/sdl/Makefile +++ b/package/sdl/Makefile @@ -31,7 +31,15 @@ $(eval $(call HOST_template,LIBSDL,libsdl,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,LIBSDL,libsdl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) HOST_STYLE:= auto -HOST_CONFIGURE_ARGS+= --without-x +HOST_CONFIGURE_ARGS+= --without-x \ + --disable-cdrom \ + --disable-joystick \ + --disable-audio \ + --disable-video \ + --disable-assembly \ + --disable-shared \ + --disable-video-cocoa \ + --disable-video-opengl ifeq ($(ADK_PACKAGE_SDL_WITH_TSLIB),y) CONFIGURE_ARGS+= --enable-input-tslib diff --git a/package/speex/Makefile b/package/speex/Makefile index bacc1919e..986e12f3f 100644 --- a/package/speex/Makefile +++ b/package/speex/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= speex PKG_VERSION:= 1.2rc1 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= c4438b22c08e5811ff10e2b06ee9b9ae PKG_DESCR:= an open source patent-free speech compression codec PKG_SECTION:= libs @@ -26,6 +26,6 @@ XAKE_FLAGS+= bin_PROGRAMS="" libspeex-install: ${INSTALL_DIR} ${IDIR_LIBSPEEX}/usr/lib - ${CP} ${WRKINST}/usr/lib/libspeex.so* ${IDIR_LIBSPEEX}/usr/lib/ + ${CP} ${WRKINST}/usr/lib/libspeex*.so* ${IDIR_LIBSPEEX}/usr/lib/ include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/squeezelite/Makefile b/package/squeezelite/Makefile new file mode 100644 index 000000000..f200cfee4 --- /dev/null +++ b/package/squeezelite/Makefile @@ -0,0 +1,33 @@ +# 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:= squeezelite +PKG_VERSION:= 1.5 +PKG_RELEASE:= 2 +PKG_MD5SUM:= 7605af4d64291495645f88575a564475 +PKG_DESCR:= headless squeezebox emulator +PKG_SECTION:= multimedia +PKG_DEPENDS:= libflac alsa-lib libvorbis libmad +PKG_DEPENDS+= libpthread librt libfaad2 +PKG_BUILDDEP:= alsa-lib libmad flac libvorbis mpg123 +PKG_BUILDDEP+= faad2 +PKG_URL:= http://code.google.com/p/squeezelite/ +PKG_SITES:= http://openadk.org/distfiles/ + +PKG_LIBC_DEPENDS:= eglibc glibc musl + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,SQUEEZELITE,squeezelite,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIG_STYLE:= manual +INSTALL_STYLE:= manual + +squeezelite-install: + $(INSTALL_DIR) $(IDIR_SQUEEZELITE)/usr/bin + $(INSTALL_BIN) $(WRKBUILD)/squeezelite \ + $(IDIR_SQUEEZELITE)/usr/bin + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/squeezelite/files/squeezelite.init b/package/squeezelite/files/squeezelite.init new file mode 100644 index 000000000..933b81ab5 --- /dev/null +++ b/package/squeezelite/files/squeezelite.init @@ -0,0 +1,26 @@ +#!/bin/sh +#PKG squeezelite +#INIT 60 +. /etc/rc.conf + +case $1 in +autostop) ;; +autostart) + test x"${squeezelite:-NO}" = x"NO" && exit 0 + exec sh $0 start + ;; +start) + /usr/bin/squeezelite $squeezelite_flags + ;; +stop) + kill $(pgrep -f /usr/bin/squeezelite) + ;; +restart) + sh $0 stop + sh $0 start + ;; +*) + echo "usage: $0 {start | stop | restart}" + exit 1 +esac +exit $? diff --git a/package/squeezelite/files/squeezelite.postinst b/package/squeezelite/files/squeezelite.postinst new file mode 100644 index 000000000..e5d9c91ee --- /dev/null +++ b/package/squeezelite/files/squeezelite.postinst @@ -0,0 +1,4 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf squeezelite squeezelite NO +add_rcconf squeezelite_flags squeezelite_flags "-z -a 160:5:0:0 -s 10.0.0.1" diff --git a/package/squeezelite/patches/patch-Makefile b/package/squeezelite/patches/patch-Makefile new file mode 100644 index 000000000..388c8ab31 --- /dev/null +++ b/package/squeezelite/patches/patch-Makefile @@ -0,0 +1,11 @@ +--- squeezelite-1.5.orig/Makefile 2014-01-24 11:24:16.000000000 +0100 ++++ squeezelite-1.5/Makefile 2014-01-24 17:37:36.841831508 +0100 +@@ -1,6 +1,7 @@ + # Cross compile support - create a Makefile which defines these three variables and then includes this Makefile... + CFLAGS ?= -Wall -fPIC -O2 $(OPTS) +-LDFLAGS ?= -lasound -lpthread -lm -lrt ++LDFLAGS ?= ++LDFLAGS += -lasound -lpthread -lm -lrt + EXECUTABLE ?= squeezelite + + # passing one or more of these in $(OPTS) enables optional feature inclusion diff --git a/package/tcl/Makefile b/package/tcl/Makefile index f45317d8f..df231ffdc 100644 --- a/package/tcl/Makefile +++ b/package/tcl/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= tcl PKG_VERSION:= 8.5.9 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 8512d8db3233041dd68a81476906012a PKG_DESCR:= TCL scripting language PKG_SECTION:= lang diff --git a/package/tcl/patches/patch-generic_tcl_h b/package/tcl/patches/patch-generic_tcl_h new file mode 100644 index 000000000..6263ba8f1 --- /dev/null +++ b/package/tcl/patches/patch-generic_tcl_h @@ -0,0 +1,11 @@ +--- tcl8.5.9.orig/generic/tcl.h 2010-08-04 19:02:39.000000000 +0200 ++++ tcl8.5.9/generic/tcl.h 2014-01-20 11:18:37.000000000 +0100 +@@ -19,6 +19,8 @@ + #ifndef _TCL + #define _TCL + ++#include <sys/stat.h> ++ + /* + * For C++ compilers, use extern "C" + */ diff --git a/package/tcl/patches/patch-unix_Makefile_in b/package/tcl/patches/patch-unix_Makefile_in index 7c4a9ca93..38340c80b 100644 --- a/package/tcl/patches/patch-unix_Makefile_in +++ b/package/tcl/patches/patch-unix_Makefile_in @@ -1,5 +1,5 @@ ---- tcl8.5.8.orig/unix/Makefile.in 2009-11-13 19:38:45.000000000 +0100 -+++ tcl8.5.8/unix/Makefile.in 2009-11-20 21:59:51.000000000 +0100 +--- tcl8.5.9.orig/unix/Makefile.in 2010-09-08 19:40:48.000000000 +0200 ++++ tcl8.5.9/unix/Makefile.in 2014-01-20 11:13:05.000000000 +0100 @@ -101,7 +101,8 @@ CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@ #CFLAGS = $(CFLAGS_DEBUG) #CFLAGS = $(CFLAGS_OPTIMIZE) @@ -10,7 +10,7 @@ # Flags to pass to the linker LDFLAGS_DEBUG = @LDFLAGS_DEBUG@ -@@ -745,7 +746,7 @@ install-binaries: binaries +@@ -737,7 +738,7 @@ install-binaries: binaries fi @EXTRA_INSTALL_BINARIES@ diff --git a/package/tcl/patches/patch-unix_configure b/package/tcl/patches/patch-unix_configure index 393c2b45e..380b8d591 100644 --- a/package/tcl/patches/patch-unix_configure +++ b/package/tcl/patches/patch-unix_configure @@ -1,6 +1,6 @@ ---- tcl8.5.8.orig/unix/configure 2009-11-13 19:38:45.000000000 +0100 -+++ tcl8.5.8/unix/configure 2011-01-13 16:22:59.000000000 +0100 -@@ -7968,9 +7968,6 @@ fi +--- tcl8.5.9.orig/unix/configure 2010-09-08 19:40:48.000000000 +0200 ++++ tcl8.5.9/unix/configure 2014-01-20 11:13:05.000000000 +0100 +@@ -7983,9 +7983,6 @@ fi LD_SEARCH_FLAGS="" LD_LIBRARY_PATH_VAR="DYLD_LIBRARY_PATH" @@ -10,7 +10,7 @@ PLAT_OBJS='${MAC_OSX_OBJS}' PLAT_SRCS='${MAC_OSX_SRCS}' -@@ -17646,11 +17643,6 @@ _ACEOF +@@ -17578,11 +17575,6 @@ _ACEOF cat >>confdefs.h <<\_ACEOF @@ -22,7 +22,7 @@ #define TCL_WIDE_CLICKS 1 _ACEOF -@@ -18817,7 +18809,7 @@ HTML_DIR='$(DISTDIR)/html' +@@ -18749,7 +18741,7 @@ HTML_DIR='$(DISTDIR)/html' # AIX remembers this path and will attempt to use it at run-time to look # up the Tcl library. diff --git a/package/xbmc/patches/001-simplepm.patch b/package/xbmc/patches/001-simplepm.patch deleted file mode 100644 index 41ded94fa..000000000 --- a/package/xbmc/patches/001-simplepm.patch +++ /dev/null @@ -1,144 +0,0 @@ -diff -Nur xbmc-12.3-Frodo.orig/xbmc/powermanagement/linux/LinuxPowerSyscall.cpp xbmc-12.3-Frodo/xbmc/powermanagement/linux/LinuxPowerSyscall.cpp ---- xbmc-12.3-Frodo.orig/xbmc/powermanagement/linux/LinuxPowerSyscall.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ xbmc-12.3-Frodo/xbmc/powermanagement/linux/LinuxPowerSyscall.cpp 2014-01-10 16:23:32.238217592 +0100 -@@ -0,0 +1,55 @@ -+/* -+ * Copyright (C) 2014 Team XBMC -+ * http://www.xbmc.org -+ * -+ * This Program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2, or (at your option) -+ * any later version. -+ * -+ * This Program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with XBMC; see the file COPYING. If not, see -+ * <http://www.gnu.org/licenses/>. -+ * -+ */ -+ -+#if defined (_LINUX) -+ -+#include <stdlib.h> -+#include "LinuxPowerSyscall.h" -+#include "utils/log.h" -+ -+CLinuxPowerSyscall::CLinuxPowerSyscall() -+{ -+ CLog::Log(LOGINFO, "Selected LinuxPower as PowerSyscall"); -+} -+ -+CLinuxPowerSyscall::~CLinuxPowerSyscall() -+{ } -+ -+bool CLinuxPowerSyscall::Powerdown() -+{ -+ system("/sbin/poweroff -F"); -+ return 0; -+} -+ -+bool CLinuxPowerSyscall::Reboot() -+{ -+ system("/sbin/reboot -F"); -+ return 0; -+} -+ -+int CLinuxPowerSyscall::BatteryLevel(void) -+{ } -+ -+bool CLinuxPowerSyscall::PumpPowerEvents(IPowerEventsCallback *callback) -+{ -+ return true; -+} -+ -+#endif -diff -Nur xbmc-12.3-Frodo.orig/xbmc/powermanagement/linux/LinuxPowerSyscall.h xbmc-12.3-Frodo/xbmc/powermanagement/linux/LinuxPowerSyscall.h ---- xbmc-12.3-Frodo.orig/xbmc/powermanagement/linux/LinuxPowerSyscall.h 1970-01-01 01:00:00.000000000 +0100 -+++ xbmc-12.3-Frodo/xbmc/powermanagement/linux/LinuxPowerSyscall.h 2014-01-10 14:57:23.365205874 +0100 -@@ -0,0 +1,44 @@ -+#pragma once -+/* -+ * Copyright (C) 2014 Team XBMC -+ * http://www.xbmc.org -+ * -+ * This Program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2, or (at your option) -+ * any later version. -+ * -+ * This Program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with XBMC; see the file COPYING. If not, see -+ * <http://www.gnu.org/licenses/>. -+ * -+ */ -+ -+#if defined (_LINUX) -+#include "powermanagement/IPowerSyscall.h" -+ -+class CLinuxPowerSyscall : public CPowerSyscallWithoutEvents -+{ -+public: -+ CLinuxPowerSyscall(); -+ ~CLinuxPowerSyscall(); -+ -+ virtual bool Powerdown(); -+ virtual bool Suspend(void) { return false; } -+ virtual bool Hibernate(void) { return false; } -+ virtual bool Reboot(); -+ -+ virtual bool CanPowerdown(void) { return true; } -+ virtual bool CanSuspend(void) { return false; } -+ virtual bool CanHibernate(void) { return false; } -+ virtual bool CanReboot(void) { return true; } -+ virtual int BatteryLevel(void); -+ -+ virtual bool PumpPowerEvents(IPowerEventsCallback *callback); -+}; -+#endif -diff -Nur xbmc-12.3-Frodo.orig/xbmc/powermanagement/linux/Makefile xbmc-12.3-Frodo/xbmc/powermanagement/linux/Makefile ---- xbmc-12.3-Frodo.orig/xbmc/powermanagement/linux/Makefile 2013-12-12 22:47:49.000000000 +0100 -+++ xbmc-12.3-Frodo/xbmc/powermanagement/linux/Makefile 2014-01-10 14:27:13.411383558 +0100 -@@ -2,7 +2,8 @@ - ConsoleUPowerSyscall.cpp \ - HALPowerSyscall.cpp \ - UPowerSyscall.cpp \ -- SystemdUPowerSyscall.cpp -+ SystemdUPowerSyscall.cpp \ -+ LinuxPowerSyscall.cpp - - LIB=powermanagement_linux.a - -diff -Nur xbmc-12.3-Frodo.orig/xbmc/powermanagement/PowerManager.cpp xbmc-12.3-Frodo/xbmc/powermanagement/PowerManager.cpp ---- xbmc-12.3-Frodo.orig/xbmc/powermanagement/PowerManager.cpp 2013-12-12 22:47:49.000000000 +0100 -+++ xbmc-12.3-Frodo/xbmc/powermanagement/PowerManager.cpp 2014-01-14 11:19:11.558337441 +0100 -@@ -46,6 +46,9 @@ - #include "linux/ConsoleDeviceKitPowerSyscall.h" - #include "linux/SystemdUPowerSyscall.h" - #include "linux/UPowerSyscall.h" -+#ifdef HAS_SIMPLEPM -+#include "linux/LinuxPowerSyscall.h" -+#endif - #ifdef HAS_HAL - #include "linux/HALPowerSyscall.h" - #endif -@@ -83,6 +86,10 @@ - m_instance = new CSystemdUPowerSyscall(); - else if (CUPowerSyscall::HasUPower()) - m_instance = new CUPowerSyscall(); -+#ifdef HAS_SIMPLEPM -+ else -+ m_instance = new CLinuxPowerSyscall(); -+#endif - #ifdef HAS_HAL - else - m_instance = new CHALPowerSyscall(); diff --git a/package/xbmc/patches/002-defaultsutf8.patch b/package/xbmc/patches/002-defaultsutf8.patch deleted file mode 100644 index 466dc83bb..000000000 --- a/package/xbmc/patches/002-defaultsutf8.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -Nur xbmc-12.3-Frodo.orig/language/English/langinfo.xml xbmc-12.3-Frodo/language/English/langinfo.xml ---- xbmc-12.3-Frodo.orig/language/English/langinfo.xml 2013-12-12 22:47:49.000000000 +0100 -+++ xbmc-12.3-Frodo/language/English/langinfo.xml 2014-01-14 19:34:44.869490320 +0100 -@@ -48,8 +48,8 @@ - - <language locale="en"> - <charsets> -- <gui>CP1252</gui> -- <subtitle>CP1252</subtitle> -+ <gui>UTF-8</gui> -+ <subtitle>UTF-8</subtitle> - </charsets> - - <dvd> -diff -Nur "xbmc-12.3-Frodo.orig/language/English (US)/langinfo.xml" "xbmc-12.3-Frodo/language/English (US)/langinfo.xml" ---- "xbmc-12.3-Frodo.orig/language/English (US)/langinfo.xml" 2013-12-12 22:47:49.000000000 +0100 -+++ "xbmc-12.3-Frodo/language/English (US)/langinfo.xml" 2014-01-14 19:35:02.117560629 +0100 -@@ -48,8 +48,8 @@ - - <language locale="en"> - <charsets> -- <gui>CP1252</gui> -- <subtitle>CP1252</subtitle> -+ <gui>UTF-8</gui> -+ <subtitle>UTF-8</subtitle> - </charsets> - - <dvd> -diff -Nur xbmc-12.3-Frodo.orig/language/German/langinfo.xml xbmc-12.3-Frodo/language/German/langinfo.xml ---- xbmc-12.3-Frodo.orig/language/German/langinfo.xml 2013-12-12 22:47:49.000000000 +0100 -+++ xbmc-12.3-Frodo/language/German/langinfo.xml 2014-01-14 19:34:20.997392956 +0100 -@@ -2,8 +2,8 @@ - <language locale="de"> - - <charsets> -- <gui unicodefont="false">CP1252</gui> -- <subtitle>CP1252</subtitle> -+ <gui unicodefont="false">UTF-8</gui> -+ <subtitle>UTF-8</subtitle> - </charsets> - - <dvd> diff --git a/package/xbmc/patches/patch-language_English_langinfo_xml b/package/xbmc/patches/patch-language_English_langinfo_xml new file mode 100644 index 000000000..9e88d77c4 --- /dev/null +++ b/package/xbmc/patches/patch-language_English_langinfo_xml @@ -0,0 +1,13 @@ +--- xbmc-12.3-Frodo.orig/language/English/langinfo.xml 2013-12-12 22:47:49.000000000 +0100 ++++ xbmc-12.3-Frodo/language/English/langinfo.xml 2014-01-29 07:59:05.000000000 +0100 +@@ -48,8 +48,8 @@ + + <language locale="en"> + <charsets> +- <gui>CP1252</gui> +- <subtitle>CP1252</subtitle> ++ <gui>UTF-8</gui> ++ <subtitle>UTF-8</subtitle> + </charsets> + + <dvd> diff --git a/package/xbmc/patches/patch-language_German_langinfo_xml b/package/xbmc/patches/patch-language_German_langinfo_xml new file mode 100644 index 000000000..4c97f914b --- /dev/null +++ b/package/xbmc/patches/patch-language_German_langinfo_xml @@ -0,0 +1,13 @@ +--- xbmc-12.3-Frodo.orig/language/German/langinfo.xml 2013-12-12 22:47:49.000000000 +0100 ++++ xbmc-12.3-Frodo/language/German/langinfo.xml 2014-01-29 07:59:05.000000000 +0100 +@@ -2,8 +2,8 @@ + <language locale="de"> + + <charsets> +- <gui unicodefont="false">CP1252</gui> +- <subtitle>CP1252</subtitle> ++ <gui unicodefont="false">UTF-8</gui> ++ <subtitle>UTF-8</subtitle> + </charsets> + + <dvd> diff --git a/package/xbmc/patches/patch-m4_ax_python_devel_m4 b/package/xbmc/patches/patch-m4_ax_python_devel_m4 index c54320c0e..cdc234436 100644 --- a/package/xbmc/patches/patch-m4_ax_python_devel_m4 +++ b/package/xbmc/patches/patch-m4_ax_python_devel_m4 @@ -1,5 +1,5 @@ ---- xbmc-12.2.orig/m4/ax_python_devel.m4 2013-05-03 07:57:40.000000000 +0200 -+++ xbmc-12.2/m4/ax_python_devel.m4 2013-12-03 09:41:55.000000000 +0100 +--- xbmc-12.3-Frodo.orig/m4/ax_python_devel.m4 2013-12-12 22:47:49.000000000 +0100 ++++ xbmc-12.3-Frodo/m4/ax_python_devel.m4 2014-01-27 18:51:28.000000000 +0100 @@ -151,10 +151,9 @@ $ac_distutils_result]) # AC_MSG_CHECKING([for Python include path]) @@ -13,3 +13,21 @@ fi PYTHON_CPPFLAGS=$python_path fi +@@ -267,17 +266,6 @@ EOD` + AC_MSG_RESULT([$PYTHON_SITE_PKG]) + AC_SUBST([PYTHON_SITE_PKG]) + +- # +- # libraries which must be linked in when embedding +- # +- AC_MSG_CHECKING(python extra libraries) +- if test -z "$PYTHON_EXTRA_LIBS"; then +- PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \ +- conf = distutils.sysconfig.get_config_var; \ +- print (conf('LOCALMODLIBS') + ' ' + conf('LIBS'))"` +- fi +- AC_MSG_RESULT([$PYTHON_EXTRA_LIBS]) +- AC_SUBST(PYTHON_EXTRA_LIBS) + + # + # linking flags needed when embedding diff --git a/package/xbmc/patches/patch-xbmc_powermanagement_PowerManager_cpp b/package/xbmc/patches/patch-xbmc_powermanagement_PowerManager_cpp new file mode 100644 index 000000000..0959e9c4e --- /dev/null +++ b/package/xbmc/patches/patch-xbmc_powermanagement_PowerManager_cpp @@ -0,0 +1,23 @@ +--- xbmc-12.3-Frodo.orig/xbmc/powermanagement/PowerManager.cpp 2013-12-12 22:47:49.000000000 +0100 ++++ xbmc-12.3-Frodo/xbmc/powermanagement/PowerManager.cpp 2014-01-29 07:59:01.000000000 +0100 +@@ -46,6 +46,9 @@ + #include "linux/ConsoleDeviceKitPowerSyscall.h" + #include "linux/SystemdUPowerSyscall.h" + #include "linux/UPowerSyscall.h" ++#ifdef HAS_SIMPLEPM ++#include "linux/LinuxPowerSyscall.h" ++#endif + #ifdef HAS_HAL + #include "linux/HALPowerSyscall.h" + #endif +@@ -83,6 +86,10 @@ void CPowerManager::Initialize() + m_instance = new CSystemdUPowerSyscall(); + else if (CUPowerSyscall::HasUPower()) + m_instance = new CUPowerSyscall(); ++#ifdef HAS_SIMPLEPM ++ else ++ m_instance = new CLinuxPowerSyscall(); ++#endif + #ifdef HAS_HAL + else + m_instance = new CHALPowerSyscall(); diff --git a/package/xbmc/patches/patch-xbmc_powermanagement_linux_Makefile b/package/xbmc/patches/patch-xbmc_powermanagement_linux_Makefile new file mode 100644 index 000000000..fefd93909 --- /dev/null +++ b/package/xbmc/patches/patch-xbmc_powermanagement_linux_Makefile @@ -0,0 +1,12 @@ +--- xbmc-12.3-Frodo.orig/xbmc/powermanagement/linux/Makefile 2013-12-12 22:47:49.000000000 +0100 ++++ xbmc-12.3-Frodo/xbmc/powermanagement/linux/Makefile 2014-01-29 07:59:01.000000000 +0100 +@@ -2,7 +2,8 @@ SRCS=ConsoleDeviceKitPowerSyscall.cpp \ + ConsoleUPowerSyscall.cpp \ + HALPowerSyscall.cpp \ + UPowerSyscall.cpp \ +- SystemdUPowerSyscall.cpp ++ SystemdUPowerSyscall.cpp \ ++ LinuxPowerSyscall.cpp + + LIB=powermanagement_linux.a + diff --git a/package/xcb-proto/Makefile b/package/xcb-proto/Makefile index 26561b546..eca8ab4f5 100644 --- a/package/xcb-proto/Makefile +++ b/package/xcb-proto/Makefile @@ -9,26 +9,29 @@ PKG_RELEASE:= 1 PKG_DESCR:= XML-XCB protocol descriptions PKG_SECTION:= devel PKG_MD5SUM:= 8d2cdb770129cef563088a90c5bec768 -PKG_BUILDDEP:= autotool bzip2-host python2-host +PKG_BUILDDEP:= autotool bzip2-host python2-host xcb-proto-host PKG_SITES:= http://xcb.freedesktop.org/dist/ PKG_OPTS:= dev devonly PKG_SUBPKGS:= XCB_PROTO XCB_PYTHON PKGSC_XCB_PYTHON:= x11/misc +include $(TOPDIR)/mk/host.mk include $(TOPDIR)/mk/package.mk +$(eval $(call HOST_template,XCB_PROTO,xcb-proto,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,XCB_PROTO,xcb-proto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) $(eval $(call PKG_template,XCB_PYTHON,xcb-python,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_XCB_PYTHON})) include $(TOPDIR)/mk/python.mk +HOST_STYLE:= auto CONFIGURE_ENV+= PYTHON=$(PYTHON) CONFIGURE_ARGS+= --datadir=${STAGING_DIR}/usr/share post-build: - ${INSTALL_DIR} ${STAGING_DIR}/usr/share/xcb - ${CP} ${WRKBUILD}/src/*.xml ${STAGING_DIR}/usr/share/xcb + ${INSTALL_DIR} ${STAGING_TARGET_DIR}/usr/share/xcb + ${CP} ${WRKBUILD}/src/*.xml ${STAGING_TARGET_DIR}/usr/share/xcb xcb-python-install: $(INSTALL_DIR) ${STAGING_DIR}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen @@ -38,4 +41,5 @@ xcb-python-install: ${CP} ${WRKINST}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen/*.py \ ${IDIR_XCB_PYTHON}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen +include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/xextproto/Makefile b/package/xextproto/Makefile index 22173200d..1c70d3956 100644 --- a/package/xextproto/Makefile +++ b/package/xextproto/Makefile @@ -8,12 +8,18 @@ PKG_VERSION:= 7.2.1 PKG_RELEASE:= 1 PKG_DESCR:= X Protocol Extensions headers PKG_SECTION:= devel +PKG_BUILDDEP:= xextproto-host PKG_MD5SUM:= 9062d689f422fad1b8774c967d730f09 PKG_SITES:= ${MASTER_SITE_XORG} PKG_OPTS:= dev devonly +include $(TOPDIR)/mk/host.mk include $(TOPDIR)/mk/package.mk +$(eval $(call HOST_template,XEXTPROTO,xextproto,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,XEXTPROTO,xextproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +HOST_STYLE:= auto + +include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/xineramaproto/Makefile b/package/xineramaproto/Makefile index 6454275b9..206da8936 100644 --- a/package/xineramaproto/Makefile +++ b/package/xineramaproto/Makefile @@ -8,12 +8,18 @@ PKG_VERSION:= 1.2.1 PKG_RELEASE:= 1 PKG_DESCR:= Xinerama Extension headers PKG_SECTION:= devel +PKG_BUILDDEP:= xineramaproto-host PKG_MD5SUM:= e0e148b11739e144a546b8a051b17dde PKG_SITES:= ${MASTER_SITE_XORG} PKG_OPTS:= dev devonly +include $(TOPDIR)/mk/host.mk include $(TOPDIR)/mk/package.mk +$(eval $(call HOST_template,XINERAMAPROTO,xineramaproto,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,XINERAMAPROTO,xineramaproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +HOST_STYLE:= auto + +include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/xtrans/Makefile b/package/xtrans/Makefile index c19ad33b2..fbbd16857 100644 --- a/package/xtrans/Makefile +++ b/package/xtrans/Makefile @@ -8,14 +8,20 @@ PKG_VERSION:= 1.2.6 PKG_RELEASE:= 1 PKG_DESCR:= X11 network protocol transport library PKG_SECTION:= devel +PKG_BUILDDEP:= xtrans-host PKG_MD5SUM:= b91dd22b77a350d129a81175cd8c58cc PKG_SITES:= ${MASTER_SITE_XORG} PKG_OPTS:= dev devonly +include $(TOPDIR)/mk/host.mk include $(TOPDIR)/mk/package.mk +$(eval $(call HOST_template,XTRANS,xtrans,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,XTRANS,xtrans,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +HOST_STYLE:= auto +HOST_CONFIGURE_ARGS+= --datadir=$(STAGING_HOST_DIR)/usr/lib CONFIGURE_ARGS+= --datadir=/usr/lib +include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/scripts/find b/scripts/find deleted file mode 100755 index 439ec0b3f..000000000 --- a/scripts/find +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -find=$(which find) -os=$(uname) -case $os in - Darwin) - /opt/local/libexec/gnubin/find "$@" - ;; - *) - /usr/bin/find "$@" - ;; -esac diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh index c94d01138..79d416569 100644 --- a/scripts/scan-pkgs.sh +++ b/scripts/scan-pkgs.sh @@ -61,21 +61,6 @@ if [[ -n $ADK_NATIVE ]];then fi fi -if [[ -n $ADK_COMPILE_OPENJDK ]]; then - NEED_GXX="$NEED_GXX openjdk" - NEED_XSLTPROC="$NEED_XSLTPROC openjdk" -fi - -if [[ -n $ADK_COMPILE_OPENJDK ]]; then - cd ${TOPDIR}/jtools; bash prereq.sh - [ $? -ne 0 ] && out=1 -fi - -if [[ -n $ADK_COMPILE_OPENJDK7 ]]; then - cd ${TOPDIR}/jtools; bash prereq.sh - [ $? -ne 0 ] && out=1 -fi - if [[ -n $ADK_PACKAGE_XKEYBOARD_CONFIG ]]; then NEED_XKBCOMP="$NEED_XKBCOMP xkeyboard-config" fi diff --git a/target/arm/kernel/raspberry-pi b/target/arm/kernel/raspberry-pi new file mode 100644 index 000000000..2a1450ca3 --- /dev/null +++ b/target/arm/kernel/raspberry-pi @@ -0,0 +1,17 @@ +CONFIG_ARM=y +CONFIG_FIQ=y +CONFIG_ARM_PATCH_PHYS_VIRT=y +CONFIG_KUSER_HELPERS=y +CONFIG_PREEMPT=y +CONFIG_TREE_PREEMPT_RCU=y +CONFIG_PREEMPT_RCU=y +CONFIG_ARCH_BCM2708=y +CONFIG_MACH_BCM2708=y +CONFIG_BCM2708_GPIO=y +CONFIG_BCM2708_VCMEM=y +CONFIG_BCM2708_DMAER=y +CONFIG_AEABI=y +CONFIG_VFP=y +CONFIG_DTC=y +CONFIG_OF=y +CONFIG_BCM2708_VCHIQ=y diff --git a/target/arm/sys-available/raspberry-pi b/target/arm/sys-available/raspberry-pi index 3fa60178e..9fd1c1b2a 100644 --- a/target/arm/sys-available/raspberry-pi +++ b/target/arm/sys-available/raspberry-pi @@ -3,10 +3,6 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI select ADK_arm select ADK_little select ADK_raspberry_pi - select ADK_KERNEL_ARCH_BCM2708 - select ADK_KERNEL_AEABI - select ADK_KERNEL_PREEMPT - select ADK_KERNEL_VFP select ADK_EABIHF select ADK_CPU_RASPBERRY_PI select ADK_TARGET_WITH_MMC @@ -15,6 +11,7 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI select ADK_TARGET_WITH_INPUT select ADK_PACKAGE_BCM2835_FIRMWARE select ADK_TARGET_KERNEL_ZIMAGE + select ADK_USE_KERNEL_MINICONFIG help Raspberry PI diff --git a/target/config/Config.in b/target/config/Config.in index 970bd8516..2b9d0f396 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -162,6 +162,7 @@ config ADK_TARGET_KERNEL_MINICONFIG default "qemu-ppc64" if ADK_TARGET_SYSTEM_QEMU_PPC64 default "qemu-sparc" if ADK_TARGET_SYSTEM_QEMU_SPARC default "qemu-i686" if ADK_TARGET_SYSTEM_QEMU_I686 + default "raspberry-pi" if ADK_TARGET_SYSTEM_RASPBERRY_PI choice prompt "Qemu MICROBLAZE Emulation" diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio index dbe14cf3b..dc2ff100f 100644 --- a/target/linux/config/Config.in.audio +++ b/target/linux/config/Config.in.audio @@ -4,6 +4,9 @@ depends on ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_USB || ADK_TARGET_WITH_SOUND config ADK_KERNEL_SND_ARM boolean +config ADK_KERNEL_SND_USB + boolean + config ADK_KERNEL_SND_SOC boolean diff --git a/target/linux/config/Config.in.cpu b/target/linux/config/Config.in.cpu index 17e82c3c3..678cb5696 100644 --- a/target/linux/config/Config.in.cpu +++ b/target/linux/config/Config.in.cpu @@ -36,3 +36,63 @@ config ADK_KERNEL_USE_GENERIC_SMP_HELPERS config ADK_KERNEL_VFP boolean +menu "CPU support" + +config ADK_KERNEL_CPU_FREQ + boolean + default n + +config ADK_KERNEL_CPU_FREQ_GOV_PERFORMANCE + boolean + default n + +config ADK_KERNEL_CPU_FREQ_GOV_POWERSAVE + boolean + default n + +config ADK_KERNEL_CPU_FREQ_GOV_USERSPACE + boolean + default n + +config ADK_KERNEL_CPU_FREQ_GOV_ONDEMAND + boolean + default n + +config ADK_KERNEL_CPU_FREQ_GOV_CONSERVATIVE + boolean + default n + +config ADK_KERNEL_ARM_BCM2835_CPUFREQ + prompt "CPU frequency support" + boolean + select ADK_KERNEL_CPU_FREQ + default y if ADK_TARGET_SYSTEM_RASPBERRY_PI + +choice +prompt "Governor" +depends on ADK_KERNEL_ARM_BCM2835_CPUFREQ + +config ADK_KERNEL_CPU_FREQ_DEFAULT_GOV_ONDEMAND + boolean "ondemand" + select ADK_KERNEL_CPU_FREQ_GOV_ONDEMAND + +config ADK_KERNEL_CPU_FREQ_DEFAULT_GOV_PERFORMANCE + boolean "performance" + select ADK_KERNEL_CPU_FREQ_GOV_PERFORMANCE + +config ADK_KERNEL_CPU_FREQ_DEFAULT_GOV_POWERSAVE + boolean "powersave" + select ADK_KERNEL_CPU_FREQ_GOV_POWERSAVE + +config ADK_KERNEL_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE + boolean "conservative" + select ADK_KERNEL_CPU_FREQ_GOV_CONSERVATIVE + +config ADK_KERNEL_CPU_FREQ_DEFAULT_GOV_USERSPACE + boolean "userspace" + select ADK_KERNEL_CPU_FREQ_GOV_USERSPACE + +endchoice + +endmenu + diff --git a/target/linux/config/Config.in.fsnet b/target/linux/config/Config.in.fsnet index c22ae210c..8c3ae5372 100644 --- a/target/linux/config/Config.in.fsnet +++ b/target/linux/config/Config.in.fsnet @@ -1,3 +1,6 @@ +config ADK_KERNEL_FILE_LOCKING + boolean + config ADK_KERNEL_FS_POSIX_ACL boolean default y @@ -62,6 +65,7 @@ config ADK_KPACKAGE_KMOD_NFS_FS default n select ADK_KERNEL_NFS_V3 select ADK_KERNEL_NFS_V4 + select ADK_KERNEL_FILE_LOCKING select ADK_KERNEL_DNOTIFY select ADK_KPACKAGE_KMOD_SUNRPC select ADK_KPACKAGE_KMOD_LOCKD @@ -110,13 +114,14 @@ config ADK_KERNEL_NFSD_V4 default n config ADK_KPACKAGE_KMOD_NFSD - prompt "kmod-fs-nfsd...................... NFS server support (includes V3 support)" + prompt "kmod-nfsd......................... NFS server support" tristate default n select ADK_KERNEL_EXPORTFS select ADK_KERNEL_NFSD_V3 select ADK_KERNEL_NFSD_V4 select ADK_KERNEL_DNOTIFY + select ADK_KERNEL_FILE_LOCKING select ADK_KPACKAGE_KMOD_SUNRPC select ADK_KPACKAGE_KMOD_SUNRPC_GSS select ADK_KPACKAGE_KMOD_LOCKD diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice index d7d7ae013..9ee0511fc 100644 --- a/target/linux/config/Config.in.netdevice +++ b/target/linux/config/Config.in.netdevice @@ -291,8 +291,12 @@ config ADK_KPACKAGE_KMOD_R8169 endmenu +config ADK_KERNEL_WLAN + boolean + config ADK_KERNEL_WIRELESS select ADK_KERNEL_NETDEVICES + select ADK_KERNEL_WLAN boolean config ADK_KERNEL_WIRELESS_EXT diff --git a/target/linux/config/Config.in.systems b/target/linux/config/Config.in.systems index aa707cd91..9609cf5b2 100644 --- a/target/linux/config/Config.in.systems +++ b/target/linux/config/Config.in.systems @@ -60,9 +60,6 @@ config ADK_KERNEL_ARCH_AT91SAM9260 config ADK_KERNEL_MACH_ACMENETUSFOXG20 boolean -config ADK_KERNEL_ARCH_BCM2708 - boolean - config ADK_KERNEL_BCM47XX_SSB boolean diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb index 53413abde..e1fd3c0c3 100644 --- a/target/linux/config/Config.in.usb +++ b/target/linux/config/Config.in.usb @@ -1,7 +1,11 @@ menu "USB support" depends on ADK_TARGET_WITH_USB +config ADK_KERNEL_USB_SUPPORT + boolean + config ADK_KERNEL_USB + select ADK_KERNEL_USB_SUPPORT boolean config ADK_KERNEL_USB_LIBUSUAL @@ -29,6 +33,7 @@ config ADK_KPACKAGE_KMOD_USB prompt "kmod-usb......................... USB support" tristate select ADK_KERNEL_NLS + select ADK_KERNEL_USB_SUPPORT depends on !ADK_KERNEL_USB default y if ADK_TARGET_SYSTEM_QEMU_I686 default y if ADK_TARGET_SYSTEM_QEMU_SH4 @@ -44,7 +49,6 @@ config ADK_KPACKAGE_KMOD_USB default y if ADK_NATIVE_SYSTEM_INTEL_ATOM default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default y if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 - default y if ADK_TARGET_SYSTEM_RASPBERRY_PI default n help Universal Serial Bus (USB) is a specification for a serial bus @@ -335,6 +339,7 @@ config ADK_KPACKAGE_KMOD_SND_USB_AUDIO prompt "kmod-snd-usb-audio................ USB sound adapter" tristate default n + select ADK_KERNEL_SND_USB select ADK_KPACKAGE_KMOD_SND select ADK_KPACKAGE_KMOD_SND_RAWMIDI depends on ADK_PACKAGE_KMOD_USB_CONTROLLER diff --git a/target/linux/kernel.config b/target/linux/kernel.config index 8bf3aafe6..97237b382 100644 --- a/target/linux/kernel.config +++ b/target/linux/kernel.config @@ -13,6 +13,8 @@ CONFIG_XFRM=y CONFIG_INET=y CONFIG_PROC_FS=y CONFIG_PROC_SYSCTL=y +CONFIG_BLOCK=y +CONFIG_FILE_LOCKING=y CONFIG_SYSFS=y CONFIG_TMPFS=y CONFIG_NLS=y @@ -26,6 +28,7 @@ CONFIG_DEVTMPFS_MOUNT=y CONFIG_STANDALONE=y CONFIG_NO_HZ=y CONFIG_PRINTK=y +CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_BUG=n CONFIG_FUTEX=y CONFIG_EPOLL=y diff --git a/target/linux/patches/3.12.6/xargs.patch b/target/linux/patches/3.12.6/xargs.patch new file mode 100644 index 000000000..2c7b3df59 --- /dev/null +++ b/target/linux/patches/3.12.6/xargs.patch @@ -0,0 +1,12 @@ +diff -Nur linux-3.12.6.orig/scripts/Makefile.modpost linux-3.12.6/scripts/Makefile.modpost +--- linux-3.12.6.orig/scripts/Makefile.modpost 2013-12-20 16:51:33.000000000 +0100 ++++ linux-3.12.6/scripts/Makefile.modpost 2014-01-25 14:55:33.000000000 +0100 +@@ -60,7 +60,7 @@ + modulesymfile := $(firstword $(KBUILD_EXTMOD))/Module.symvers + + # Step 1), find all modules listed in $(MODVERDIR)/ +-MODLISTCMD := find $(MODVERDIR) -name '*.mod' | xargs -r grep -h '\.ko$$' | sort -u ++MODLISTCMD := find $(MODVERDIR) -name '*.mod' | xargs grep -h '\.ko$$' | sort -u + __modules := $(shell $(MODLISTCMD)) + modules := $(patsubst %.o,%.ko, $(wildcard $(__modules:.ko=.o))) + diff --git a/target/packages/pkg-available/mpdbox b/target/packages/pkg-available/mpdbox index e8862ea44..519250f0b 100644 --- a/target/packages/pkg-available/mpdbox +++ b/target/packages/pkg-available/mpdbox @@ -1,13 +1,16 @@ config ADK_PKG_MPDBOX bool "Choose packages for MPDBox system" default n + select ADK_PACKAGE_MPDBOX select ADK_PACKAGE_LIBMPDCLIENT select ADK_PACKAGE_MPC select ADK_PACKAGE_MPD select ADK_PACKAGE_MPD_WITH_ALSA + select ADK_PACKAGE_MPD_WITH_PULSE select ADK_PACKAGE_MPD_WITH_MP3 select ADK_PACKAGE_MPD_WITH_MP4 select ADK_PACKAGE_MPD_WITH_OGG + select ADK_PACKAGE_MPD_WITH_OPUS select ADK_PACKAGE_MPD_WITH_FLAC select ADK_PACKAGE_MPD_WITH_WAV select ADK_PACKAGE_MPD_WITH_MMS @@ -16,7 +19,12 @@ config ADK_PKG_MPDBOX select ADK_PACKAGE_MPD_WITH_CURL select ADK_PACKAGE_MPD_WITH_SAMPLERATE select ADK_PACKAGE_MPD_WITH_HTTPD + select ADK_PACKAGE_NFS_UTILS + select ADK_PACKAGE_NFS_UTILS_WITH_KERBEROS + select ADK_PACKAGE_NFS_UTILS_CLIENT + select ADK_PACKAGE_CPUFREQUTILS select ADK_PACKAGE_FILE + select ADK_PACKAGE_HTOP select ADK_PACKAGE_DROPBEAR select ADK_PACKAGE_DROPBEAR_WITH_UTMP select ADK_PACKAGE_FFMPEG diff --git a/target/ppc64/kernel.config b/target/ppc64/kernel.config deleted file mode 100644 index 0152165ff..000000000 --- a/target/ppc64/kernel.config +++ /dev/null @@ -1,1253 +0,0 @@ -# -# Automatically generated file; DO NOT EDIT. -# Linux/powerpc 3.11.5 Kernel Configuration -# -CONFIG_PPC64=y - -# -# Processor support -# -CONFIG_PPC_BOOK3S_64=y -# CONFIG_PPC_BOOK3E_64 is not set -# CONFIG_GENERIC_CPU is not set -# CONFIG_CELL_CPU is not set -# CONFIG_POWER4_CPU is not set -# CONFIG_POWER5_CPU is not set -# CONFIG_POWER6_CPU is not set -CONFIG_POWER7_CPU=y -CONFIG_PPC_BOOK3S=y -CONFIG_POWER3=y -CONFIG_POWER4=y -# CONFIG_TUNE_CELL is not set -CONFIG_PPC_FPU=y -# CONFIG_ALTIVEC is not set -# CONFIG_PPC_ICSWX is not set -CONFIG_PPC_STD_MMU=y -CONFIG_PPC_STD_MMU_64=y -# CONFIG_PPC_MM_SLICES is not set -CONFIG_PPC_HAVE_PMU_SUPPORT=y -# CONFIG_SMP is not set -CONFIG_PPC_DOORBELL=y -CONFIG_64BIT=y -CONFIG_WORD_SIZE=64 -CONFIG_ARCH_PHYS_ADDR_T_64BIT=y -CONFIG_ARCH_DMA_ADDR_T_64BIT=y -CONFIG_MMU=y -CONFIG_HAVE_SETUP_PER_CPU_AREA=y -CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y -CONFIG_NR_IRQS=512 -CONFIG_STACKTRACE_SUPPORT=y -CONFIG_HAVE_LATENCYTOP_SUPPORT=y -CONFIG_TRACE_IRQFLAGS_SUPPORT=y -CONFIG_LOCKDEP_SUPPORT=y -CONFIG_RWSEM_XCHGADD_ALGORITHM=y -CONFIG_ARCH_HAS_ILOG2_U32=y -CONFIG_ARCH_HAS_ILOG2_U64=y -CONFIG_GENERIC_HWEIGHT=y -CONFIG_PPC=y -CONFIG_EARLY_PRINTK=y -CONFIG_COMPAT=y -CONFIG_SYSVIPC_COMPAT=y -CONFIG_SCHED_OMIT_FRAME_POINTER=y -CONFIG_ARCH_MAY_HAVE_PC_FDC=y -CONFIG_PPC_OF=y -CONFIG_PPC_UDBG_16550=y -# CONFIG_GENERIC_TBSYNC is not set -CONFIG_AUDIT_ARCH=y -CONFIG_GENERIC_BUG=y -# CONFIG_EPAPR_BOOT is not set -# CONFIG_DEFAULT_UIMAGE is not set -CONFIG_ARCH_HIBERNATION_POSSIBLE=y -CONFIG_ARCH_SUSPEND_POSSIBLE=y -# CONFIG_PPC_DCR_NATIVE is not set -# CONFIG_PPC_DCR_MMIO is not set -# CONFIG_PPC_OF_PLATFORM_PCI is not set -CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y -CONFIG_ARCH_SUPPORTS_UPROBES=y -CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" -CONFIG_IRQ_WORK=y - -# -# General setup -# -CONFIG_BROKEN_ON_SMP=y -CONFIG_INIT_ENV_ARG_LIMIT=32 -CONFIG_CROSS_COMPILE="" -# CONFIG_COMPILE_TEST is not set -CONFIG_LOCALVERSION="" -# CONFIG_LOCALVERSION_AUTO is not set -CONFIG_DEFAULT_HOSTNAME="openadk" -# CONFIG_SWAP is not set -CONFIG_SYSVIPC=y -CONFIG_SYSVIPC_SYSCTL=y -CONFIG_POSIX_MQUEUE=y -CONFIG_POSIX_MQUEUE_SYSCTL=y -# CONFIG_FHANDLE is not set -# CONFIG_AUDIT is not set -CONFIG_HAVE_GENERIC_HARDIRQS=y - -# -# IRQ subsystem -# -CONFIG_GENERIC_HARDIRQS=y -CONFIG_GENERIC_IRQ_SHOW=y -CONFIG_GENERIC_IRQ_SHOW_LEVEL=y -CONFIG_IRQ_DOMAIN=y -CONFIG_IRQ_FORCED_THREADING=y -CONFIG_SPARSE_IRQ=y -CONFIG_GENERIC_TIME_VSYSCALL_OLD=y -CONFIG_GENERIC_CLOCKEVENTS=y -CONFIG_GENERIC_CLOCKEVENTS_BUILD=y -CONFIG_GENERIC_CMOS_UPDATE=y - -# -# Timers subsystem -# -CONFIG_TICK_ONESHOT=y -CONFIG_NO_HZ_COMMON=y -# CONFIG_HZ_PERIODIC is not set -CONFIG_NO_HZ_IDLE=y -# CONFIG_NO_HZ is not set -# CONFIG_HIGH_RES_TIMERS is not set - -# -# CPU/Task time and stats accounting -# -CONFIG_VIRT_CPU_ACCOUNTING=y -# CONFIG_TICK_CPU_ACCOUNTING is not set -CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y -# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set -# CONFIG_BSD_PROCESS_ACCT is not set -# CONFIG_TASKSTATS is not set - -# -# RCU Subsystem -# -CONFIG_TINY_RCU=y -# CONFIG_PREEMPT_RCU is not set -# CONFIG_RCU_STALL_COMMON is not set -# CONFIG_TREE_RCU_TRACE is not set -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=15 -# CONFIG_CGROUPS is not set -# CONFIG_CHECKPOINT_RESTORE is not set -# CONFIG_NAMESPACES is not set -CONFIG_UIDGID_CONVERTED=y -# CONFIG_UIDGID_STRICT_TYPE_CHECKS is not set -# CONFIG_SCHED_AUTOGROUP is not set -# CONFIG_SYSFS_DEPRECATED is not set -# CONFIG_RELAY is not set -# CONFIG_BLK_DEV_INITRD is not set -CONFIG_CC_OPTIMIZE_FOR_SIZE=y -CONFIG_SYSCTL=y -CONFIG_ANON_INODES=y -CONFIG_SYSCTL_EXCEPTION_TRACE=y -CONFIG_HAVE_PCSPKR_PLATFORM=y -CONFIG_EXPERT=y -CONFIG_SYSCTL_SYSCALL=y -# CONFIG_KALLSYMS is not set -CONFIG_PRINTK=y -CONFIG_BUG=y -CONFIG_PCSPKR_PLATFORM=y -# CONFIG_BASE_FULL is not set -CONFIG_FUTEX=y -CONFIG_EPOLL=y -CONFIG_SIGNALFD=y -CONFIG_TIMERFD=y -CONFIG_EVENTFD=y -CONFIG_SHMEM=y -CONFIG_AIO=y -# CONFIG_PCI_QUIRKS is not set -CONFIG_EMBEDDED=y -CONFIG_HAVE_PERF_EVENTS=y - -# -# Kernel Performance Events And Counters -# -# CONFIG_PERF_EVENTS is not set -# CONFIG_VM_EVENT_COUNTERS is not set -# CONFIG_COMPAT_BRK is not set -CONFIG_SLAB=y -# CONFIG_SLUB is not set -# CONFIG_SLOB is not set -# CONFIG_PROFILING is not set -CONFIG_HAVE_OPROFILE=y -# CONFIG_KPROBES is not set -# CONFIG_JUMP_LABEL is not set -# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set -CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y -CONFIG_ARCH_USE_BUILTIN_BSWAP=y -CONFIG_HAVE_IOREMAP_PROT=y -CONFIG_HAVE_KPROBES=y -CONFIG_HAVE_KRETPROBES=y -CONFIG_HAVE_ARCH_TRACEHOOK=y -CONFIG_HAVE_DMA_ATTRS=y -CONFIG_GENERIC_SMP_IDLE_THREAD=y -CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y -CONFIG_HAVE_DMA_API_DEBUG=y -CONFIG_HAVE_ARCH_JUMP_LABEL=y -CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y -CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y -CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y -CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y -CONFIG_HAVE_CONTEXT_TRACKING=y -CONFIG_HAVE_VIRT_CPU_ACCOUNTING=y -CONFIG_HAVE_MOD_ARCH_SPECIFIC=y -CONFIG_MODULES_USE_ELF_RELA=y -CONFIG_CLONE_BACKWARDS=y -CONFIG_OLD_SIGSUSPEND=y -CONFIG_COMPAT_OLD_SIGACTION=y - -# -# GCOV-based kernel profiling -# -# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set -CONFIG_SLABINFO=y -CONFIG_RT_MUTEXES=y -CONFIG_BASE_SMALL=1 -CONFIG_MODULES=y -# CONFIG_MODULE_FORCE_LOAD is not set -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -# CONFIG_MODVERSIONS is not set -# CONFIG_MODULE_SRCVERSION_ALL is not set -# CONFIG_MODULE_SIG is not set -CONFIG_BLOCK=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_BLK_DEV_BSGLIB is not set -# CONFIG_BLK_DEV_INTEGRITY is not set - -# -# Partition Types -# -# CONFIG_PARTITION_ADVANCED is not set -CONFIG_MSDOS_PARTITION=y -CONFIG_EFI_PARTITION=y -CONFIG_BLOCK_COMPAT=y - -# -# IO Schedulers -# -CONFIG_IOSCHED_NOOP=y -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_DEFAULT_NOOP=y -CONFIG_DEFAULT_IOSCHED="noop" -CONFIG_INLINE_SPIN_UNLOCK_IRQ=y -CONFIG_INLINE_READ_UNLOCK=y -CONFIG_INLINE_READ_UNLOCK_IRQ=y -CONFIG_INLINE_WRITE_UNLOCK=y -CONFIG_INLINE_WRITE_UNLOCK_IRQ=y -# CONFIG_FREEZER is not set -CONFIG_PPC_MSI_BITMAP=y -CONFIG_PPC_XICS=y -CONFIG_PPC_ICP_NATIVE=y -CONFIG_PPC_ICP_HV=y -CONFIG_PPC_ICS_RTAS=y -# CONFIG_GE_FPGA is not set - -# -# Platform support -# -# CONFIG_PPC_POWERNV is not set -# CONFIG_POWERNV_MSI is not set -CONFIG_PPC_PSERIES=y -# CONFIG_PPC_SPLPAR is not set -CONFIG_PSERIES_MSI=y -# CONFIG_PSERIES_ENERGY is not set -# CONFIG_IO_EVENT_IRQ is not set -# CONFIG_LPARCFG is not set -# CONFIG_PPC_SMLPAR is not set -# CONFIG_PPC_PMAC is not set -# CONFIG_PPC_MAPLE is not set -# CONFIG_PPC_PASEMI is not set -# CONFIG_PPC_PS3 is not set -# CONFIG_PPC_CELL is not set -# CONFIG_PPC_CELL_NATIVE is not set -# CONFIG_PPC_IBM_CELL_BLADE is not set -# CONFIG_PPC_CELLEB is not set -# CONFIG_PPC_CELL_QPACE is not set -# CONFIG_PQ2ADS is not set -# CONFIG_PPC_WSP is not set -# CONFIG_KVM_GUEST is not set -# CONFIG_EPAPR_PARAVIRT is not set -CONFIG_PPC_NATIVE=y -CONFIG_PPC_OF_BOOT_TRAMPOLINE=y -# CONFIG_UDBG_RTAS_CONSOLE is not set -CONFIG_PPC_SMP_MUXED_IPI=y -# CONFIG_IPIC is not set -CONFIG_MPIC=y -# CONFIG_PPC_EPAPR_HV_PIC is not set -# CONFIG_MPIC_WEIRD is not set -# CONFIG_MPIC_MSGR is not set -CONFIG_PPC_I8259=y -# CONFIG_U3_DART is not set -CONFIG_PPC_RTAS=y -CONFIG_RTAS_ERROR_LOGGING=y -CONFIG_PPC_RTAS_DAEMON=y -# CONFIG_RTAS_PROC is not set -# CONFIG_MMIO_NVRAM is not set -# CONFIG_MPIC_U3_HT_IRQS is not set -CONFIG_IBMVIO=y -# CONFIG_IBMEBUS is not set -CONFIG_EEH=y -# CONFIG_PPC_MPC106 is not set -# CONFIG_PPC_970_NAP is not set -# CONFIG_PPC_P7_NAP is not set - -# -# CPU Frequency scaling -# -# CONFIG_CPU_FREQ is not set - -# -# CPUIdle driver -# -# CONFIG_CPU_IDLE is not set -# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set -# CONFIG_FSL_ULI1575 is not set -# CONFIG_SIMPLE_GPIO is not set - -# -# Kernel options -# -# CONFIG_HZ_100 is not set -CONFIG_HZ_250=y -# CONFIG_HZ_300 is not set -# CONFIG_HZ_1000 is not set -CONFIG_HZ=250 -# CONFIG_SCHED_HRTICK is not set -CONFIG_PREEMPT_NONE=y -# CONFIG_PREEMPT_VOLUNTARY is not set -# CONFIG_PREEMPT is not set -CONFIG_BINFMT_ELF=y -CONFIG_COMPAT_BINFMT_ELF=y -CONFIG_BINFMT_SCRIPT=y -# CONFIG_HAVE_AOUT is not set -# CONFIG_BINFMT_MISC is not set -# CONFIG_COREDUMP is not set -CONFIG_IOMMU_HELPER=y -# CONFIG_SWIOTLB is not set -CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y -CONFIG_ARCH_HAS_WALK_MEMORY=y -CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y -# CONFIG_KEXEC is not set -# CONFIG_CRASH_DUMP is not set -# CONFIG_NUMA is not set -CONFIG_ARCH_SELECT_MEMORY_MODEL=y -CONFIG_ARCH_FLATMEM_ENABLE=y -CONFIG_ARCH_SPARSEMEM_ENABLE=y -CONFIG_SYS_SUPPORTS_HUGETLBFS=y -CONFIG_SELECT_MEMORY_MODEL=y -CONFIG_FLATMEM_MANUAL=y -# CONFIG_SPARSEMEM_MANUAL is not set -CONFIG_FLATMEM=y -CONFIG_FLAT_NODE_MEM_MAP=y -CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y -CONFIG_HAVE_MEMBLOCK=y -CONFIG_HAVE_MEMBLOCK_NODE_MAP=y -# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set -CONFIG_PAGEFLAGS_EXTENDED=y -CONFIG_SPLIT_PTLOCK_CPUS=4 -# CONFIG_COMPACTION is not set -# CONFIG_MIGRATION is not set -CONFIG_PHYS_ADDR_T_64BIT=y -CONFIG_ZONE_DMA_FLAG=1 -# CONFIG_BOUNCE is not set -# CONFIG_KSM is not set -CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 -# CONFIG_CROSS_MEMORY_ATTACH is not set -CONFIG_NEED_PER_CPU_KM=y -# CONFIG_CLEANCACHE is not set -# CONFIG_ZBUD is not set -# CONFIG_PPC_HAS_HASH_64K is not set -CONFIG_PPC_4K_PAGES=y -# CONFIG_PPC_64K_PAGES is not set -CONFIG_FORCE_MAX_ZONEORDER=13 -# CONFIG_PPC_DENORMALISATION is not set -CONFIG_CMDLINE_BOOL=y -CONFIG_CMDLINE="console=hvsi0 console=hvc0 console=ttyS0,9600 console=tty0" -CONFIG_EXTRA_TARGETS="" -# CONFIG_SUSPEND is not set -# CONFIG_PM_RUNTIME is not set -# CONFIG_SECCOMP is not set -CONFIG_ISA_DMA_API=y - -# -# Bus options -# -CONFIG_ZONE_DMA=y -CONFIG_NEED_DMA_MAP_STATE=y -CONFIG_NEED_SG_DMA_LENGTH=y -CONFIG_GENERIC_ISA_DMA=y -# CONFIG_PPC_INDIRECT_PCI is not set -CONFIG_PPC_PCI_CHOICE=y -CONFIG_PCI=y -CONFIG_PCI_DOMAINS=y -CONFIG_PCI_SYSCALL=y -# CONFIG_PCIEPORTBUS is not set -CONFIG_ARCH_SUPPORTS_MSI=y -CONFIG_PCI_MSI=y -# CONFIG_PCI_DEBUG is not set -# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set -# CONFIG_PCI_STUB is not set -# CONFIG_PCI_IOV is not set -# CONFIG_PCI_PRI is not set -# CONFIG_PCI_PASID is not set - -# -# PCI host controller drivers -# -# CONFIG_PCCARD is not set -# CONFIG_HOTPLUG_PCI is not set -# CONFIG_HAS_RAPIDIO is not set -# CONFIG_RAPIDIO is not set -# CONFIG_NONSTATIC_KERNEL is not set -# CONFIG_RELOCATABLE is not set -CONFIG_PAGE_OFFSET=0xc000000000000000 -CONFIG_KERNEL_START=0xc000000000000000 -CONFIG_PHYSICAL_START=0x00000000 -CONFIG_NET=y - -# -# Networking options -# -CONFIG_PACKET=y -# CONFIG_PACKET_DIAG is not set -CONFIG_UNIX=y -# CONFIG_UNIX_DIAG is not set -# CONFIG_XFRM_USER is not set -# CONFIG_NET_KEY is not set -CONFIG_INET=y -# CONFIG_IP_MULTICAST is not set -# CONFIG_IP_ADVANCED_ROUTER is not set -# CONFIG_IP_PNP is not set -# CONFIG_NET_IPIP is not set -# CONFIG_NET_IPGRE_DEMUX is not set -# CONFIG_NET_IP_TUNNEL is not set -# CONFIG_ARPD is not set -# CONFIG_SYN_COOKIES is not set -# CONFIG_INET_AH is not set -# CONFIG_INET_ESP is not set -# CONFIG_INET_IPCOMP is not set -# CONFIG_INET_XFRM_TUNNEL is not set -# CONFIG_INET_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -# CONFIG_INET_DIAG is not set -# CONFIG_TCP_CONG_ADVANCED is not set -CONFIG_TCP_CONG_CUBIC=y -CONFIG_DEFAULT_TCP_CONG="cubic" -# CONFIG_TCP_MD5SIG is not set -# CONFIG_IPV6 is not set -# CONFIG_NETWORK_SECMARK is not set -# CONFIG_NETWORK_PHY_TIMESTAMPING is not set -# CONFIG_NETFILTER is not set -# CONFIG_IP_DCCP is not set -# CONFIG_IP_SCTP is not set -# CONFIG_RDS is not set -# CONFIG_TIPC is not set -# CONFIG_ATM is not set -# CONFIG_L2TP is not set -# CONFIG_BRIDGE is not set -CONFIG_HAVE_NET_DSA=y -# CONFIG_VLAN_8021Q is not set -# CONFIG_DECNET is not set -# CONFIG_LLC2 is not set -# CONFIG_IPX is not set -# CONFIG_ATALK is not set -# CONFIG_X25 is not set -# CONFIG_LAPB is not set -# CONFIG_PHONET is not set -# CONFIG_IEEE802154 is not set -# CONFIG_NET_SCHED is not set -# CONFIG_DCB is not set -# CONFIG_BATMAN_ADV is not set -# CONFIG_OPENVSWITCH is not set -# CONFIG_VSOCKETS is not set -# CONFIG_NETLINK_MMAP is not set -# CONFIG_NETLINK_DIAG is not set -# CONFIG_NET_MPLS_GSO is not set -CONFIG_NET_RX_BUSY_POLL=y -CONFIG_BQL=y -# CONFIG_BPF_JIT is not set - -# -# Network testing -# -# CONFIG_NET_PKTGEN is not set -# CONFIG_HAMRADIO is not set -# CONFIG_CAN is not set -# CONFIG_IRDA is not set -# CONFIG_BT is not set -# CONFIG_AF_RXRPC is not set -# CONFIG_WIRELESS is not set -# CONFIG_WIMAX is not set -# CONFIG_RFKILL is not set -# CONFIG_NET_9P is not set -# CONFIG_CAIF is not set -# CONFIG_CEPH_LIB is not set -# CONFIG_NFC is not set -CONFIG_HAVE_BPF_JIT=y - -# -# Device Drivers -# - -# -# Generic Driver Options -# -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_DEVTMPFS=y -CONFIG_DEVTMPFS_MOUNT=y -# CONFIG_STANDALONE is not set -# CONFIG_PREVENT_FIRMWARE_BUILD is not set -# CONFIG_FW_LOADER is not set -# CONFIG_DEBUG_DRIVER is not set -# CONFIG_DEBUG_DEVRES is not set -# CONFIG_SYS_HYPERVISOR is not set -# CONFIG_GENERIC_CPU_DEVICES is not set -# CONFIG_DMA_SHARED_BUFFER is not set - -# -# Bus devices -# -# CONFIG_CONNECTOR is not set -# CONFIG_MTD is not set -CONFIG_DTC=y -CONFIG_OF=y - -# -# Device Tree and Open Firmware support -# -# CONFIG_PROC_DEVICETREE is not set -# CONFIG_OF_SELFTEST is not set -CONFIG_OF_FLATTREE=y -CONFIG_OF_EARLY_FLATTREE=y -CONFIG_OF_DYNAMIC=y -CONFIG_OF_ADDRESS=y -CONFIG_OF_IRQ=y -CONFIG_OF_NET=y -CONFIG_OF_PCI=y -CONFIG_OF_PCI_IRQ=y -# CONFIG_PARPORT is not set -# CONFIG_BLK_DEV is not set - -# -# Misc devices -# -# CONFIG_SENSORS_LIS3LV02D is not set -# CONFIG_DUMMY_IRQ is not set -# CONFIG_PHANTOM is not set -# CONFIG_SGI_IOC4 is not set -# CONFIG_TIFM_CORE is not set -# CONFIG_ATMEL_SSC is not set -# CONFIG_ENCLOSURE_SERVICES is not set -# CONFIG_HP_ILO is not set -# CONFIG_PCH_PHUB is not set -# CONFIG_SRAM is not set -# CONFIG_C2PORT is not set - -# -# EEPROM support -# -# CONFIG_EEPROM_93CX6 is not set -# CONFIG_CB710_CORE is not set - -# -# Texas Instruments shared transport line discipline -# - -# -# Altera FPGA firmware download module -# -CONFIG_HAVE_IDE=y -# CONFIG_IDE is not set - -# -# SCSI device support -# -CONFIG_SCSI_MOD=y -# CONFIG_RAID_ATTRS is not set -# CONFIG_SCSI is not set -# CONFIG_SCSI_DMA is not set -# CONFIG_SCSI_NETLINK is not set -# CONFIG_ATA is not set -# CONFIG_MD is not set -# CONFIG_FUSION is not set - -# -# IEEE 1394 (FireWire) support -# -# CONFIG_FIREWIRE is not set -# CONFIG_FIREWIRE_NOSY is not set -# CONFIG_I2O is not set -# CONFIG_MACINTOSH_DRIVERS is not set -CONFIG_NETDEVICES=y -CONFIG_NET_CORE=y -# CONFIG_BONDING is not set -# CONFIG_DUMMY is not set -# CONFIG_EQUALIZER is not set -# CONFIG_NET_TEAM is not set -# CONFIG_MACVLAN is not set -# CONFIG_VXLAN is not set -# CONFIG_NETCONSOLE is not set -# CONFIG_NETPOLL is not set -# CONFIG_NET_POLL_CONTROLLER is not set -# CONFIG_TUN is not set -# CONFIG_VETH is not set -# CONFIG_NLMON is not set -# CONFIG_ARCNET is not set - -# -# CAIF transport drivers -# - -# -# Distributed Switch Architecture drivers -# -# CONFIG_NET_DSA_MV88E6XXX is not set -# CONFIG_NET_DSA_MV88E6060 is not set -# CONFIG_NET_DSA_MV88E6XXX_NEED_PPU is not set -# CONFIG_NET_DSA_MV88E6131 is not set -# CONFIG_NET_DSA_MV88E6123_61_65 is not set -# CONFIG_ETHERNET is not set -# CONFIG_FDDI is not set -# CONFIG_HIPPI is not set -# CONFIG_PHYLIB is not set -# CONFIG_PPP is not set -# CONFIG_SLIP is not set -# CONFIG_WLAN is not set - -# -# Enable WiMAX (Networking options) to see the WiMAX drivers -# -# CONFIG_WAN is not set -# CONFIG_VMXNET3 is not set -# CONFIG_ISDN is not set - -# -# Input device support -# -CONFIG_INPUT=y -# CONFIG_INPUT_FF_MEMLESS is not set -# CONFIG_INPUT_POLLDEV is not set -# CONFIG_INPUT_SPARSEKMAP is not set -# CONFIG_INPUT_MATRIXKMAP is not set - -# -# Userland interfaces -# -# CONFIG_INPUT_MOUSEDEV is not set -# CONFIG_INPUT_JOYDEV is not set -# CONFIG_INPUT_EVDEV is not set -# CONFIG_INPUT_EVBUG is not set - -# -# Input Device Drivers -# -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_INPUT_JOYSTICK is not set -# CONFIG_INPUT_TABLET is not set -# CONFIG_INPUT_TOUCHSCREEN is not set -# CONFIG_INPUT_MISC is not set - -# -# Hardware I/O ports -# -# CONFIG_SERIO is not set -# CONFIG_GAMEPORT is not set - -# -# Character devices -# -CONFIG_TTY=y -CONFIG_VT=y -# CONFIG_CONSOLE_TRANSLATIONS is not set -CONFIG_VT_CONSOLE=y -CONFIG_HW_CONSOLE=y -# CONFIG_VT_HW_CONSOLE_BINDING is not set -CONFIG_UNIX98_PTYS=y -# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set -# CONFIG_LEGACY_PTYS is not set -# CONFIG_SERIAL_NONSTANDARD is not set -# CONFIG_NOZOMI is not set -# CONFIG_N_GSM is not set -# CONFIG_TRACE_SINK is not set -# CONFIG_PPC_EPAPR_HV_BYTECHAN is not set -# CONFIG_DEVKMEM is not set - -# -# Serial drivers -# -# CONFIG_SERIAL_8250 is not set - -# -# Non-8250 serial port support -# -# CONFIG_SERIAL_MFD_HSU is not set -# CONFIG_SERIAL_ICOM is not set -# CONFIG_SERIAL_JSM is not set -# CONFIG_SERIAL_SCCNXP is not set -# CONFIG_SERIAL_TIMBERDALE is not set -# CONFIG_SERIAL_ALTERA_JTAGUART is not set -# CONFIG_SERIAL_ALTERA_UART is not set -# CONFIG_SERIAL_PCH_UART is not set -# CONFIG_SERIAL_XILINX_PS_UART is not set -# CONFIG_SERIAL_ARC is not set -# CONFIG_SERIAL_RP2 is not set -# CONFIG_SERIAL_FSL_LPUART is not set -# CONFIG_TTY_PRINTK is not set -CONFIG_HVC_DRIVER=y -CONFIG_HVC_IRQ=y -CONFIG_HVC_CONSOLE=y -# CONFIG_HVC_OLD_HVSI is not set -# CONFIG_HVC_RTAS is not set -CONFIG_HVC_UDBG=y -# CONFIG_HVCS is not set -# CONFIG_IBM_BSR is not set -# CONFIG_IPMI_HANDLER is not set -# CONFIG_HW_RANDOM is not set -# CONFIG_GEN_RTC is not set -# CONFIG_R3964 is not set -# CONFIG_APPLICOM is not set -# CONFIG_RAW_DRIVER is not set -# CONFIG_HANGCHECK_TIMER is not set -# CONFIG_TCG_TPM is not set -CONFIG_DEVPORT=y -# CONFIG_BRCM_CHAR_DRIVERS is not set -# CONFIG_I2C is not set -# CONFIG_SPI is not set -# CONFIG_HSI is not set - -# -# PPS support -# -# CONFIG_PPS is not set - -# -# PPS generators support -# - -# -# PTP clock support -# -# CONFIG_PTP_1588_CLOCK is not set - -# -# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks. -# -CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y -CONFIG_GPIO_DEVRES=y -# CONFIG_GPIOLIB is not set -# CONFIG_W1 is not set -# CONFIG_POWER_SUPPLY is not set -# CONFIG_POWER_AVS is not set -# CONFIG_HWMON is not set -# CONFIG_THERMAL is not set -# CONFIG_WATCHDOG is not set -CONFIG_SSB_POSSIBLE=y - -# -# Sonics Silicon Backplane -# -# CONFIG_SSB is not set -CONFIG_BCMA_POSSIBLE=y - -# -# Broadcom specific AMBA -# -# CONFIG_BCMA is not set - -# -# Multifunction device drivers -# -# CONFIG_MFD_CORE is not set -# CONFIG_MFD_CROS_EC is not set -# CONFIG_HTC_PASIC3 is not set -# CONFIG_LPC_ICH is not set -# CONFIG_LPC_SCH is not set -# CONFIG_MFD_JANZ_CMODIO is not set -# CONFIG_MFD_KEMPLD is not set -# CONFIG_MFD_RDC321X is not set -# CONFIG_MFD_RTSX_PCI is not set -# CONFIG_MFD_SM501 is not set -# CONFIG_ABX500_CORE is not set -# CONFIG_MFD_SYSCON is not set -# CONFIG_MFD_TI_AM335X_TSCADC is not set -# CONFIG_MFD_TMIO is not set -# CONFIG_MFD_VX855 is not set -# CONFIG_REGULATOR is not set -# CONFIG_MEDIA_SUPPORT is not set - -# -# Graphics support -# -# CONFIG_AGP is not set -# CONFIG_VGA_ARB is not set -# CONFIG_DRM is not set -# CONFIG_VGASTATE is not set -# CONFIG_VIDEO_OUTPUT_CONTROL is not set -CONFIG_FB=y -# CONFIG_FIRMWARE_EDID is not set -# CONFIG_FB_DDC is not set -# CONFIG_FB_BOOT_VESA_SUPPORT is not set -CONFIG_FB_CFB_FILLRECT=y -CONFIG_FB_CFB_COPYAREA=y -CONFIG_FB_CFB_IMAGEBLIT=y -# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set -# CONFIG_FB_SYS_FILLRECT is not set -# CONFIG_FB_SYS_COPYAREA is not set -# CONFIG_FB_SYS_IMAGEBLIT is not set -# CONFIG_FB_FOREIGN_ENDIAN is not set -# CONFIG_FB_SYS_FOPS is not set -# CONFIG_FB_SVGALIB is not set -CONFIG_FB_MACMODES=y -# CONFIG_FB_BACKLIGHT is not set -# CONFIG_FB_MODE_HELPERS is not set -# CONFIG_FB_TILEBLITTING is not set - -# -# Frame buffer hardware drivers -# -# CONFIG_FB_CIRRUS is not set -# CONFIG_FB_PM2 is not set -# CONFIG_FB_CYBER2000 is not set -CONFIG_FB_OF=y -# CONFIG_FB_ASILIANT is not set -# CONFIG_FB_IMSTT is not set -# CONFIG_FB_VGA16 is not set -# CONFIG_FB_S1D13XXX is not set -# CONFIG_FB_NVIDIA is not set -# CONFIG_FB_RIVA is not set -# CONFIG_FB_I740 is not set -# CONFIG_FB_MATROX is not set -# CONFIG_FB_RADEON is not set -# CONFIG_FB_ATY128 is not set -# CONFIG_FB_ATY is not set -# CONFIG_FB_S3 is not set -# CONFIG_FB_SAVAGE is not set -# CONFIG_FB_SIS is not set -# CONFIG_FB_NEOMAGIC is not set -# CONFIG_FB_KYRO is not set -# CONFIG_FB_3DFX is not set -# CONFIG_FB_VOODOO1 is not set -# CONFIG_FB_VT8623 is not set -# CONFIG_FB_TRIDENT is not set -# CONFIG_FB_ARK is not set -# CONFIG_FB_PM3 is not set -# CONFIG_FB_CARMINE is not set -# CONFIG_FB_IBM_GXT4500 is not set -# CONFIG_FB_GOLDFISH is not set -# CONFIG_FB_VIRTUAL is not set -# CONFIG_FB_METRONOME is not set -# CONFIG_FB_MB862XX is not set -# CONFIG_FB_BROADSHEET is not set -# CONFIG_FB_AUO_K190X is not set -# CONFIG_FB_SIMPLE is not set -# CONFIG_EXYNOS_VIDEO is not set -# CONFIG_BACKLIGHT_LCD_SUPPORT is not set - -# -# Console display driver support -# -CONFIG_VGA_CONSOLE=y -# CONFIG_VGACON_SOFT_SCROLLBACK is not set -CONFIG_DUMMY_CONSOLE=y -CONFIG_FRAMEBUFFER_CONSOLE=y -# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set -# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set -# CONFIG_LOGO is not set -# CONFIG_SOUND is not set - -# -# HID support -# -# CONFIG_HID is not set -# CONFIG_USB_SUPPORT is not set -# CONFIG_UWB is not set -# CONFIG_MMC is not set -# CONFIG_MEMSTICK is not set -# CONFIG_NEW_LEDS is not set -# CONFIG_ACCESSIBILITY is not set -# CONFIG_INFINIBAND is not set -# CONFIG_EDAC is not set -# CONFIG_RTC_CLASS is not set -# CONFIG_DMADEVICES is not set -# CONFIG_AUXDISPLAY is not set -# CONFIG_UIO is not set -# CONFIG_VIRT_DRIVERS is not set - -# -# Virtio drivers -# -# CONFIG_VIRTIO_PCI is not set -# CONFIG_VIRTIO_MMIO is not set - -# -# Microsoft Hyper-V guest support -# -# CONFIG_STAGING is not set - -# -# Hardware Spinlock drivers -# -CONFIG_I8253_LOCK=y -CONFIG_CLKBLD_I8253=y -# CONFIG_MAILBOX is not set -CONFIG_IOMMU_SUPPORT=y -CONFIG_OF_IOMMU=y -# CONFIG_SPAPR_TCE_IOMMU is not set - -# -# Remoteproc drivers -# -# CONFIG_STE_MODEM_RPROC is not set - -# -# Rpmsg drivers -# -# CONFIG_PM_DEVFREQ is not set -# CONFIG_EXTCON is not set -# CONFIG_MEMORY is not set -# CONFIG_IIO is not set -# CONFIG_VME_BUS is not set -# CONFIG_PWM is not set -CONFIG_IRQCHIP=y -# CONFIG_IPACK_BUS is not set -# CONFIG_RESET_CONTROLLER is not set -# CONFIG_FMC is not set - -# -# File systems -# -CONFIG_EXT2_FS=y -# CONFIG_EXT2_FS_XATTR is not set -# CONFIG_EXT2_FS_XIP is not set -# CONFIG_EXT3_FS is not set -# CONFIG_EXT4_FS is not set -# CONFIG_REISERFS_FS is not set -# CONFIG_JFS_FS is not set -# CONFIG_XFS_FS is not set -# CONFIG_GFS2_FS is not set -# CONFIG_BTRFS_FS is not set -# CONFIG_NILFS2_FS is not set -# CONFIG_FS_POSIX_ACL is not set -CONFIG_EXPORTFS=y -CONFIG_FILE_LOCKING=y -CONFIG_FSNOTIFY=y -CONFIG_DNOTIFY=y -CONFIG_INOTIFY_USER=y -CONFIG_FANOTIFY=y -# CONFIG_QUOTA is not set -# CONFIG_QUOTACTL is not set -# CONFIG_AUTOFS4_FS is not set -# CONFIG_FUSE_FS is not set - -# -# Caches -# -# CONFIG_FSCACHE is not set - -# -# CD-ROM/DVD Filesystems -# -# CONFIG_ISO9660_FS is not set -# CONFIG_UDF_FS is not set - -# -# DOS/FAT/NT Filesystems -# -# CONFIG_MSDOS_FS is not set -# CONFIG_VFAT_FS is not set -# CONFIG_NTFS_FS is not set - -# -# Pseudo filesystems -# -CONFIG_PROC_FS=y -# CONFIG_PROC_KCORE is not set -CONFIG_PROC_SYSCTL=y -# CONFIG_PROC_PAGE_MONITOR is not set -CONFIG_SYSFS=y -CONFIG_TMPFS=y -# CONFIG_TMPFS_POSIX_ACL is not set -# CONFIG_TMPFS_XATTR is not set -# CONFIG_HUGETLBFS is not set -# CONFIG_HUGETLB_PAGE is not set -# CONFIG_CONFIGFS_FS is not set -# CONFIG_MISC_FILESYSTEMS is not set -# CONFIG_NETWORK_FILESYSTEMS is not set -# CONFIG_NLS is not set -# CONFIG_BINARY_PRINTF is not set - -# -# Library routines -# -CONFIG_BITREVERSE=y -CONFIG_GENERIC_STRNCPY_FROM_USER=y -CONFIG_GENERIC_STRNLEN_USER=y -CONFIG_GENERIC_NET_UTILS=y -CONFIG_GENERIC_PCI_IOMAP=y -CONFIG_GENERIC_IO=y -# CONFIG_CRC_CCITT is not set -# CONFIG_CRC16 is not set -# CONFIG_CRC_T10DIF is not set -# CONFIG_CRC_ITU_T is not set -CONFIG_CRC32=y -# CONFIG_CRC32_SELFTEST is not set -CONFIG_CRC32_SLICEBY8=y -# CONFIG_CRC32_SLICEBY4 is not set -# CONFIG_CRC32_SARWATE is not set -# CONFIG_CRC32_BIT is not set -# CONFIG_CRC7 is not set -# CONFIG_LIBCRC32C is not set -# CONFIG_CRC8 is not set -CONFIG_ZLIB_INFLATE=y -CONFIG_ZLIB_DEFLATE=y -# CONFIG_XZ_DEC is not set -# CONFIG_XZ_DEC_BCJ is not set -CONFIG_HAS_IOMEM=y -CONFIG_HAS_IOPORT=y -CONFIG_HAS_DMA=y -CONFIG_DQL=y -CONFIG_NLATTR=y -CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y -# CONFIG_AVERAGE is not set -# CONFIG_CORDIC is not set -# CONFIG_DDR is not set -CONFIG_FONT_SUPPORT=y -# CONFIG_FONTS is not set -CONFIG_FONT_8x8=y -CONFIG_FONT_8x16=y - -# -# Kernel hacking -# - -# -# printk and dmesg options -# -CONFIG_PRINTK_TIME=y -CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4 - -# -# Compile-time checks and compiler options -# -CONFIG_DEBUG_INFO=y -# CONFIG_DEBUG_INFO_REDUCED is not set -# CONFIG_ENABLE_WARN_DEPRECATED is not set -# CONFIG_ENABLE_MUST_CHECK is not set -CONFIG_FRAME_WARN=1024 -# CONFIG_STRIP_ASM_SYMS is not set -# CONFIG_READABLE_ASM is not set -# CONFIG_UNUSED_SYMBOLS is not set -# CONFIG_DEBUG_FS is not set -# CONFIG_HEADERS_CHECK is not set -# CONFIG_DEBUG_SECTION_MISMATCH is not set -# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set -# CONFIG_MAGIC_SYSRQ is not set -CONFIG_DEBUG_KERNEL=y - -# -# Memory Debugging -# -# CONFIG_DEBUG_PAGEALLOC is not set -# CONFIG_DEBUG_OBJECTS is not set -# CONFIG_DEBUG_SLAB is not set -CONFIG_HAVE_DEBUG_KMEMLEAK=y -# CONFIG_DEBUG_KMEMLEAK is not set -# CONFIG_DEBUG_STACK_USAGE is not set -# CONFIG_DEBUG_VM is not set -# CONFIG_DEBUG_MEMORY_INIT is not set -CONFIG_HAVE_DEBUG_STACKOVERFLOW=y -# CONFIG_DEBUG_STACKOVERFLOW is not set -# CONFIG_DEBUG_SHIRQ is not set - -# -# Debug Lockups and Hangs -# -# CONFIG_LOCKUP_DETECTOR is not set -# CONFIG_DETECT_HUNG_TASK is not set -# CONFIG_PANIC_ON_OOPS is not set -CONFIG_PANIC_ON_OOPS_VALUE=0 -# CONFIG_SCHED_DEBUG is not set -# CONFIG_SCHEDSTATS is not set -# CONFIG_TIMER_STATS is not set - -# -# Lock Debugging (spinlocks, mutexes, etc...) -# -# CONFIG_DEBUG_RT_MUTEXES is not set -# CONFIG_RT_MUTEX_TESTER is not set -# CONFIG_DEBUG_SPINLOCK is not set -# CONFIG_DEBUG_MUTEXES is not set -# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set -# CONFIG_DEBUG_LOCK_ALLOC is not set -# CONFIG_PROVE_LOCKING is not set -# CONFIG_LOCK_STAT is not set -# CONFIG_DEBUG_ATOMIC_SLEEP is not set -# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set -# CONFIG_DEBUG_KOBJECT is not set -# CONFIG_DEBUG_BUGVERBOSE is not set -# CONFIG_DEBUG_WRITECOUNT is not set -# CONFIG_DEBUG_LIST is not set -# CONFIG_DEBUG_SG is not set -# CONFIG_DEBUG_NOTIFIERS is not set -# CONFIG_DEBUG_CREDENTIALS is not set - -# -# RCU Debugging -# -# CONFIG_SPARSE_RCU_POINTER is not set -# CONFIG_RCU_TORTURE_TEST is not set -# CONFIG_RCU_TRACE is not set -# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set -# CONFIG_NOTIFIER_ERROR_INJECTION is not set -# CONFIG_FAULT_INJECTION is not set -# CONFIG_LATENCYTOP is not set -CONFIG_HAVE_FUNCTION_TRACER=y -CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y -CONFIG_HAVE_DYNAMIC_FTRACE=y -CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y -CONFIG_HAVE_SYSCALL_TRACEPOINTS=y -CONFIG_TRACING_SUPPORT=y -# CONFIG_FTRACE is not set - -# -# Runtime Testing -# -# CONFIG_TEST_LIST_SORT is not set -# CONFIG_BACKTRACE_SELF_TEST is not set -# CONFIG_RBTREE_TEST is not set -# CONFIG_INTERVAL_TREE_TEST is not set -# CONFIG_ATOMIC64_SELFTEST is not set -# CONFIG_TEST_STRING_HELPERS is not set -# CONFIG_TEST_KSTRTOX is not set -# CONFIG_DMA_API_DEBUG is not set -# CONFIG_SAMPLES is not set -CONFIG_HAVE_ARCH_KGDB=y -# CONFIG_KGDB is not set -# CONFIG_PPC_DISABLE_WERROR is not set -CONFIG_PPC_WERROR=y -CONFIG_PRINT_STACK_DEPTH=64 -# CONFIG_CODE_PATCHING_SELFTEST is not set -# CONFIG_FTR_FIXUP_SELFTEST is not set -# CONFIG_MSI_BITMAP_SELFTEST is not set -# CONFIG_XMON is not set -CONFIG_BOOTX_TEXT=y -# CONFIG_PPC_EARLY_DEBUG is not set -# CONFIG_STRICT_DEVMEM is not set - -# -# Security options -# -# CONFIG_KEYS is not set -# CONFIG_SECURITY_DMESG_RESTRICT is not set -# CONFIG_SECURITY is not set -# CONFIG_SECURITYFS is not set -CONFIG_DEFAULT_SECURITY_DAC=y -CONFIG_DEFAULT_SECURITY="" -CONFIG_CRYPTO=y - -# -# Crypto core or helper -# -CONFIG_CRYPTO_ALGAPI=y -CONFIG_CRYPTO_ALGAPI2=y -# CONFIG_CRYPTO_MANAGER is not set -# CONFIG_CRYPTO_MANAGER2 is not set -# CONFIG_CRYPTO_USER is not set -# CONFIG_CRYPTO_GF128MUL is not set -# CONFIG_CRYPTO_NULL is not set -# CONFIG_CRYPTO_CRYPTD is not set -# CONFIG_CRYPTO_AUTHENC is not set -# CONFIG_CRYPTO_TEST is not set - -# -# Authenticated Encryption with Associated Data -# -# CONFIG_CRYPTO_CCM is not set -# CONFIG_CRYPTO_GCM is not set -# CONFIG_CRYPTO_SEQIV is not set - -# -# Block modes -# -# CONFIG_CRYPTO_CBC is not set -# CONFIG_CRYPTO_CTR is not set -# CONFIG_CRYPTO_CTS is not set -# CONFIG_CRYPTO_ECB is not set -# CONFIG_CRYPTO_LRW is not set -# CONFIG_CRYPTO_PCBC is not set -# CONFIG_CRYPTO_XTS is not set - -# -# Hash modes -# -# CONFIG_CRYPTO_CMAC is not set -# CONFIG_CRYPTO_HMAC is not set -# CONFIG_CRYPTO_XCBC is not set -# CONFIG_CRYPTO_VMAC is not set - -# -# Digest -# -# CONFIG_CRYPTO_CRC32C is not set -# CONFIG_CRYPTO_CRC32 is not set -# CONFIG_CRYPTO_GHASH is not set -# CONFIG_CRYPTO_MD4 is not set -# CONFIG_CRYPTO_MD5 is not set -# CONFIG_CRYPTO_MICHAEL_MIC is not set -# CONFIG_CRYPTO_RMD128 is not set -# CONFIG_CRYPTO_RMD160 is not set -# CONFIG_CRYPTO_RMD256 is not set -# CONFIG_CRYPTO_RMD320 is not set -# CONFIG_CRYPTO_SHA1 is not set -# CONFIG_CRYPTO_SHA1_PPC is not set -# CONFIG_CRYPTO_SHA256 is not set -# CONFIG_CRYPTO_SHA512 is not set -# CONFIG_CRYPTO_TGR192 is not set -# CONFIG_CRYPTO_WP512 is not set - -# -# Ciphers -# -CONFIG_CRYPTO_AES=y -# CONFIG_CRYPTO_ANUBIS is not set -# CONFIG_CRYPTO_ARC4 is not set -# CONFIG_CRYPTO_BLOWFISH is not set -# CONFIG_CRYPTO_CAMELLIA is not set -# CONFIG_CRYPTO_CAST5 is not set -# CONFIG_CRYPTO_CAST6 is not set -# CONFIG_CRYPTO_DES is not set -# CONFIG_CRYPTO_FCRYPT is not set -# CONFIG_CRYPTO_KHAZAD is not set -# CONFIG_CRYPTO_SALSA20 is not set -# CONFIG_CRYPTO_SEED is not set -# CONFIG_CRYPTO_SERPENT is not set -# CONFIG_CRYPTO_TEA is not set -# CONFIG_CRYPTO_TWOFISH is not set - -# -# Compression -# -# CONFIG_CRYPTO_DEFLATE is not set -# CONFIG_CRYPTO_ZLIB is not set -# CONFIG_CRYPTO_LZO is not set -# CONFIG_CRYPTO_LZ4 is not set -# CONFIG_CRYPTO_LZ4HC is not set - -# -# Random Number Generation -# -# CONFIG_CRYPTO_ANSI_CPRNG is not set -# CONFIG_CRYPTO_USER_API_HASH is not set -# CONFIG_CRYPTO_USER_API_SKCIPHER is not set -# CONFIG_CRYPTO_HW is not set -# CONFIG_PPC_CLOCK is not set -# CONFIG_VIRTUALIZATION is not set diff --git a/toolchain/eglibc/Makefile b/toolchain/eglibc/Makefile index 276b468d4..72dd1b1b7 100644 --- a/toolchain/eglibc/Makefile +++ b/toolchain/eglibc/Makefile @@ -28,7 +28,7 @@ EGLIBC_BUILD_DIR_FINAL:= ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION)-final $(WRKBUILD)/.headers_configure: mkdir -p $(EGLIBC_BUILD_DIR_INITIAL) $(CP) ${TOPDIR}/toolchain/eglibc/eglibc.config \ - $(EGLIBC_BUILD_DIR_INITIAL)/option-groups.config + $(WRKBUILD)/libc/option-groups.config (cd $(EGLIBC_BUILD_DIR_INITIAL); \ ${EGLIBC_ENV} \ CC="${REAL_GNU_TARGET_NAME}-gcc $(ADK_TARGET_ABI_CFLAGS)" \ diff --git a/toolchain/eglibc/Makefile.inc b/toolchain/eglibc/Makefile.inc index b90983ff1..5c59d9d2e 100644 --- a/toolchain/eglibc/Makefile.inc +++ b/toolchain/eglibc/Makefile.inc @@ -15,6 +15,7 @@ EGLIBC_CONFOPTS:= --build=$(GNU_HOST_NAME) \ --disable-nscd \ --with-__thread \ --with-tls \ + --disable-obsolete-rpc \ --enable-add-ons \ --disable-nls EGLIBC_ENV:= PATH='${TARGET_PATH}' \ diff --git a/toolchain/eglibc/eglibc.config b/toolchain/eglibc/eglibc.config index 6c3025f71..f0304ff85 100644 --- a/toolchain/eglibc/eglibc.config +++ b/toolchain/eglibc/eglibc.config @@ -31,13 +31,13 @@ OPTION_EGLIBC_LIBM = y OPTION_EGLIBC_LOCALES = y OPTION_EGLIBC_LOCALE_CODE = y OPTION_EGLIBC_MEMUSAGE = y -OPTION_EGLIBC_NIS = y +OPTION_EGLIBC_NIS = n OPTION_EGLIBC_NSSWITCH = y OPTION_EGLIBC_RCMD = y OPTION_EGLIBC_RTLD_DEBUG = y OPTION_EGLIBC_SPAWN = y OPTION_EGLIBC_STREAMS = y -OPTION_EGLIBC_SUNRPC = y +OPTION_EGLIBC_SUNRPC = n OPTION_EGLIBC_UTMP = y OPTION_EGLIBC_UTMPX = y OPTION_EGLIBC_WORDEXP = y diff --git a/toolchain/eglibc/patches/eglibc-cross.patch b/toolchain/eglibc/patches/eglibc-cross.patch index 893345f2b..6d74ec327 100644 --- a/toolchain/eglibc/patches/eglibc-cross.patch +++ b/toolchain/eglibc/patches/eglibc-cross.patch @@ -1,60 +1,50 @@ diff -Nur eglibc-2.18.orig/libc/sunrpc/rpc/types.h eglibc-2.18/libc/sunrpc/rpc/types.h --- eglibc-2.18.orig/libc/sunrpc/rpc/types.h 2013-09-13 10:20:22.000000000 +0200 -+++ eglibc-2.18/libc/sunrpc/rpc/types.h 2013-09-13 10:49:06.000000000 +0200 -@@ -69,19 +69,25 @@ - #include <sys/types.h> ++++ eglibc-2.18/libc/sunrpc/rpc/types.h 2014-01-25 13:23:20.000000000 +0100 +@@ -70,6 +70,7 @@ #endif --#ifndef __u_char_defined --typedef __u_char u_char; --typedef __u_short u_short; --typedef __u_int u_int; --typedef __u_long u_long; --typedef __quad_t quad_t; --typedef __u_quad_t u_quad_t; --typedef __fsid_t fsid_t; --# define __u_char_defined -+typedef unsigned char u_char; -+typedef unsigned short u_short; -+typedef unsigned int u_int; -+typedef unsigned long u_long; -+#if __WORDSIZE == 64 -+typedef long int quad_t; -+typedef unsigned long int u_quad_t; -+#elif defined __GLIBC_HAVE_LONG_LONG -+typedef long long int quad_t; -+typedef unsigned long long int u_quad_t; -+#endif -+#if defined(_CROSS_RPCGEN_) -+typedef u_quad_t fsid_t; + #ifndef __u_char_defined ++#if !defined(__APPLE__) && !defined(__BSD__) + typedef __u_char u_char; + typedef __u_short u_short; + typedef __u_int u_int; +@@ -79,11 +80,14 @@ + typedef __fsid_t fsid_t; + # define __u_char_defined #endif --#ifndef __daddr_t_defined --typedef __daddr_t daddr_t; --typedef __caddr_t caddr_t; -+ -+# define __u_char_defined -+#if !defined(__daddr_t_defined) && defined(linux) -+typedef long int daddr_t; -+typedef char *caddr_t; ++#endif + #ifndef __daddr_t_defined ++#if !defined(__APPLE__) && !defined(__BSD__) + typedef __daddr_t daddr_t; + typedef __caddr_t caddr_t; # define __daddr_t_defined #endif ++#endif + #include <sys/time.h> + #include <sys/param.h> diff -Nur eglibc-2.18.orig/libc/sunrpc/rpc_main.c eglibc-2.18/libc/sunrpc/rpc_main.c --- eglibc-2.18.orig/libc/sunrpc/rpc_main.c 2013-09-13 10:20:22.000000000 +0200 -+++ eglibc-2.18/libc/sunrpc/rpc_main.c 2013-09-13 10:49:34.000000000 +0200 -@@ -38,7 +38,11 @@ ++++ eglibc-2.18/libc/sunrpc/rpc_main.c 2014-01-25 09:57:31.000000000 +0100 +@@ -38,7 +38,6 @@ #include <stdio.h> #include <string.h> #include <unistd.h> -+#ifdef _CROSS_RPCGEN_ -+#define gettext(X) (X) -+#else - #include <libintl.h> -+#endif +-#include <libintl.h> #include <locale.h> #include <ctype.h> #include <sys/types.h> -@@ -958,10 +962,12 @@ +@@ -51,6 +50,8 @@ + #include "rpc_scan.h" + #include "proto.h" + ++#define gettext(X) (X) ++ + #include "../version.h" + #define PACKAGE _libc_intl_domainname + +@@ -958,10 +959,12 @@ abort (); temp = rindex (cmd->infile, '.'); cp = stpcpy (mkfilename, "Makefile."); @@ -72,16 +62,19 @@ diff -Nur eglibc-2.18.orig/libc/sunrpc/rpc_main.c eglibc-2.18/libc/sunrpc/rpc_ma else diff -Nur eglibc-2.18.orig/libc/sunrpc/rpc_scan.c eglibc-2.18/libc/sunrpc/rpc_scan.c --- eglibc-2.18.orig/libc/sunrpc/rpc_scan.c 2013-09-13 10:20:22.000000000 +0200 -+++ eglibc-2.18/libc/sunrpc/rpc_scan.c 2013-09-13 10:49:06.000000000 +0200 -@@ -37,7 +37,11 @@ ++++ eglibc-2.18/libc/sunrpc/rpc_scan.c 2014-01-25 09:57:31.000000000 +0100 +@@ -37,12 +37,13 @@ #include <stdio.h> #include <ctype.h> #include <string.h> -+#ifdef _CROSS_RPCGEN_ -+#define gettext(X) (X) -+#else - #include <libintl.h> -+#endif +-#include <libintl.h> #include "rpc_scan.h" #include "rpc_parse.h" #include "rpc_util.h" + #include "proto.h" + ++#define gettext(X) (X) ++ + #define startcomment(where) (where[0] == '/' && where[1] == '*') + #define endcomment(where) (where[-1] == '*' && where[0] == '/') + |