summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mk/vars.mk7
-rw-r--r--package/busybox/config/editors/Config.in2
-rw-r--r--package/libvirt/Config.in1
-rw-r--r--package/libvirt/Makefile2
-rw-r--r--package/microperl/Makefile5
-rw-r--r--package/openssl/Makefile20
6 files changed, 21 insertions, 16 deletions
diff --git a/mk/vars.mk b/mk/vars.mk
index b3215a24c..63130507f 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -39,9 +39,14 @@ TARGET_DIR_PFX:= $(BASE_DIR)/root_*
TARGET_PATH= ${SCRIPT_DIR}:${STAGING_TOOLS}/bin:${STAGING_DIR}/scripts:${_PATH}
REAL_GNU_TARGET_NAME= $(CPU_ARCH)-linux-$(ADK_TARGET_SUFFIX)
GNU_TARGET_NAME= $(CPU_ARCH)-linux
-TARGET_CROSS:= $(STAGING_TOOLS)/bin/$(CPU_ARCH)-linux-$(ADK_TARGET_SUFFIX)-
TOOLCHAIN_SYSROOT:= $(TOOLCHAIN_BUILD_DIR)/libc_dev
+ifeq ($(ADK_NATIVE),y)
+TARGET_COMPILER_PREFIX?=
+TARGET_CROSS:=
+else
TARGET_COMPILER_PREFIX?=${TARGET_CROSS}
+TARGET_CROSS:= $(STAGING_TOOLS)/bin/$(CPU_ARCH)-linux-$(ADK_TARGET_SUFFIX)-
+endif
TARGET_CC:= ${TARGET_COMPILER_PREFIX}gcc
TARGET_CXX:= ${TARGET_COMPILER_PREFIX}g++
TARGET_CPPFLAGS+= -I${STAGING_DIR}/usr/include
diff --git a/package/busybox/config/editors/Config.in b/package/busybox/config/editors/Config.in
index ad46c649b..0d598af4c 100644
--- a/package/busybox/config/editors/Config.in
+++ b/package/busybox/config/editors/Config.in
@@ -22,7 +22,7 @@ config BUSYBOX_FEATURE_AWK_LIBM
config BUSYBOX_CMP
bool "cmp"
- default n
+ default y
help
cmp is used to compare two files and returns the result
to standard output.
diff --git a/package/libvirt/Config.in b/package/libvirt/Config.in
index 9084bcfb2..b378722b8 100644
--- a/package/libvirt/Config.in
+++ b/package/libvirt/Config.in
@@ -1,6 +1,7 @@
config ADK_PACKAGE_LIBVIRT
prompt "libvirt........................... virtualization API"
tristate
+ select ADK_PACKAGE_PYTHON
select ADK_PACKAGE_LIBXML2
select ADK_PACKAGE_LIBGNUTLS
select ADK_PACKAGE_BRIDGE_UTILS
diff --git a/package/libvirt/Makefile b/package/libvirt/Makefile
index 0ff316c00..f40800ded 100644
--- a/package/libvirt/Makefile
+++ b/package/libvirt/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= 8c2c14a7695c9c661004bcfc6468d62d
PKG_DESCR:= virtualization API
PKG_SECTION:= utils
-PKG_DEPENDS:= libxml2 libgnutls
+PKG_DEPENDS:= libxml2 libgnutls python
PKG_URL:= http://www.libvirt.org
PKG_SITES:= ftp://libvirt.org/libvirt/
diff --git a/package/microperl/Makefile b/package/microperl/Makefile
index 359357462..9e3ab4fff 100644
--- a/package/microperl/Makefile
+++ b/package/microperl/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= microperl
PKG_VERSION:= 5.10.0
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= d2c39b002ebfd2c3c5dba589365c5a71
PKG_DESCR:= Perl without operating-specific functions
PKG_SECTION:= net
@@ -31,6 +31,9 @@ pre-configure:
do-install:
${INSTALL_DIR} ${IDIR_MICROPERL}/usr/bin
+ ${INSTALL_DIR} ${IDIR_MICROPERL}/usr/lib/perl5/${PKG_VERSION}
${INSTALL_BIN} ${WRKBUILD}/microperl ${IDIR_MICROPERL}/usr/bin/perl
+ ${INSTALL_DATA} ${WRKBUILD}/lib/strict.pm \
+ ${IDIR_MICROPERL}/usr/lib/perl5/${PKG_VERSION}
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index 559cf7565..fa93afd82 100644
--- a/package/openssl/Makefile
+++ b/package/openssl/Makefile
@@ -5,8 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= openssl
PKG_VERSION:= 0.9.8k
-PKG_RELEASE:= 2
-CACERT_VER:= 12
+PKG_RELEASE:= 3
PKG_MD5SUM:= e555c6d58d276aec7fdc53363e338ab3
PKG_DESCR:= OpenSSL (Secure Socket Layer) libraries
PKG_SECTION:= libs
@@ -17,20 +16,17 @@ PKG_SITES:= http://www.openssl.org/source/ \
ftp://ftp.webmonster.de/pub/openssl/source/ \
ftp://ftp.sunet.se/pub/security/tools/net/openssl/source/
-PKG_DESCR_1:= OpenSSL (Secure Socket Layer) command line tool
-PKG_SECTION_1:= admin
-PKG_DEPENDS_1:= libopenssl
-
-PKG_DESCR_2:= X.509v3 Root CA Certificates
-PKG_SECTION_2:= base
+PKG_DESCR_UTIL:= OpenSSL (Secure Socket Layer) command line tool
+PKG_SECTION_UTIL:= admin
+PKG_DEPENDS_UTIL:= libopenssl
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBOPENSSL,libopenssl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,OPENSSL_UTIL,openssl-util,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR_1},${PKG_SECTION_1}))
+$(eval $(call PKG_template,OPENSSL_UTIL,openssl-util,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_UTIL},${PKG_DESCR_UTIL},${PKG_SECTION_UTIL}))
BUILD_STYLE:= manual
-INSTALL_STYLE:= auto confprog
+INSTALL_STYLE:= auto
INSTALL_TARGET:= install_sw
FAKE_FLAGS+= INSTALL_PREFIX=${WRKINST}
@@ -64,8 +60,8 @@ do-build:
post-install:
${INSTALL_DIR} ${IDIR_LIBOPENSSL}/usr/lib
- ${CP} ${WRKINST}/usr/lib/lib*.so.* ${IDIR_LIBOPENSSL}/usr/lib
- chmod 644 ${IDIR_LIBOPENSSL}/usr/lib/lib*.so.*
+ ${CP} ${WRKINST}/usr/lib/lib*.so* ${IDIR_LIBOPENSSL}/usr/lib
+ chmod 644 ${IDIR_LIBOPENSSL}/usr/lib/lib*.so*
${INSTALL_DIR} ${IDIR_OPENSSL_UTIL}/usr/bin
${CP} ${WRKINST}/usr/bin/openssl ${IDIR_OPENSSL_UTIL}/usr/bin
${INSTALL_DIR} ${IDIR_OPENSSL_UTIL}/etc/ssl/{,certs,private}