summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-03-08 13:22:39 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2011-03-08 13:22:39 +0100
commit63e65ec30b763d6687d462c52cb46bd5e738928a (patch)
tree94ad1ac6c4173e25dc0efe55f37fb315ceb0fad9
parent64675d95e1b87309eade277d1625ae2d4740407d (diff)
cosmetic changes
-rw-r--r--package/bridge-utils/Makefile6
-rw-r--r--package/db/Makefile2
-rw-r--r--package/eglibc/Config.in.manual4
-rw-r--r--package/font-util/Makefile4
-rw-r--r--package/gzip/Makefile2
-rw-r--r--package/libIDL/Makefile6
-rw-r--r--package/rng-tools/Makefile4
-rw-r--r--toolchain/Config.in18
8 files changed, 26 insertions, 20 deletions
diff --git a/package/bridge-utils/Makefile b/package/bridge-utils/Makefile
index 1eca25805..fdf7a805b 100644
--- a/package/bridge-utils/Makefile
+++ b/package/bridge-utils/Makefile
@@ -15,13 +15,13 @@ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=bridge/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,BRIDGE_UTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,BRIDGE_UTILS,bridge-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ARGS+= --with-linux-headers=${LINUX_DIR}
-post-install:
+bridge-utils-install:
${INSTALL_DIR} ${IDIR_BRIDGE_UTILS}/usr/sbin
${INSTALL_BIN} ${WRKINST}/usr/sbin/brctl \
- ${IDIR_BRIDGE_UTILS}/usr/sbin/
+ ${IDIR_BRIDGE_UTILS}/usr/sbin
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/db/Makefile b/package/db/Makefile
index 9038b74eb..4b6a64643 100644
--- a/package/db/Makefile
+++ b/package/db/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 4.7.25
PKG_RELEASE:= 1
PKG_MD5SUM:= ec2b87e833779681a0c3a814aa71359e
PKG_DESCR:= disk file format database which stores key/data-pairs in single files
-PKG_SECTION:= libs
+PKG_SECTION:= db
PKG_URL:= http://www.oracle.com/technology/software/products/berkeley-db
PKG_SITES:= http://www.openadk.org/distfiles/
PKG_NEED_CXX:= 1
diff --git a/package/eglibc/Config.in.manual b/package/eglibc/Config.in.manual
index e8c14eb0d..d74c585f8 100644
--- a/package/eglibc/Config.in.manual
+++ b/package/eglibc/Config.in.manual
@@ -1,5 +1,5 @@
config ADK_PACKAGE_EGLIBC
- prompt "eglibc................. embedded GNU C library"
+ prompt "eglibc............... embedded GNU C library"
bool
default y if ADK_TARGET_LIB_EGLIBC && !ADK_TOOLCHAIN_ONLY
default n
@@ -8,7 +8,7 @@ config ADK_PACKAGE_EGLIBC
embedded GNU C library.
config ADK_PACKAGE_EGLIBC_DEV
- prompt "eglibc-dev.............. development files"
+ prompt "eglibc-dev........... C library development files"
tristate
default n
depends on ADK_TARGET_LIB_EGLIBC
diff --git a/package/font-util/Makefile b/package/font-util/Makefile
index 8d8c37e13..af4f4d5e0 100644
--- a/package/font-util/Makefile
+++ b/package/font-util/Makefile
@@ -13,11 +13,13 @@ PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
PKG_SUBPKGS:= FONT_UTIL FONT_UTIL_DEV
+PKGSC_FONT_UTIL_DEV:= devel
+PKGSD_FONT_UTIL_DEV:= font util headers
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,FONT_UTIL,font-util,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,FONT_UTIL_DEV,font-util-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,FONT_UTIL_DEV,font-util-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_FONT_UTIL_DEV},${PKGSC_FONT_UTIL_DEV},${PKG_OPTS}))
# XXX: Push the mapping files to a place where we can find them
# again when compiling the actual fonts. This is ugly as hell,
diff --git a/package/gzip/Makefile b/package/gzip/Makefile
index bb6513099..fe9360030 100644
--- a/package/gzip/Makefile
+++ b/package/gzip/Makefile
@@ -20,6 +20,6 @@ FAKE_FLAGS+= prefix=${WRKINST}
gzip-install:
$(INSTALL_DIR) $(IDIR_GZIP)/usr/bin
- $(INSTALL_BIN) $(WRKINST)/bin/{gunzip,zcat,zgrep,gzip} $(IDIR_GZIP)/usr/bin
+ $(CP) $(WRKINST)/bin/gzip $(IDIR_GZIP)/usr/bin
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libIDL/Makefile b/package/libIDL/Makefile
index 89c0311d6..b26fd863d 100644
--- a/package/libIDL/Makefile
+++ b/package/libIDL/Makefile
@@ -12,12 +12,16 @@ PKG_SECTION:= libs
PKG_URL:= http://www.gnome.org/
PKG_SITES:= http://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/
+PKG_SUBPKGS:= LIBIDL LIBIDL_DEV
+PKGSD_LIBIDL_DEV:= libidl headers
+PKGSC_LIBIDL_DEV:= devel
+
include $(TOPDIR)/mk/package.mk
CONFIGURE_ENV+= libIDL_cv_long_long_format=ll
$(eval $(call PKG_template,LIBIDL,libidl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBIDL_DEV,libidl-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBIDL_DEV,libidl-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBIDL_DEV},${PKGSC_LIBIDL_DEV}))
libidl-install:
$(INSTALL_DIR) $(IDIR_LIBIDL)/usr/lib
diff --git a/package/rng-tools/Makefile b/package/rng-tools/Makefile
index 079a64f2e..d02dd04ad 100644
--- a/package/rng-tools/Makefile
+++ b/package/rng-tools/Makefile
@@ -16,9 +16,9 @@ PKG_CFLINE_RNG_TOOLS:= depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,RNG_TOOLS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,RNG_TOOLS,rng-tools,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+rng-tools-install:
$(INSTALL_DIR) $(IDIR_RNG_TOOLS)/usr/sbin
$(INSTALL_BIN) $(WRKINST)/usr/sbin/rngd $(IDIR_RNG_TOOLS)/usr/sbin
diff --git a/toolchain/Config.in b/toolchain/Config.in
index e86e9656f..8df7952b2 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -10,15 +10,15 @@ config ADK_TOOLCHAIN_GCC_CXX
boolean
default y
-config ADK_TOOLCHAIN_GCC_JAVA
- prompt "Enable building of GCJ (Java language support in GCC)"
- boolean
- default n
-
-config ADK_TOOLCHAIN_GCC_OBJC
- prompt "Enable building of Objective C compiler"
- boolean
- default n
+#config ADK_TOOLCHAIN_GCC_JAVA
+# prompt "Enable building of GCJ (Java language support in GCC)"
+# boolean
+# default n
+#
+#config ADK_TOOLCHAIN_GCC_OBJC
+# prompt "Enable building of Objective C compiler"
+# boolean
+# default n
config ADK_TOOLCHAIN_GCC_SSP
prompt "Enable Stack Smashing Protection in GCC"