diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-26 21:11:19 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-26 21:11:19 +0100 |
| commit | 199f633fb1077c7ffedff161726e9229e7312152 (patch) | |
| tree | 74a34648a9a185a46b7887a3d4d43cb7d5edc666 | |
| parent | bcecc2d064170506b911943a0d42f55e7401a630 (diff) | |
| parent | d3f2a5d619eed1ff1f0dce95ba49a334d3337741 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
| -rw-r--r-- | README | 3 | ||||
| -rw-r--r-- | mk/vars.mk | 3 | ||||
| -rw-r--r-- | package/pcre/Makefile | 7 |
3 files changed, 8 insertions, 5 deletions
@@ -5,7 +5,8 @@ This is a menu based buildsystem for your home made embedded Linux system. Before you can start you need to install some tools: - bash -- gcc +- gcc or clang +- g++ or clang++ - binutils - GNU make - GNU awk diff --git a/mk/vars.mk b/mk/vars.mk index 4bdd4ae9f..9da5f3ad3 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -178,9 +178,10 @@ TARGET_CONFIGURE_OPTS= PATH='${TARGET_PATH}' \ CROSS_COMPILE='$(TARGET_CROSS)' HOST_CONFIGURE_OPTS= CC_FOR_BUILD='${CC_FOR_BUILD}' \ - CPPFLAGS_FOR_BUILD='${CPPFLAGS_FOR_BUILD}' \ CXX_FOR_BUILD='${CXX_FOR_BUILD}' \ + CPPFLAGS_FOR_BUILD='${CPPFLAGS_FOR_BUILD}' \ CFLAGS_FOR_BUILD='${CFLAGS_FOR_BUILD}' \ + CXXFLAGS_FOR_BUILD='${CXXFLAGS_FOR_BUILD}' \ LDFLAGS_FOR_BUILD='${LDFLAGS_FOR_BUILD}' PKG_SUFFIX:= $(strip $(subst ",, $(ADK_PACKAGE_SUFFIX))) diff --git a/package/pcre/Makefile b/package/pcre/Makefile index 12738c2cb..211f8f375 100644 --- a/package/pcre/Makefile +++ b/package/pcre/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= pcre -PKG_VERSION:= 8.31 -PKG_RELEASE:= 2 -PKG_MD5SUM:= fab1bb3b91a4c35398263a5c1e0858c1 +PKG_VERSION:= 8.34 +PKG_RELEASE:= 1 +PKG_MD5SUM:= eb34b2c9c727fd64940d6fd9a00995eb PKG_DESCR:= a Perl Compatible Regular Expression library PKG_SECTION:= libs PKG_BUILDDEPS:= gettext-tiny @@ -27,6 +27,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBPCRE,libpcre,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) $(eval $(call PKG_template,LIBPCRECPP,libpcrecpp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBPCRECPP},${PKG_SECTION})) +CONFIGURE_ARGS+= --enable-utf XAKE_FLAGS+= ${TARGET_CONFIGURE_OPTS} libpcre-install: |