summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/busybox/Makefile12
-rw-r--r--package/busybox/patches/patch-include_libbb_h18
-rw-r--r--package/busybox/patches/patch-include_platform_h47
-rw-r--r--package/eglibc/Config.in0
-rw-r--r--package/eglibc/Config.in.manual21
-rw-r--r--package/eglibc/Makefile20
-rw-r--r--package/glibc/Config.in0
-rw-r--r--package/glibc/Config.in.manual21
-rw-r--r--package/glibc/Makefile19
-rw-r--r--package/linux-atm/Makefile1
-rw-r--r--package/ncurses/Makefile1
-rw-r--r--package/uclibc++/Config.in0
-rw-r--r--package/uclibc++/Config.in.manual8
-rw-r--r--package/uclibc/Config.in0
-rw-r--r--package/uclibc/Config.in.manual23
-rw-r--r--package/uclibc/Makefile12
16 files changed, 138 insertions, 65 deletions
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 6a0569428..78b741ca3 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -24,30 +24,30 @@ ifeq ($(ADK_NATIVE),y)
yes '' | \
$(MAKE) V=1 \
IPKG_ARCH="$(ARCH)" \
- ARCH="$(ARCH)" -C $(WRKBUILD) oldconfig
+ ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) oldconfig
else
yes '' | \
$(MAKE) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \
EXTRA_CFLAGS="$(TARGET_CFLAGS)" IPKG_ARCH="$(ARCH)" \
- ARCH="$(ARCH)" -C $(WRKBUILD) oldconfig
+ ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) oldconfig
endif
do-build:
ifeq ($(ADK_NATIVE),y)
$(MAKE) V=1 \
- IPKG_ARCH="$(ARCH)" ARCH="$(ARCH)" -C $(WRKBUILD) busybox
+ IPKG_ARCH="$(ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) busybox
else
$(MAKE) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \
- IPKG_ARCH="$(ARCH)" ARCH="$(ARCH)" -C $(WRKBUILD) busybox
+ IPKG_ARCH="$(ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) busybox
endif
do-install: ${TOPDIR}/.config
ifeq ($(ADK_NATIVE),y)
$(MAKE) V=1 \
- IPKG_ARCH="$(ARCH)" ARCH="$(ARCH)" -C $(WRKBUILD) install
+ IPKG_ARCH="$(ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) install
else
$(MAKE) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \
- IPKG_ARCH="$(ARCH)" ARCH="$(ARCH)" -C $(WRKBUILD) install
+ IPKG_ARCH="$(ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) install
endif
ifeq ($(DEBUG),1)
${INSTALL_BIN} $(WRKBUILD)/busybox_unstripped \
diff --git a/package/busybox/patches/patch-include_libbb_h b/package/busybox/patches/patch-include_libbb_h
new file mode 100644
index 000000000..0087dbde5
--- /dev/null
+++ b/package/busybox/patches/patch-include_libbb_h
@@ -0,0 +1,18 @@
+--- busybox-1.15.2.orig/include/libbb.h Thu Oct 8 03:04:16 2009
++++ busybox-1.15.2/include/libbb.h Sat Dec 19 12:42:57 2009
+@@ -48,6 +48,7 @@
+ #define PATH_MAX 256
+ #endif
+
++#if !(defined __APPLE__ || defined __FreeBSD__ || defined __MirBSD__ )
+ #ifdef HAVE_MNTENT_H
+ #include <mntent.h>
+ #endif
+@@ -61,6 +62,7 @@
+ #include <selinux/context.h>
+ #include <selinux/flask.h>
+ #include <selinux/av_permissions.h>
++#endif
+ #endif
+
+ #if ENABLE_LOCALE_SUPPORT
diff --git a/package/busybox/patches/patch-include_platform_h b/package/busybox/patches/patch-include_platform_h
new file mode 100644
index 000000000..7c5539efe
--- /dev/null
+++ b/package/busybox/patches/patch-include_platform_h
@@ -0,0 +1,47 @@
+--- busybox-1.15.2.orig/include/platform.h Sat Sep 26 15:14:33 2009
++++ busybox-1.15.2/include/platform.h Sat Dec 19 12:53:00 2009
+@@ -7,6 +7,8 @@
+ #ifndef BB_PLATFORM_H
+ #define BB_PLATFORM_H 1
+
++#include <sys/param.h>
++
+ /* Convenience macros to test the version of gcc. */
+ #undef __GNUC_PREREQ
+ #if defined __GNUC__ && defined __GNUC_MINOR__
+@@ -133,7 +135,7 @@ char *strchrnul(const char *s, int c);
+ # define bswap_32 __bswap32
+ # define bswap_16 __bswap16
+ # define __BIG_ENDIAN__ (_BYTE_ORDER == _BIG_ENDIAN)
+-#elif !defined __APPLE__
++#elif !(defined __APPLE__ || defined BSD)
+ # include <byteswap.h>
+ # include <endian.h>
+ #endif
+@@ -190,7 +192,7 @@ char *strchrnul(const char *s, int c);
+
+ /* ---- Networking ------------------------------------------ */
+
+-#ifndef __APPLE__
++#if !(defined __APPLE__ || defined BSD)
+ # include <arpa/inet.h>
+ # if !defined(__socklen_t_defined) && !defined(_SOCKLEN_T_DECLARED)
+ typedef int socklen_t;
+@@ -202,7 +204,7 @@ typedef int socklen_t;
+ /* ---- Compiler dependent settings ------------------------- */
+
+ #if (defined __digital__ && defined __unix__) \
+- || defined __APPLE__ || defined __FreeBSD__
++ || defined __APPLE__ || defined __FreeBSD__ || defined BSD
+ # undef HAVE_MNTENT_H
+ # undef HAVE_SYS_STATFS_H
+ #else
+@@ -231,7 +233,7 @@ typedef int socklen_t;
+ # define HAVE_FEATURES_H
+ # include <stdint.h>
+ # define HAVE_STDINT_H
+-#elif !defined __APPLE__
++#elif !(defined __APPLE__ || defined BSD)
+ /* Largest integral types. */
+ # if BB_BIG_ENDIAN
+ /* Looks BROKEN! */
diff --git a/package/eglibc/Config.in b/package/eglibc/Config.in
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/package/eglibc/Config.in
diff --git a/package/eglibc/Config.in.manual b/package/eglibc/Config.in.manual
index 437bef949..6e1daf463 100644
--- a/package/eglibc/Config.in.manual
+++ b/package/eglibc/Config.in.manual
@@ -1,22 +1,17 @@
-config ADK_COMPILE_EGLIBC
- tristate
- depends on ADK_PACKAGE_EGLIBC || ADK_PACKAGE_EGLIBC_DEV
- default n
-
config ADK_PACKAGE_EGLIBC
- prompt "eglibc............................ embedded GNU C library"
- boolean
- select ADK_COMPILE_EGLIBC
- depends on ADK_TARGET_LIB_EGLIBC
+ prompt "eglibc............................... embedded GNU C library"
+ bool
default y if ADK_TARGET_LIB_EGLIBC && !ADK_TOOLCHAIN_ONLY
+ default n
+ depends on ADK_TARGET_LIB_EGLIBC
help
- embedded GNU C library
+ embedded GNU C library.
config ADK_PACKAGE_EGLIBC_DEV
- prompt "eglibc-dev........................ embedded GNU C library header files"
+ prompt "eglibc-dev........................... development files"
tristate
default n
- select ADK_COMPILE_EGLIBC
depends on ADK_TARGET_LIB_EGLIBC
help
- embedded GNU C library header files
+ embedded GNU C library header files.
+
diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile
index a7cf97fbe..de7c80e45 100644
--- a/package/eglibc/Makefile
+++ b/package/eglibc/Makefile
@@ -14,6 +14,10 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,EGLIBC,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
$(eval $(call PKG_template,EGLIBC_DEV,$(PKG_NAME)-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+SUB_INSTALLS-y:=
+SUB_INSTALLS-m:=
+SUB_INSTALLS-${ADK_PACKAGE_EGLIBC_DEV}+= eglibc-dev-install
+
EGLIBC_CONFOPTS:= \
--build=$(GNU_HOST_NAME) \
--host=$(REAL_GNU_TARGET_NAME) \
@@ -40,16 +44,11 @@ EGLIBC_ENV:= PATH='${TARGET_PATH}' \
libc_cv_gnu99_inline=yes \
libc_cv_slibdir="/lib"
-do-extract:
-
-# do nothing, eglibc is already build in toolchain directory
-do-install:
+# compile nothing, eglibc is already build in toolchain directory
+do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
${INSTALL_DIR} $(IDIR_EGLIBC)/lib $(IDIR_EGLIBC)/etc $(IDIR_EGLIBC)/usr/lib
# install /etc/localtime from host system (FIXME)
${CP} /etc/localtime $(IDIR_EGLIBC)/etc
-ifeq ($(ADK_SSP),y)
- $(CP) $(STAGING_DIR)/lib/libssp.so* $(IDIR_EGLIBC)/lib/
-endif
$(CP) $(STAGING_DIR)/lib/ld-* $(IDIR_EGLIBC)/lib/
$(CP) $(STAGING_DIR)/lib/libgcc_s.so* $(IDIR_EGLIBC)/lib/
-for file in libc libcrypt libdl libm libnsl libresolv librt libutil libnss_compat libnss_dns libnss_files; do \
@@ -63,8 +62,11 @@ endif
cd $(IDIR_EGLIBC)/lib && ln -sf librt.so.1 librt.so
cd $(IDIR_EGLIBC)/lib && ln -sf libcrypt.so.1 libcrypt.so
cd $(IDIR_EGLIBC)/lib && ln -sf libdl.so.2 libdl.so
+
+eglibc-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_EGLIBC_DEV)/usr \
headers_install
(cd $(WRKBUILD); \
@@ -77,6 +79,6 @@ endif
PATH='${TARGET_PATH}' \
$(MAKE) -C $(WRKBUILD) \
install-headers install-bootstrap-headers=yes
- @find $(IDIR_EGLIBC_DEV) -name .install -delete
+ @find $(IDIR_EGLIBC_DEV) -name .install -exec rm {} \;
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/glibc/Config.in b/package/glibc/Config.in
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/package/glibc/Config.in
diff --git a/package/glibc/Config.in.manual b/package/glibc/Config.in.manual
index 6e01cfb02..6e7db32c9 100644
--- a/package/glibc/Config.in.manual
+++ b/package/glibc/Config.in.manual
@@ -1,21 +1,18 @@
-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
+ 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
+ GNU C library.
config ADK_PACKAGE_GLIBC_DEV
- prompt "glibc-dev.......................... GNU C library header files"
+ prompt "glibc-dev........................... development files"
tristate
default n
depends on ADK_TARGET_LIB_GLIBC
help
- GNU C library header files
+ GNU C library header files.
+
+
diff --git a/package/glibc/Makefile b/package/glibc/Makefile
index 3cd49f64b..45145d230 100644
--- a/package/glibc/Makefile
+++ b/package/glibc/Makefile
@@ -28,17 +28,17 @@ 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:
+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
-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 \
@@ -47,8 +47,11 @@ endif
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); \
@@ -63,6 +66,6 @@ endif
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
diff --git a/package/linux-atm/Makefile b/package/linux-atm/Makefile
index b3a8fbd48..3e6089d9e 100644
--- a/package/linux-atm/Makefile
+++ b/package/linux-atm/Makefile
@@ -11,6 +11,7 @@ PKG_DESCR:= ATM library and tools for Linux
PKG_SECTION:= libs
PKG_URL:= http://linux-atm.sourceforge.net
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=linux-atm/}
+PKG_NOPARALLEL:= 1
PKG_HOST_DEPENDS:= !freebsd
diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile
index 35da4cb09..c3997b060 100644
--- a/package/ncurses/Makefile
+++ b/package/ncurses/Makefile
@@ -48,6 +48,7 @@ pre-configure:
(cd ${WRKBUILD}; rm -rf config.{cache,status} ; \
./configure \
--with-build-cc=${HOSTCC} \
+ --with-shared \
--with-progs \
);
${MAKE} -C ${WRKBUILD}/include
diff --git a/package/uclibc++/Config.in b/package/uclibc++/Config.in
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/package/uclibc++/Config.in
diff --git a/package/uclibc++/Config.in.manual b/package/uclibc++/Config.in.manual
new file mode 100644
index 000000000..04a11d4cf
--- /dev/null
+++ b/package/uclibc++/Config.in.manual
@@ -0,0 +1,8 @@
+config ADK_PACKAGE_UCLIBCXX
+ prompt "uClibc++.......................... C++ library for embedded systems"
+ tristate
+ depends on ADK_TARGET_LIB_UCLIBC
+ default n
+ help
+ A standard C++ library for embedded systems
+
diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/package/uclibc/Config.in
diff --git a/package/uclibc/Config.in.manual b/package/uclibc/Config.in.manual
index f30254817..4100fd313 100644
--- a/package/uclibc/Config.in.manual
+++ b/package/uclibc/Config.in.manual
@@ -1,22 +1,17 @@
-config ADK_COMPILE_UCLIBC
- tristate
- depends on ADK_PACKAGE_UCLIBC || ADK_PACKAGE_UCLIBC_DEV
- default n
-
config ADK_PACKAGE_UCLIBC
- prompt "uclibc............................ embedded C library"
- boolean
- select ADK_COMPILE_UCLIBC
- depends on ADK_TARGET_LIB_UCLIBC
+ prompt "uClibc............................... embedded C library"
+ bool
default y if ADK_TARGET_LIB_UCLIBC && !ADK_TOOLCHAIN_ONLY
+ default n
+ depends on ADK_TARGET_LIB_UCLIBC
help
- embedded C library
+ Embedded C library.
config ADK_PACKAGE_UCLIBC_DEV
- prompt "uclibc-dev........................ embedded C library header files"
+ prompt "uClibc-dev........................... development files"
tristate
- depends on ADK_TARGET_LIB_UCLIBC
- select ADK_COMPILE_UCLIBC
default n
+ depends on ADK_TARGET_LIB_UCLIBC
help
- embedded C library header files
+ C library header files.
+
diff --git a/package/uclibc/Makefile b/package/uclibc/Makefile
index c89e20fe6..e6d080a37 100644
--- a/package/uclibc/Makefile
+++ b/package/uclibc/Makefile
@@ -14,8 +14,12 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,UCLIBC,uclibc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
$(eval $(call PKG_template,UCLIBC_DEV,uclibc-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+SUB_INSTALLS-y:=
+SUB_INSTALLS-m:=
+SUB_INSTALLS-${ADK_PACKAGE_UCLIBC_DEV}+= uclibc-dev-install
+
# do nothing, uClibc is already build in toolchain directory
-do-install:
+do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
${INSTALL_DIR} $(IDIR_UCLIBC)/lib $(IDIR_UCLIBC)/etc
# create timezone file
echo 'CET-1CEST-2,M3.5.0/02:00:00,M10.5.0/03:00:00' > $(IDIR_UCLIBC)/etc/TZ
@@ -28,6 +32,8 @@ do-install:
$(CP) $(STAGING_DIR)/lib/$$file.so* $(IDIR_UCLIBC)/lib/; \
$(CP) $(STAGING_DIR)/lib/$$file-$(PKG_VERSION).so $(IDIR_UCLIBC)/lib/; \
done
+
+uclibc-dev-install:
# header package
$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) ARCH=$(ARCH) V=1 \
INSTALL_HDR_PATH=$(IDIR_UCLIBC_DEV)/usr \
@@ -39,7 +45,7 @@ do-install:
HOSTCC="$(HOSTCC)" \
CPU_CFLAGS="$(TARGET_CFLAGS)" \
install_headers
- @find $(IDIR_UCLIBC_DEV) -name .install -delete
- @find $(IDIR_UCLIBC_DEV) -name ..install.cmd -delete
+ @find $(IDIR_UCLIBC_DEV) -name .install -exec rm {} \;
+ @find $(IDIR_UCLIBC_DEV) -name ..install.cmd -exec rm {} \;
include ${TOPDIR}/mk/pkg-bottom.mk
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-28 07:23:41 +0000