From 07518486f6be665a75684a13604de194b1428e3c Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 12 Nov 2009 22:41:29 +0100
Subject: libnsl is needed for java 1.6

---
 package/glibc/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package/glibc')

diff --git a/package/glibc/Makefile b/package/glibc/Makefile
index c068c3606..3cd49f64b 100644
--- a/package/glibc/Makefile
+++ b/package/glibc/Makefile
@@ -41,7 +41,7 @@ ifeq ($(ADK_SSP),y)
 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 libresolv librt libutil libnss_compat libnss_dns libnss_files; do \
+	-for file in libc libcrypt libdl libm libnsl libresolv librt libutil libnss_compat libnss_dns libnss_files; do \
 		$(CP) $(STAGING_DIR)/lib/$$file.so* $(IDIR_GLIBC)/lib/; \
 		$(CP) $(STAGING_DIR)/lib/$$file-$(PKG_VERSION).so $(IDIR_GLIBC)/lib/; \
 	done
-- 
cgit v1.2.3


From 25631be7315cdddc0cf2ea273f3e06332128d36d Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 19 Dec 2009 18:33:02 +0100
Subject: update eglic and glibc

---
 package/glibc/Makefile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'package/glibc')

diff --git a/package/glibc/Makefile b/package/glibc/Makefile
index 3cd49f64b..7173ab83f 100644
--- a/package/glibc/Makefile
+++ b/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 \
-- 
cgit v1.2.3


From 274f4690d3d1e7107a47a94563b4a13c5e472d42 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 19 Dec 2009 19:21:08 +0100
Subject: install libc headers only when selected

---
 package/glibc/Makefile | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'package/glibc')

diff --git a/package/glibc/Makefile b/package/glibc/Makefile
index 7173ab83f..45145d230 100644
--- a/package/glibc/Makefile
+++ b/package/glibc/Makefile
@@ -30,10 +30,12 @@ GLIBC_CONFOPTS:=          \
 $(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:
+SUB_INSTALLS-y:=
+SUB_INSTALLS-m:=
+SUB_INSTALLS-${ADK_PACKAGE_GLIBC_DEV}+=		glibc-dev-install
 
-# do nothing, glibc is already build in toolchain directory
-do-install:
+# compile nothing, glibc is already build in toolchain directory
+do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	${INSTALL_DIR} $(IDIR_GLIBC)/lib $(IDIR_GLIBC)/etc
 	# install /etc/localtime from host system (FIXME)
 	${CP} /etc/localtime $(IDIR_GLIBC)/etc
@@ -45,8 +47,11 @@ do-install:
 	done
 	# create ld.so link for mips gcc linker option
 	cd $(IDIR_GLIBC)/lib && ln -sf ld-linux.so.2 ld.so.1
+
+glibc-dev-install:
 	# header package
-	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) ARCH=$(ARCH) V=1 \
+	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) \
+		HOSTCC=$(HOSTCC) ARCH=$(ARCH) V=1 \
 		INSTALL_HDR_PATH=$(IDIR_GLIBC_DEV)/usr \
 		headers_install
 	(cd $(WRKBUILD); \
@@ -61,6 +66,6 @@ do-install:
 		install-headers
 	touch $(IDIR_GLIBC_DEV)/usr/include/gnu/stubs.h
 	touch $(IDIR_GLIBC_DEV)/usr/include/bits/stdio_lim.h
-	@find $(IDIR_GLIBC_DEV) -name .install -delete
+	@find $(IDIR_GLIBC_DEV) -name .install -exec rm {} \;
 
 include ${TOPDIR}/mk/pkg-bottom.mk
-- 
cgit v1.2.3


From 1fda4ed40fe7fbab5db517a79ff8b13b33ca9355 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 19 Dec 2009 19:21:47 +0100
Subject: allow headers to be installed as package

---
 package/glibc/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package/glibc')

diff --git a/package/glibc/Config.in b/package/glibc/Config.in
index b6879a384..6e7db32c9 100644
--- a/package/glibc/Config.in
+++ b/package/glibc/Config.in
@@ -9,7 +9,7 @@ config ADK_PACKAGE_GLIBC
 
 config ADK_PACKAGE_GLIBC_DEV
 	prompt "glibc-dev........................... development files"
-	bool
+	tristate
 	default n
 	depends on ADK_TARGET_LIB_GLIBC
 	help
-- 
cgit v1.2.3


From df61b169d3a4346838057be456fbf99261d7f749 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 20 Dec 2009 18:15:38 +0100
Subject: add some manual menu entries for important packages

---
 package/glibc/Config.in.manual | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 package/glibc/Config.in.manual

(limited to 'package/glibc')

diff --git a/package/glibc/Config.in.manual b/package/glibc/Config.in.manual
new file mode 100644
index 000000000..6e01cfb02
--- /dev/null
+++ b/package/glibc/Config.in.manual
@@ -0,0 +1,21 @@
+config ADK_COMPILE_GLIBC
+	tristate
+	depends on ADK_PACKAGE_GLIBC
+	default n
+
+config ADK_PACKAGE_GLIBC
+	prompt "glibc............................. GNU C library"
+	boolean
+	select ADK_COMPILE_GLIBC
+	depends on ADK_TARGET_LIB_GLIBC
+	default y if ADK_TARGET_LIB_GLIBC && !ADK_TOOLCHAIN_ONLY
+	help
+	  GNU C library
+
+config ADK_PACKAGE_GLIBC_DEV
+	prompt "glibc-dev.......................... GNU C library header files"
+	tristate
+	default n
+	depends on ADK_TARGET_LIB_GLIBC
+	help
+	  GNU C library header files
-- 
cgit v1.2.3


From ce621815fecece2b4d8a4cb7115eb82c1cb7ed44 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 23 Dec 2009 11:37:42 +0100
Subject: remove and ignore autogenerated Config.in files

---
 package/glibc/Config.in | 18 ------------------
 1 file changed, 18 deletions(-)
 delete mode 100644 package/glibc/Config.in

(limited to 'package/glibc')

diff --git a/package/glibc/Config.in b/package/glibc/Config.in
deleted file mode 100644
index b6879a384..000000000
--- a/package/glibc/Config.in
+++ /dev/null
@@ -1,18 +0,0 @@
-config ADK_PACKAGE_GLIBC
-	prompt "glibc............................... GNU C library"
-	bool
-	default y if ADK_TARGET_LIB_GLIBC && !ADK_TOOLCHAIN_ONLY
-	default n
-	depends on ADK_TARGET_LIB_GLIBC
-	help
-	  GNU C library.
-
-config ADK_PACKAGE_GLIBC_DEV
-	prompt "glibc-dev........................... development files"
-	bool
-	default n
-	depends on ADK_TARGET_LIB_GLIBC
-	help
-	  GNU C library header files.
-
-
-- 
cgit v1.2.3


From 74b82b8b841c83dd370d2109cb7d2ce2e2f8e00b Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 30 Jan 2010 22:03:39 +0100
Subject: fix eglibc dev package and group alix/wrap devices

---
 package/glibc/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'package/glibc')

diff --git a/package/glibc/Makefile b/package/glibc/Makefile
index 45145d230..103452469 100644
--- a/package/glibc/Makefile
+++ b/package/glibc/Makefile
@@ -45,10 +45,10 @@ do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 		$(CP) $(STAGING_DIR)/lib/$$file.so* $(IDIR_GLIBC)/lib/; \
 		$(CP) $(STAGING_DIR)/lib/$$file-$(PKG_VERSION).so $(IDIR_GLIBC)/lib/; \
 	done
-	# create ld.so link for mips gcc linker option
-	cd $(IDIR_GLIBC)/lib && ln -sf ld-linux.so.2 ld.so.1
 
 glibc-dev-install:
+	${INSTALL_DIR} $(IDIR_GLIBC_DEV)/lib
+	cd $(IDIR_GLIBC_DEV)/lib && ln -sf ld-linux.so.2 ld.so.1
 	# header package
 	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) \
 		HOSTCC=$(HOSTCC) ARCH=$(ARCH) V=1 \
-- 
cgit v1.2.3


From cae7454e8151e56da5f0b9f14a06fbcefe153a72 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 31 Jan 2010 11:11:18 +0100
Subject: rework libc-dev package, add linker script for x86

---
 package/glibc/Makefile             | 7 +++++--
 package/glibc/files/libc.so.x86    | 5 +++++
 package/glibc/files/libc.so.x86_64 | 5 +++++
 3 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 package/glibc/files/libc.so.x86
 create mode 100644 package/glibc/files/libc.so.x86_64

(limited to 'package/glibc')

diff --git a/package/glibc/Makefile b/package/glibc/Makefile
index 103452469..27f5baafc 100644
--- a/package/glibc/Makefile
+++ b/package/glibc/Makefile
@@ -47,8 +47,11 @@ do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	done
 
 glibc-dev-install:
-	${INSTALL_DIR} $(IDIR_GLIBC_DEV)/lib
-	cd $(IDIR_GLIBC_DEV)/lib && ln -sf ld-linux.so.2 ld.so.1
+	${INSTALL_DIR} $(IDIR_GLIBC_DEV)/lib $(IDIR_GLIBC_DEV)/usr/lib
+	# install linker script
+	-cp ./files/libc.so.$(ARCH) $(IDIR_GLIBC_DEV)/usr/lib/libc.so
+	${CP} ${STAGING_DIR}/usr/lib/crt* ${IDIR_GLIBC_DEV}/usr/lib
+	${CP} ${STAGING_DIR}/usr/lib/libc_nonshared.a ${IDIR_GLIBC_DEV}/usr/lib
 	# header package
 	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) \
 		HOSTCC=$(HOSTCC) ARCH=$(ARCH) V=1 \
diff --git a/package/glibc/files/libc.so.x86 b/package/glibc/files/libc.so.x86
new file mode 100644
index 000000000..cd8724cc5
--- /dev/null
+++ b/package/glibc/files/libc.so.x86
@@ -0,0 +1,5 @@
+/* GNU ld script
+   Use the shared library, but some functions are only in
+   the static library, so try that secondarily.  */
+OUTPUT_FORMAT(elf32-i386)
+GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a  AS_NEEDED ( /lib/ld-linux.so.2 ) )
diff --git a/package/glibc/files/libc.so.x86_64 b/package/glibc/files/libc.so.x86_64
new file mode 100644
index 000000000..a2e2de87f
--- /dev/null
+++ b/package/glibc/files/libc.so.x86_64
@@ -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-x86-64)
+      GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a  AS_NEEDED ( /lib/ld-linux-x86-64.so.2 ) )
-- 
cgit v1.2.3


From 6daa792eab1488d013fefc5eb7e4d01f40f38687 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 7 Feb 2010 20:03:20 +0100
Subject: change defaults for CONFIG/BUILD/INSTALL styles

All packages need an update, so here is a very huge commit.
Most of the 460 source packages use automatic style for configuration,
building and installing. Make these styles default to "auto".
If you have a package, which does not conform to this, just use
manual style and add a do-$task make target.

I added a new style named AUTOTOOL style, which is needed for some
broken packages, which needs to be updated via autoconf or automake.

I renamed CONFIGURE_STYLE to CONFIG_STYLE.

Updates for some packages, which have newer upstream versions.

Renaming of all package/*/extra directories. Use the directory
src/ to provide overwrites of source files or to add the code, when
no upstream package is available or used. src directory will be automatically
used.
---
 package/glibc/Makefile | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'package/glibc')

diff --git a/package/glibc/Makefile b/package/glibc/Makefile
index 27f5baafc..ddda531a9 100644
--- a/package/glibc/Makefile
+++ b/package/glibc/Makefile
@@ -30,6 +30,10 @@ GLIBC_CONFOPTS:=          \
 $(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}))
 
+CONFIG_STYLE:=		manual
+BUILD_STYLE:=		manual
+INSTALL_STYLE:=		manual
+
 SUB_INSTALLS-y:=
 SUB_INSTALLS-m:=
 SUB_INSTALLS-${ADK_PACKAGE_GLIBC_DEV}+=		glibc-dev-install
-- 
cgit v1.2.3


From 58d5b9279d9c28e0acd5bde9f9e02a001ac2c736 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 27 Feb 2010 22:26:39 +0100
Subject: update lemote target to 2.6.33

- fix libc-dev packages
- fix cryptinit target
---
 package/glibc/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'package/glibc')

diff --git a/package/glibc/Makefile b/package/glibc/Makefile
index ddda531a9..084a71918 100644
--- a/package/glibc/Makefile
+++ b/package/glibc/Makefile
@@ -57,12 +57,12 @@ glibc-dev-install:
 	${CP} ${STAGING_DIR}/usr/lib/crt* ${IDIR_GLIBC_DEV}/usr/lib
 	${CP} ${STAGING_DIR}/usr/lib/libc_nonshared.a ${IDIR_GLIBC_DEV}/usr/lib
 	# header package
-	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) \
+	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-linux-$(KERNEL_VERSION)-$(KERNEL_RELEASE)/linux-$(KERNEL_VERSION) \
 		HOSTCC=$(HOSTCC) ARCH=$(ARCH) V=1 \
 		INSTALL_HDR_PATH=$(IDIR_GLIBC_DEV)/usr \
 		headers_install
 	(cd $(WRKBUILD); \
-		$(TOOLCHAIN_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/configure \
+		$(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/$(PKG_NAME)-$(PKG_VERSION)/configure \
 		--prefix=/usr \
 		--with-sysroot=$(IDIR_GLIBC_DEV) \
 		${GLIBC_CONFOPTS} \
-- 
cgit v1.2.3