Explorar o código

update eglic and glibc

Waldemar Brodkorb %!s(int64=15) %!d(string=hai) anos
pai
achega
25631be731

+ 1 - 3
package/glibc/Makefile

@@ -28,6 +28,7 @@ GLIBC_CONFOPTS:=          \
 			--enable-add-ons
 
 $(eval $(call PKG_template,GLIBC,glibc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,GLIBC_DEV,glibc-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 do-extract:
 
@@ -36,9 +37,6 @@ do-install:
 	${INSTALL_DIR} $(IDIR_GLIBC)/lib $(IDIR_GLIBC)/etc
 	# install /etc/localtime from host system (FIXME)
 	${CP} /etc/localtime $(IDIR_GLIBC)/etc
-ifeq ($(ADK_SSP),y)
-	$(CP) $(STAGING_DIR)/lib/libssp.so* $(IDIR_GLIBC)/lib/
-endif
 	$(CP) $(STAGING_DIR)/lib/libgcc_s.so* $(IDIR_GLIBC)/lib/
 	$(CP) $(STAGING_DIR)/lib/ld-*.so* $(IDIR_GLIBC)/lib/
 	-for file in libc libcrypt libdl libm libnsl libresolv librt libutil libnss_compat libnss_dns libnss_files; do \

+ 12 - 1
scripts/scan-pkgs.sh

@@ -18,7 +18,7 @@ test -z "$BASH_VERSION$KSH_VERSION" && exec $BASH $0 "$@"
 
 [[ -n $BASH_VERSION ]] && shopt -s extglob
 topdir=$(readlink -nf $(dirname $0)/.. 2>/dev/null || (cd $(dirname $0)/..; pwd -P))
-OStype=$(env NOFAKE=yes uname)
+OStype=$(uname)
 out=0
 
 . $topdir/.config
@@ -88,6 +88,10 @@ if [[ -n $ADK_PACKAGE_LIBXFONT ]]; then
 	NEED_XMLTO="$NEED_XMLTO libXfont"
 fi
 
+if [[ -n $ADK_PACKAGE_EGLIBC ]]; then
+	NEED_GPERF="$NEED_GPERF eglibc"
+fi
+
 if [[ -n $NEED_GETTEXT ]]; then
 	if ! which xgettext >/dev/null 2>&1; then
 		echo >&2 You need gettext to build $NEED_GETTEXT
@@ -141,6 +145,13 @@ if [[ -n $NEED_BISON ]]; then
 	fi
 fi
 
+if [[ -n $NEED_GPERF ]]; then
+	if ! which gperf >/dev/null 2>&1; then
+		echo >&2 You need gperf to build $NEED_GPERF
+		out=1
+	fi
+fi
+
 if [[ -n $NEED_GXX ]]; then
 	if ! which g++ >/dev/null 2>&1; then
 		echo >&2 You need GNU c++ compiler to build $NEED_GXX

+ 0 - 38
target/Config.in

@@ -676,44 +676,6 @@ config ADK_COMPRESSION_TOOL
 	default "lzma -9" if ADK_TARGET_INITRAMFS_COMPRESSION_LZMA
 	help
 
-choice
-prompt "Root filesystem type"
-	depends on ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK
-	default ADK_TARGET_ROOT_XFS
-
-config ADK_TARGET_ROOT_XFS_MOD
-	boolean
-	prompt "XFS filesystem"
-	select ADK_KPACKAGE_KMOD_XFS_FS
-	select ADK_PACKAGE_XFSPROGS
-	help
-	  Select XFS filesystem kernel module and filesystem utilities.
-
-config ADK_TARGET_ROOT_EXT2_MOD
-	boolean
-	prompt "EXT2 filesystem"
-	select ADK_KPACKAGE_KMOD_EXT2_FS
-	select ADK_PACKAGE_E2FSPROGS
-	help
-	  Select EXT2 filesystem kernel module and filesystem utilities.
-
-config ADK_TARGET_ROOT_EXT3_MOD
-	boolean
-	prompt "EXT3 filesystem"
-	select ADK_KPACKAGE_KMOD_EXT3_FS
-	select ADK_PACKAGE_E2FSPROGS
-	help
-	  Select EXT3 filesystem kernel module and filesystem utilities.
-
-config ADK_TARGET_ROOT_EXT4_MOD
-	boolean
-	prompt "EXT4 filesystem"
-	select ADK_KPACKAGE_KMOD_EXT4_FS
-	select ADK_PACKAGE_E2FSPROGS
-	help
-	  Select EXT4 filesystem kernel module and filesystem utilities.
-
-endchoice
 
 choice
 prompt "Root filesystem type"

+ 1 - 1
toolchain/eglibc/Makefile

@@ -44,7 +44,7 @@ $(WRKBUILD)/.headers_configure:
 	mkdir -p $(EGLIBC_BUILD_DIR_INITIAL)
 	(cd ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION); \
 		ln -sf ../ports ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION)/libc);
-	(cd ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION)/libc; autoconf --force);
+	#(cd ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION)/libc; autoconf --force);
 	$(CP) ${TOPDIR}/toolchain/eglibc/eglibc.config \
 		$(EGLIBC_BUILD_DIR_INITIAL)
 	(cd $(EGLIBC_BUILD_DIR_INITIAL); \

+ 1 - 1
toolchain/eglibc/Makefile.inc

@@ -2,7 +2,7 @@
 # material, please see the LICENCE file in the top-level directory.
 
 PKG_NAME:=		eglibc
-PKG_VERSION:=		2.10.1
+PKG_VERSION:=		2.11
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		1b5d08c87de09018dcabd9974ba754d4
 PKG_SITES:=		http://www.openadk.org/distfiles/

+ 42 - 26
toolchain/eglibc/eglibc.config

@@ -1,26 +1,42 @@
-OPTION_EGLIBC_ADVANCED_INET6=y
-OPTION_EGLIBC_BACKTRACE=n
-OPTION_EGLIBC_BSD=y
-OPTION_EGLIBC_CXX_TESTS=n
-OPTION_EGLIBC_CATGETS=y
-OPTION_EGLIBC_CHARSETS=y
-OPTION_EGLIBC_DB_ALIASES=y
-OPTION_EGLIBC_ENVZ=y
-OPTION_EGLIBC_FSTAB=y
-OPTION_EGLIBC_GETLOGIN=y
-OPTION_EGLIBC_INET=y
-OPTION_EGLIBC_LIBM=y
-OPTION_EGLIBC_LOCALES=n
-OPTION_EGLIBC_LOCALE_CODE=y
-OPTION_EGLIBC_NIS=n
-OPTION_EGLIBC_NSSWITCH=y
-OPTION_EGLIBC_RCMD=y
-OPTION_EGLIBC_SPAWN=y
-OPTION_EGLIBC_STREAMS=y
-OPTION_EGLIBC_SUNRPC=y
-OPTION_EGLIBC_UTMP=y
-OPTION_EGLIBC_UTMPX=y
-OPTION_EGLIBC_WORDEXP=y
-OPTION_POSIX_C_LANG_WIDE_CHAR=y
-OPTION_POSIX_REGEXP=y
-OPTION_POSIX_WIDE_CHAR_DEVICE_IO=y
+# This file sets default values for all option group variables
+# mentioned in option-groups.def; see that file for a description of
+# each option group.
+#
+# Subdirectory makefiles include this file before including the user's
+# settings from option-groups.config at the top of the build tree;
+# that file need only refer to those options whose default settings
+# are to be changed.
+#
+# By default, all option groups are enabled.
+OPTION_EGLIBC_ADVANCED_INET6 = y
+OPTION_EGLIBC_BACKTRACE = n
+OPTION_EGLIBC_BIG_MACROS = y
+OPTION_EGLIBC_BSD = y
+OPTION_EGLIBC_CXX_TESTS = n
+OPTION_EGLIBC_CATGETS = n
+OPTION_EGLIBC_CHARSETS = n
+OPTION_EGLIBC_DB_ALIASES = n
+OPTION_EGLIBC_ENVZ = y
+OPTION_EGLIBC_FCVT = y
+OPTION_EGLIBC_FMTMSG = y
+OPTION_EGLIBC_FSTAB = y
+OPTION_EGLIBC_FTRAVERSE = y
+OPTION_EGLIBC_GETLOGIN = y
+OPTION_EGLIBC_INET = y
+OPTION_EGLIBC_LIBM = y
+OPTION_EGLIBC_LOCALES = n
+OPTION_EGLIBC_LOCALE_CODE = n
+OPTION_EGLIBC_MEMUSAGE = y
+OPTION_EGLIBC_NIS = n
+OPTION_EGLIBC_NSSWITCH = n
+OPTION_EGLIBC_RCMD = y
+OPTION_EGLIBC_SPAWN = y
+OPTION_EGLIBC_STREAMS = y
+OPTION_EGLIBC_SUNRPC = y
+OPTION_EGLIBC_UTMP = y
+OPTION_EGLIBC_UTMPX = y
+OPTION_EGLIBC_WORDEXP = y
+OPTION_POSIX_C_LANG_WIDE_CHAR = y
+OPTION_POSIX_REGEXP = y
+OPTION_POSIX_REGEXP_GLIBC = n
+OPTION_POSIX_WIDE_CHAR_DEVICE_IO = y

+ 3 - 3
toolchain/glibc/Makefile.inc

@@ -2,7 +2,7 @@
 # material, please see the LICENCE file in the top-level directory.
 
 PKG_NAME:=		glibc
-PKG_VERSION:=		2.10.1
+PKG_VERSION:=		2.11
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		adfbd93cada84dc16259f4dffa60dc34
-PKG_SITES:=		http://www.openadk.org/distfiles
+PKG_MD5SUM:=		55d50abb2d7c366bde6fb5e35e681f9b
+PKG_SITES:=		${MASTER_SITE_GNU:=glibc/}