diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-18 01:35:52 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-18 01:35:52 +0100 |
| commit | 9736226cccdeb8d62e30b51664f763b723acacfd (patch) | |
| tree | 43009f9df0a7e67b9218bb7ee95f479bb11cf1fa /package | |
| parent | d714919ee99c1ef6a2b7cc369b1c78624ad956fe (diff) | |
| parent | 9e858224a5674820840eceb7aaabbba35b16c0cc (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package')
| -rw-r--r-- | package/cryptodev-linux/Makefile | 4 | ||||
| -rw-r--r-- | package/mksh/Makefile | 1 | ||||
| -rw-r--r-- | package/pcrepp/Makefile | 2 | ||||
| -rw-r--r-- | package/pcrepp/patches/patch-configure | 20 |
4 files changed, 23 insertions, 4 deletions
diff --git a/package/cryptodev-linux/Makefile b/package/cryptodev-linux/Makefile index ecb827b09..64b27a8da 100644 --- a/package/cryptodev-linux/Makefile +++ b/package/cryptodev-linux/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= cryptodev-linux PKG_VERSION:= 1.6 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= eade38998313c25fd7934719cdf8a2ea PKG_DESCR:= cryptodev-linux kernel module PKG_SECTION:= crypto @@ -26,7 +26,7 @@ INSTALL_STYLE:= manual do-build: ${MAKE} -C "${WRKBUILD}"/tests check ${MAKE} -C "${WRKBUILD}" version.h - GCC_HONOUR_COPTS=0 LDFLAGS="" ${MAKE} ${KERNEL_MAKE_OPTS} \ + GCC_HONOUR_COPTS=0 LDFLAGS="" ${MAKE} -C ${LINUX_DIR} ${KERNEL_MAKE_OPTS} \ M="${WRKBUILD}" modules ${INSTALL_DIR} ${WRKINST}/usr/include/crypto ${INSTALL_DATA} ${WRKBUILD}/crypto/cryptodev.h \ diff --git a/package/mksh/Makefile b/package/mksh/Makefile index a38b97733..63d391e18 100644 --- a/package/mksh/Makefile +++ b/package/mksh/Makefile @@ -27,6 +27,7 @@ TARGET_LDFLAGS+= -static endif TARGET_CPPFLAGS+= -DMKSH_SMALL=1 +TARGET_LDFLAGS+= -static-libgcc CONFIG_STYLE:= manual BUILD_STYLE:= manual INSTALL_STYLE:= manual diff --git a/package/pcrepp/Makefile b/package/pcrepp/Makefile index e96d04e38..5d662f20f 100644 --- a/package/pcrepp/Makefile +++ b/package/pcrepp/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= pcrepp PKG_VERSION:= 0.9.5 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 1fe6ea8e23ece01fde2ce5fb4746acc2 PKG_DESCR:= Cpp Wrapper classes for PCRE PKG_SECTION:= libs diff --git a/package/pcrepp/patches/patch-configure b/package/pcrepp/patches/patch-configure index 0ee82218e..da7ab7b3e 100644 --- a/package/pcrepp/patches/patch-configure +++ b/package/pcrepp/patches/patch-configure @@ -1,5 +1,23 @@ --- pcre++-0.9.5.orig/configure 2004-08-25 01:38:03.000000000 +0200 -+++ pcre++-0.9.5/configure 2011-08-05 07:30:53.000000000 +0200 ++++ pcre++-0.9.5/configure 2014-03-17 20:07:03.000000000 +0100 +@@ -3844,7 +3844,7 @@ irix5* | irix6* | nonstopux*) + ;; + + # This must be Linux ELF. +-linux-gnu*) ++linux-*) + case $host_cpu in + alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64*) + lt_cv_deplibs_check_method=pass_all ;; +@@ -6598,7 +6598,7 @@ linux-gnuoldld* | linux-gnuaout* | linux + ;; + + # This must be Linux ELF. +-linux-gnu*) ++linux-*) + version_type=linux + need_lib_prefix=no + need_version=no @@ -8612,7 +8612,7 @@ if test "x$with_pcre_include" = "x"; the CPPFLAGS="$CPPFLAGS -I/include" ;; |